branch develop updated (cc4e981 -> 2107f8a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from cc4e981 refs #7620 Il reste encore le pb des traductions à revoir Merge branch 'feature/7620' into develop new 86136c5 chargement des programmes dans l'arbre (refs #7553) new f522812 chargement des tripseine dans l'arbre (refs #7553) new ed1a0de remplacement des anciens datasources par les nouveaux new d7839fa chargement des noeuds des routes (refs #7553) new bc488fd affichage des icones des noeuds (refs #7553) new 3c66711 fix id (refs #7553) new b005fd5 chargement des objets flottants (refs #7553) new b82e3cd fecthEntity sur les noeuds (refs #7553) new b2c4b49 rebase sur develop new 4cd024e fix error new a5cbe0c fix error new f052d03 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) new 282ac9f remove fixme new 3636751 Correction du code suite au merge sur les Openable new 2107f8a Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop The 15 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 2107f8a20e3bdd6f0f73e9547cd9299731369ab0 Merge: cc4e981 3636751 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:54:11 2015 +0200 Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop commit 3636751335b51bcac643b79530dd02e2686ef3b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:53:17 2015 +0200 Correction du code suite au merge sur les Openable commit 282ac9f37e0cc97cb3b23af77c32c2d139b558f8 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:30:25 2015 +0200 remove fixme commit f052d03c8f200a20657fa702bb8e26381af1ced9 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:14:41 2015 +0200 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) commit a5cbe0c691a58de3154d0c5fae93225ecce61bc6 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:28:21 2015 +0200 fix error commit 4cd024ed605b0eafd405441a857d2100e2d52687 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:18:23 2015 +0200 fix error commit b2c4b4947f1e665a6a9e71f506fc33e82045f3e4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:14:31 2015 +0200 rebase sur develop commit b82e3cdb114caff7063e883d22c463789336a762 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 11:32:19 2015 +0200 fecthEntity sur les noeuds (refs #7553) commit b005fd5f6d623b939e5983b54e45fa865a0889f7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 2 11:47:19 2015 +0200 chargement des objets flottants (refs #7553) commit 3c6671172be2fb979357d613ef59910564ad6f0e Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 18:10:27 2015 +0200 fix id (refs #7553) commit bc488fdc02ceab48b1f18fe6c716649411128221 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) commit d7839fa8a937efee9fb5244878c5db8ff1f42c85 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) commit ed1a0de97546db0a438e4fa0078fbff01fb0b717 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux commit f5228128f058c6a2707619c29a8d31322ab8ea91 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) commit 86136c5f67aa441729294cd5052d0f852a26485c Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 11:32:02 2015 +0200 chargement des programmes dans l'arbre (refs #7553) Summary of changes: .../src/main/filters/observe-ui.properties | 72 +-- .../observe/ObserveSwingApplicationContext.java | 17 +- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 ------------------- .../observe/business/db/DataSourceProvider.java | 72 --- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/db/constants/DataContextType.java | 5 +- .../business/db/model/DataSelectionModel.java | 482 +++++++++++++++++++++ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../java/fr/ird/observe/ui/DecoratorService.java | 169 ++++---- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 28 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 18 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 3 + .../fr/ird/observe/ui/content/ContentUIModel.java | 9 + .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../content/impl/longline/BranchlineUIHandler.java | 6 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 6 +- .../impl/longline/SetLonglineUIHandler.java | 7 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../impl/seine/FloatingObjectUIHandler.java | 7 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 7 +- .../ui/content/list/ContentListUIHandler.java | 14 +- .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 1 + .../list/impl/seine/ActivitySeinesUIHandler.java | 7 +- .../content/list/impl/seine/RoutesUIHandler.java | 3 +- .../list/impl/seine/TripSeinesUIHandler.java | 5 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 14 +- .../ui/content/open/ContentOpenableUIModel.java | 4 +- .../impl/longline/ActivityLonglineUIHandler.java | 1 + .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/ActivitySeineUIHandler.java | 29 +- .../open/impl/seine/ActivitySeineUIModel.java | 11 +- .../open/impl/seine/TripSeineUIHandler.java | 4 + .../ui/content/ref/ContentReferenceUIHandler.java | 27 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 6 +- .../ui/content/table/ContentTableUIHandler.java | 10 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 5 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 28 +- .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 15 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 25 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 25 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 31 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 25 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 80 ++-- .../ird/observe/ui/tree/ProgramLonglineNode.java | 34 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 35 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 24 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 25 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 23 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 30 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 31 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 30 +- .../loadors/AbstractReferenceDtoChildLoador.java | 15 + .../loadors/ActivityLonglineNodeChildLoador.java | 9 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 7 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 29 +- .../loadors/ActivitySeinesNodeChildLoador.java | 23 +- .../loadors/FloatingObjectNodeChildLoador.java | 23 +- .../loadors/ProgramLonglineNodeChildLoador.java | 7 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 31 +- .../loadors/ReferenceCommonNodeChildLoador.java | 7 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 8 +- .../loadors/ReferenceSeineNodeChildLoador.java | 10 +- .../ui/tree/loadors/RootNodeChildLoador.java | 43 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 30 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 9 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 7 +- .../ui/util/decorator/ReferenceDecorator.java | 56 +-- .../decorator/ReferenceReferentialDecorator.java | 33 -- .../observe-application-swing_fr_FR.properties | 2 +- .../v1/seine/ActivitySeineServiceController.java | 5 +- .../v1/seine/FloatingObjectServiceController.java | 8 +- .../v1/seine/RouteServiceController.java | 3 +- .../v1/seine/TripSeineServiceController.java | 3 +- .../entities/longline/TripLonglineTopiaDao.java | 5 +- .../observe/entities/seine/TripSeineTopiaDao.java | 6 +- .../service/seine/ActivitySeineService.java | 3 +- .../service/seine/FloatingObjectService.java | 6 +- .../services/service/seine/RouteService.java | 3 +- .../services/service/seine/TripSeineService.java | 3 +- .../service/seine/TripSeineServiceRestTest.java | 44 +- .../service/longline/TripLonglineServiceTopia.java | 2 +- .../service/seine/ActivitySeineServiceTopia.java | 37 +- .../service/seine/FloatingObjectServiceTopia.java | 29 +- .../services/service/seine/RouteServiceTopia.java | 20 +- .../service/seine/TripSeineServiceTopia.java | 36 +- .../service/seine/TripSeineServiceTopiaTest.java | 29 +- 114 files changed, 1434 insertions(+), 1968 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceReferentialDecorator.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 86136c5f67aa441729294cd5052d0f852a26485c 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 | 6 +- .../LonglineGlobalCompositionUIHandler.java | 6 +- .../impl/longline/SetLonglineUIHandler.java | 7 ++- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../impl/seine/FloatingObjectUIHandler.java | 7 ++- .../ui/content/impl/seine/SetSeineUIHandler.java | 7 ++- .../ui/content/list/ContentListUIHandler.java | 14 ++--- .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 1 + .../list/impl/seine/ActivitySeinesUIHandler.java | 1 + .../ui/content/open/ContentOpenableUIHandler.java | 8 ++- .../impl/longline/ActivityLonglineUIHandler.java | 1 + .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/ActivitySeineUIHandler.java | 1 - .../open/impl/seine/TripSeineUIHandler.java | 4 ++ .../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 | 27 ++++---- .../observe/ui/tree/FloatingObjectSeineNode.java | 3 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 73 +++++++++++----------- .../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, 363 insertions(+), 352 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 a7c3a36..edcab67 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; @@ -219,6 +218,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) { @@ -228,6 +231,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) { @@ -395,6 +402,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( @@ -556,15 +564,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)); } } 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 aa2f075..0049a00 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; @@ -251,7 +245,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; @@ -302,8 +296,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 52f3c67..3bc2902 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.services.dto.longline.BranchlineDtos; @@ -41,7 +41,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; @@ -121,7 +121,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 8de09df..1dd807c 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.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -47,7 +47,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; @@ -276,7 +276,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } @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/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 f7bb1ec..9aef8d7 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 @@ -24,9 +24,9 @@ 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.services.dto.FormDto; +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.services.dto.longline.SetLonglineDtos; @@ -129,7 +129,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -453,7 +453,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 a45c705..646dc59 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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.impl.seine; 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.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDtos; import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; @@ -55,7 +55,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 877afa2..871d86b 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; @@ -71,7 +71,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 bfdd365..4bc9749 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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.impl.seine; 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.services.dto.FormDto; +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.services.dto.seine.FloatingObjectDtos; @@ -60,7 +60,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -205,7 +205,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 465474e..c072e8c 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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.impl.seine; 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.services.dto.FormDto; +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.RouteDto; @@ -107,7 +107,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -342,7 +342,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 acc2ce3..0732497 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 848073a..06e68bb 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 @@ -26,6 +26,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; 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 50e062a..c8d343c 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 @@ -26,6 +26,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; 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 40d65f3..4421b4a 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 @@ -25,6 +25,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; 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 748d356..dd5ceaf 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 @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.open; import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.ui.content.ContentMode; @@ -71,7 +70,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } @Override - protected boolean computeCanWrite(DataSource source) { + protected boolean computeCanWrite(ObserveSwingDataSource source) { return source.canWriteData(); } @@ -133,7 +132,10 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public abstract boolean doCloseData(); + public boolean doCloseData() { + getBean().setOpen(false); + return true; + } public final void afterCloseData() { 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 b5e418c..d7a31b5 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 @@ -26,6 +26,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; 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 9851c3c..539eaad 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 @@ -27,6 +27,7 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.service.longline.TripLonglineService; 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 8a45db0..5b5eaa4 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 @@ -211,7 +211,6 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei getModel().setFormDto(formDto); ActivitySeineDtos.copyActivitySeineDto(formDto.getForm(), bean); - if (log.isDebugEnabled()) { log.debug(prefix + "long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); } 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 b94748e..a0d0536 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 @@ -26,6 +26,10 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.business.db.DataContext; +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.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.seine.TripSeineService; 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 08859b0..aab10b4 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,9 +24,9 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveServiceHelper; 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.services.dto.FormDto; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.constants.ReferenceStatus; @@ -52,24 +52,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; @@ -210,8 +196,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 9302dd7..023f51c 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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; @@ -42,12 +42,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.LinkedHashSet; @@ -82,7 +80,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 19b594a..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,22 +52,24 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { * * @since 4.0 */ - protected transient E entity; + 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); } @@ -92,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); @@ -114,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; } @@ -142,11 +145,7 @@ 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(); } 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 776e48a..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; @@ -109,12 +112,11 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { 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; } @@ -403,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); @@ -426,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); @@ -434,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); @@ -442,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); @@ -450,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); @@ -458,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); @@ -466,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); @@ -474,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); @@ -482,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); @@ -511,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 a39efaa..37890d7 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f5228128f058c6a2707619c29a8d31322ab8ea91 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) --- .../observe/ObserveSwingApplicationContext.java | 7 +- .../java/fr/ird/observe/ui/DecoratorService.java | 145 +++++++++++---------- .../ird/observe/ui/tree/ProgramLonglineNode.java | 25 +++- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 ++++ .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../v1/seine/TripSeineServiceController.java | 3 +- .../services/service/seine/TripSeineService.java | 3 +- .../service/seine/TripSeineServiceRestTest.java | 44 +++---- .../service/seine/TripSeineServiceTopia.java | 33 ++--- .../service/seine/TripSeineServiceTopiaTest.java | 29 ++--- 10 files changed, 188 insertions(+), 143 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 450870e..46518fc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -80,10 +80,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.ActionMap; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.io.File; import java.util.Arrays; import java.util.List; @@ -753,6 +751,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); } + } else if (ProgramDtos.isProgramLongline(programDtoRef)) { ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); for (ReferenceDto tripLongline : tripLonglines.getReference()) { 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 edcab67..95939d3 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 @@ -21,18 +21,11 @@ */ package fr.ird.observe.ui; -import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; -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.SpeciesDecorator; -import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; -import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import fr.ird.observe.business.gps.GPSPoint; import fr.ird.observe.business.gps.GPSPointInterval; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; @@ -51,7 +44,6 @@ import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; @@ -108,6 +100,15 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; +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.SpeciesDecorator; +import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; +import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -402,7 +403,7 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(ProgramDto.class, t("observe.common.program") + " ${" + libelle + "}$s"); - registerReferentialDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); + registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( @@ -414,19 +415,19 @@ public class DecoratorService extends DecoratorProvider { "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); - registerDefaultReferentialDtoDecorator(SexDto.class, libelle); + registerDefaultReferenceDtoDecorator(SexDto.class, libelle); //FIXME Use startDate - endDate - registerDefaultReferentialDtoDecorator(FpaZoneDto.class, libelle); - registerDefaultReferentialDtoDecorator(OceanDto.class, libelle); - registerDefaultReferentialDtoDecorator(DetectionModeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselDto.class, libelle); - registerDefaultReferentialDtoDecorator(CountryDto.class, libelle); - registerReferentialDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); - registerDefaultReferentialDtoDecorator(VesselTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselActivitySeineDto.class, libelle); - registerDefaultReferentialDtoDecorator(SurroundingActivityDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObservedSystemDto.class, libelle); - registerReferentialDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); + registerDefaultReferenceDtoDecorator(FpaZoneDto.class, libelle); + registerDefaultReferenceDtoDecorator(OceanDto.class, libelle); + registerDefaultReferenceDtoDecorator(DetectionModeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselDto.class, libelle); + registerDefaultReferenceDtoDecorator(CountryDto.class, libelle); + registerReferenceDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); + registerDefaultReferenceDtoDecorator(VesselTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class, libelle); + registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObservedSystemDto.class, libelle); + registerReferenceDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); @@ -434,51 +435,51 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this registerJXPathDecorator(SetLonglineDto.class, t("observe.common.setLongline")); - registerDefaultReferentialDtoDecorator(ObjectFateDto.class, libelle); - registerDefaultReferentialDtoDecorator(OrganismDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObjectTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObjectOperationDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(TransmittingBuoyTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(TransmittingBuoyOperationDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForNullSetDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForNoFishingDto.class, libelle); - registerDefaultReferentialDtoDecorator(WeightCategoryDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForDiscardDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesFateDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesGroupDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesListDto.class, libelle); - - registerDefaultReferentialDtoDecorator(BaitHaulingStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(BaitSettingStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(BaitTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(CatchFateLonglineDto.class, libelle); - registerDefaultReferentialDtoDecorator(EncounterTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(HealthnessDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookSizeDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(ItemVerticalPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(ItemHorizontalPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(LightsticksColorDto.class, libelle); - registerDefaultReferentialDtoDecorator(LightsticksTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(LineTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(MaturityStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(MitigationTypeDto.class, libelle); - registerReferentialDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); - registerDefaultReferentialDtoDecorator(SensorDataFormatDto.class, libelle); - registerDefaultReferentialDtoDecorator(SensorTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(SettingShapeDto.class, libelle); - registerDefaultReferentialDtoDecorator(SizeMeasureTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(StomacFullnessDto.class, libelle); - registerDefaultReferentialDtoDecorator(TripTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselActivityLonglineDto.class, libelle); - registerDefaultReferentialDtoDecorator(WeightMeasureTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearCaracteristicTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearCaracteristicDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearDto.class, libelle); - - registerReferentialDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); + registerDefaultReferenceDtoDecorator(ObjectFateDto.class, libelle); + registerDefaultReferenceDtoDecorator(OrganismDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectOperationDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class, libelle); + registerDefaultReferenceDtoDecorator(WeightCategoryDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesFateDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesListDto.class, libelle); + + registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(BaitTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class, libelle); + registerDefaultReferenceDtoDecorator(EncounterTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(HealthnessDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookSizeDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(LightsticksColorDto.class, libelle); + registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(LineTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(MaturityStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(MitigationTypeDto.class, libelle); + registerReferenceDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); + registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class, libelle); + registerDefaultReferenceDtoDecorator(SensorTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(SettingShapeDto.class, libelle); + registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(StomacFullnessDto.class, libelle); + registerDefaultReferenceDtoDecorator(TripTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class, libelle); + registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearDto.class, libelle); + + registerReferenceDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); registerMultiJXPathDecorator( ObjectSchoolEstimateDto.class, @@ -520,6 +521,10 @@ public class DecoratorService extends DecoratorProvider { // TripSeine decorator registerDecorator(new TripSeineDecorator(libelle)); + registerReferenceDtoDecorator(TripSeineDto.class, + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" + + libelle + "}$s##${observerLabel}$s"); + // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); @@ -562,11 +567,11 @@ public class DecoratorService extends DecoratorProvider { } - protected <T extends ReferentialDto> void registerDefaultReferentialDtoDecorator(Class<T> referenceType, String libelle) { - registerReferentialDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); + protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType, String libelle) { + registerReferenceDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); } - protected <T extends ReferentialDto> void registerReferentialDtoDecorator(Class<T> referenceType, String expression) { + protected <T extends IdDto> void registerReferenceDtoDecorator(Class<T> referenceType, String expression) { registerDecorator(referenceType.getSimpleName(), new ReferenceDecorator(expression)); } 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 3ee6500..7bd5c7d 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,9 +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.ProgramLonglineNodeChildLoador; /** @@ -45,10 +51,19 @@ public class ProgramLonglineNode extends DtoNodeSupport<ProgramDto> { setEntity(entity); } - //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/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index 0a508af..ff3e2f7 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,8 +22,13 @@ 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.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; /** * Created on 4/9/15. @@ -44,4 +49,27 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { // return dataService.getTripSeineStub(source, id); // } + + @Override + protected ReferenceDto<TripSeineDto> fetchEntity() { + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); + +// "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" +// + libelle + "}$s##${observerLabel}$s" + + ReferenceDto<TripSeineDto> referenceDto = + ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); + + return referenceDto; + } } 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 a9190c1..8f3f563 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 @@ -21,14 +21,19 @@ */ 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.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.TripSeineNode; 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; @@ -79,8 +84,6 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei // DataService service = getDataService(); // DataSelectionModel selectionModel = getSelectionModel(dataProvider); - List<TripSeineDto> result; - //FIXME // if (selectionModel != null) { // result = new ArrayList<TripSeine>(); @@ -93,11 +96,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei // } else { // // result = service.getTripSeineStubByProgram(dataSource, parentId); -// + // } // return result; - return null; + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = tripSeineService.getTripSeineByProgram(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(tripSeineByProgram.getReference())); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 29a4387..b11b6a7 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.seine.TripSeineService; /** @@ -40,7 +39,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 7837185..6a01421 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -40,7 +39,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripSeineService extends ObserveService { @ReadDataPermission - ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId); + ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId); @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java index b5a246e..0b01c17 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -35,7 +36,6 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.AbstractServiceRestTest; import org.junit.Assert; import org.junit.Ignore; @@ -63,38 +63,38 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ @Test public void getTripSeineByProgramTest() { - ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); Assert.assertEquals(135, stubDtos.sizeReference()); - LinkedHashSet<ReferenceDto> referenceDtos = stubDtos.getReference(); - ReferenceDto tripSeineStub1Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); + ReferenceDto<TripSeineDto> tripSeineStub1Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_1)); Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); - Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); - Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); + ReferenceDto<TripSeineDto> tripSeineStub2Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_2)); - ReferenceDto tripSeineStu2Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); + Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStub2Dto.getId()); + Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("VIA EUROS", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Protat Martin", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStu2Dto.getId()); - Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); - Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - - - ReferenceDto tripSeineStub3Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); + ReferenceDto<TripSeineDto> tripSeineStub3Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_3)); Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); - Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); - Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); } @@ -286,7 +286,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ service.delete(TRIP_SEINE_ID_1); - ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 48f02c9..c8fe1f3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.nuiton.util.DateUtil; import java.util.Collections; @@ -57,7 +56,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -66,32 +65,28 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); - LinkedHashSet<ReferenceDto<TripSeineStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<TripSeineDto>> stubs = Sets.newLinkedHashSet(); for (TripSeine tripSeine : tripSeines) { - ReferenceDto<TripSeineStubDto> stub = - ReferenceDtos.newReferenceDto(TripSeineStubDto.class, - Lists.newArrayList(TripSeineStubDto.PROPERTY_START_DATE, - TripSeineStubDto.PROPERTY_END_DATE, - TripSeineStubDto.PROPERTY_VESSEL_LABEL, - TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - + ReferenceDto<TripSeineDto> stub = ReferenceDtos.newReferenceDto(TripSeineDto.class, + Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); stub.setId(tripSeine.getTopiaId()); - stub.setPropertyValue(TripSeineStubDto.PROPERTY_START_DATE, tripSeine.getStartDate()); - stub.setPropertyValue(TripSeineStubDto.PROPERTY_END_DATE, tripSeine.getEndDate()); - stub.setPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL, referenceLocale.getLabel(tripSeine.getVessel())); - stub.setPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL, tripSeine.getObserverLabel()); + stub.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, tripSeine.getStartDate()); + stub.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, tripSeine.getEndDate()); + stub.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, referenceLocale.getLabel(tripSeine.getVessel())); + stub.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, tripSeine.getObserverLabel()); stubs.add(stub); } - Optional<Date> lastUpdateOptional = getLastUpdate(TripSeine.class); - ReferenceSetDto<TripSeineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(TripSeineStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; + ReferenceSetDto<TripSeineDto> result = ReferenceSetDtos.newReferenceSetDto(TripSeineDto.class, stubs, null); + return result; } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 3d597b3..7fec8b0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -36,7 +36,6 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.ReferentialService; @@ -84,7 +83,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); @@ -94,28 +93,28 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReference(1); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReference(2); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); } @@ -392,7 +391,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.delete(TRIP_SEINE_ID_1); - ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ed1a0de97546db0a438e4fa0078fbff01fb0b717 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux --- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 --------------------- .../observe/business/db/DataSourceProvider.java | 72 ---- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 28 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 5 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 26 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../loadors/ActivityLonglineNodeChildLoador.java | 3 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ReferenceCommonNodeChildLoador.java | 4 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 4 +- .../loadors/ReferenceSeineNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 4 +- 46 files changed, 114 insertions(+), 1315 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java index 66b1965..846e44a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java @@ -23,10 +23,11 @@ package fr.ird.observe.business; 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.gps.GPSService; import fr.ird.observe.business.validation.ObserveValidator; import fr.ird.observe.business.validation.ValidationContext; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.ui.DecoratorService; import jaxx.runtime.JAXXUtil; @@ -81,8 +82,8 @@ public class ObserveApplicationContext extends DefaultApplicationContext { JAXXUtil.newContextEntryDef(DataContext.class); /** the jaxx context entry to store the data source (says the ui data source) */ - public static final JAXXContextEntryDef<DataSource> DATA_SOURCE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(DataSource.class); + public static final JAXXContextEntryDef<ObserveSwingDataSource> DATA_SOURCE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(ObserveSwingDataSource.class); public static final JAXXContextEntryDef<ValidationContext> VALIDATION_CONTEXT_ENTRY_DEF = JAXXUtil.newContextEntryDef(ValidationContext.class); @@ -103,12 +104,12 @@ public class ObserveApplicationContext extends DefaultApplicationContext { return CONFIG_ENTRY_DEF.getContextValue(this); } - public final DataSource getDataSource() { - DataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); + public final ObserveSwingDataSource getDataSource() { + ObserveSwingDataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); return dataSource; } - public final void setDataSource(DataSource source) { + public final void setDataSource(ObserveSwingDataSource source) { if (source == null) { DATA_SOURCE_ENTRY_DEF.removeContextValue(this); } else { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java deleted file mode 100644 index 98aa6b8..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db; - -import fr.ird.observe.business.db.constants.DataSourceState; -import org.nuiton.util.version.Version; - -import java.io.File; -import java.util.Properties; - -/** - * Le contrat d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSource { - - String OPEN_PROPERTY_KEY = "open"; - - String REFERENTIEL_PROPERTY_KEY = "referentiel"; - - String DATA_PROPERTY_KEY = "data"; - - // ------------------------------------------------------------------------- - // Methodes de démarrage et fermeture de la source de données - // ------------------------------------------------------------------------- - - /** - * Pour initialiser le service sans l'ouvrir. - * <p/> - * Note: cette opération est délégué à la configuration. - * <p/> - * A la fin de cette méthode, l'état doit être {@link - * DataSourceState#INIT} si - * tout s'est bien déroulé. - * - * @see DataSourceConfig#init() - */ - void init(); - - /** - * Ouvre le service. - * <p/> - * Après cette opération, le service doit être en état {@link - * DataSourceState#OPEN} si - * tout s'est bien déroulé. - * - * @throws DataSourceException si pb - */ - void doOpen() throws DataSourceException; - - /** - * Ferme le service. - * <p/> - * Après cette opération, le service doit être en état {@link - * DataSourceState#CLOSED} - * - * @param destroy drapeau pour savoir si on doit détruire la base après - * fermeture. - * @throws DataSourceException if pb - */ - void doClose(boolean destroy) throws DataSourceException; - - // ------------------------------------------------------------------------- - // Methodes d'accès aux état internes de la source de données - // ------------------------------------------------------------------------- - - /** - * Recupère la version de la base. (ne peut pas être utilisé avant que la - * base soit ouverte). - * <p/> - * Note: si la base n'est pas versionnée, la version est nulle. - * - * @return la version de la base, ou <code>null</code> si la base n'est pas - * versionnee - * @throws DataSourceException if pb - */ - Version getDbVersion() throws DataSourceException; - - /** @return le libellé court du service */ - String getShortLabel(); - - /** @return le libellé complet du service */ - String getLabel(); - - /** - * @return {@code true} si le service est ouvert (i.e qu'il y a une - * connection ouverte vers la base). - */ - boolean isOpen(); - - boolean wasClosed(); - - /** @return la configuration du service */ - DataSourceConfig getConfig(); - - /** @return {@code true} si on peut lire le référentiel */ - boolean canReadReferentiel(); - - /** @return {@code true} si on peut écrire sur le référentiel */ - boolean canWriteReferentiel(); - - /** @return {@code true} si on peut lire les donées observer */ - boolean canReadData(); - - /** @return {@code true} si on peut écrire des données observer */ - boolean canWriteData(); - - Properties getConfigForTopia(); - - // ------------------------------------------------------------------------- - // Methodes de manipulation des transactions, DAO et TopiaService - // ------------------------------------------------------------------------- - - //FIXME -// /** @return le parent de tous les context topia. */ -// TopiaContext getRootCtxt(); -// -// TopiaContext beginTransaction(String methodName) throws DataSourceException; -// -// void rollbackTransaction(TopiaContext context, -// String methodName) throws DataSourceException; -// -// void commitTransaction(TopiaContext context, -// String methodName) throws DataSourceException; -// -// void closeTransaction(TopiaContext context, -// String methodName) throws DataSourceException; - -// ReplicationService getReplicationService(); -// -// <S extends TopiaService> S getTopiaService(Class<S> serviceType); -// -// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, -// Class<P> entityType) throws TopiaException; -// -// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, -// P entity) throws TopiaException; -// -// <E extends OpenableEntity & TopiaEntity> E getOpen(TopiaContext tx, -// Class<E> klass) throws DataSourceException; -// -// String[] getOpenIds(TopiaContext tx) throws DataSourceException; - - /** - * Exporte la base de données dans un script gzip-compresse. - * <p/> - * Note : Actuellement, seul esl bases de type H2 peuvent utiliser cette - * fonctionnalitee. - * - * @param gzipFile le fichier ou ecrire le script gzippe - * @throws DataSourceException si un pb pendant l'objectOperation - */ - void storeDB(File gzipFile) throws DataSourceException; - - //FIXME -// /** -// * Décore un obet persistant. -// * -// * @param tx la transaction à utiliser (si elle est nulle on en crée une que l'on ferme avant la fin de l'appel). -// * @param id l'id de l'obet à décorer -// * @param decorator le décorateur -// * @return la décoration -// * @throws DataSourceException si pas possible de récupérer l'objet en base -// */ -// String decorateEntity(TopiaContext tx, -// String id, -// Decorator<?> decorator) throws DataSourceException; -// -// <E extends TopiaEntity> List<E> loadDecoratedEntities(TopiaContext tx, -// Class<E> entityClass, -// Decorator<E> decorator) throws DataSourceException; - - // ------------------------------------------------------------------------- - // Methodes de vérification d'état - // ------------------------------------------------------------------------- - - /** - * Verifie que l'etat du service est l'un de ceux donnes en parametre. - * - * @param state les etats acceptes - * @throws IllegalStateException si l'etat du service n'est pas l'un de ceux - * donnes en parametre - */ - void checkState(DataSourceState... state) throws IllegalStateException; - - // ------------------------------------------------------------------------- - // Methodes de l'api des écouteurs sur évènement sur source de données - // ------------------------------------------------------------------------- - - //FIXME -// void addDataSourceListener(DataSourceListener listener); -// -// boolean containsDataSourceListener(DataSourceListener listener); -// -// void removeDataSourceListener(DataSourceListener listener); -// -// DataSourceListener[] getDataSourceListeners(); -// -// void fireNewMessage(String message); -// -// void fireNewMessage(String message, DataSourceEvent.MessageLevel level); -// -// <E> E findByTopiaId(TopiaContext tx, String entityId) throws TopiaException; -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java deleted file mode 100644 index ead8e9a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db; - -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.business.db.constants.DataPolicy; -import fr.ird.observe.business.db.constants.DataSourceState; - -import java.util.EnumSet; -import java.util.Properties; -import java.util.Set; - -/** - * Le contrat de la configuration d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceConfig extends Cloneable { - - /** - * Récupère la valeur d'un paramètre. - * - * @param <T> le type de la valeur d'un paramètre - * @param param la définition du paramètre - * @param type le type du paramètre - * @return la valeur du paramètre - */ - <T> T get(DataSourceConfigParam param, Class<T> type); - - /** - * Positionne une nouvelle valeur pour unparamètre donné. - * <p/> - * Note: si on passe la valeur <code>null</code> alors le paramètre ne sera - * plus utilisé (jusqu'à ré-affectation d'un valeur non nulle). - * - * @param param la définition du paramètre - * @param value la nouvelle valeur à positionner - */ - void set(DataSourceConfigParam param, Object value); - - /** - * Prépare l'utilisation de la configuration sans ouvrir aucun connexion - * vers la base de données associée. - * <p/> - * A la fin de cette méthode, l'état doit être {@link - * DataSourceState#INIT} si - * tout s'est bien déroulé. - */ - void init(); - - /** @return la configuration sous forme l'un fichier de properties. */ - Properties getDbConfig(); - - /** - * Méthode pour valider la configuration. - * <p/> - * Cette méthode doit être appelée par le service avant toute ouverture de - * service pour assurer que l'on obtiendra un service valide. - * - * @return {@code true} si la configuration est valide. - */ - boolean isValid(); - - /** - * @return {@code true} si le service de persistance utilise un cache - * sur les entités du référentiel. - */ - boolean isUseCache(); - - /** @return le label court de la source de donnees. */ - String getShortLabel(); - - /** @return le label long de la source de donnees. */ - String getLabel(); - - /** @return le login pour se connecter a la base */ - String getLogin(); - - /** @return le mot de passe pour se connecter a la base */ - char[] getPassword(); - - /** - * @return {@code true} si on doit effectuer une tentative de mise a - * jour de la base a l'ouverture du service. - */ - boolean isCanMigrate(); - - boolean isShowMigrationSql(); - - boolean isShowMigrationProgression(); - - void setShowMigrationSql(boolean showSql); - - void setShowMigrationProgression(boolean showProgression); - - /** - * Positionne le login de connexion. - * - * @param login le nouveau login de connexion - */ - void setLogin(String login); - - /** - * Positionne le mot de passe de connexion. - * - * @param password le nouveau mot de passe de connexion - */ - void setPassword(char[] password); - - /** - * Positionne le label court de la source de donnees. - * - * @param shortLabel le nouvel label court de la source de donnes. - */ - void setShortLabel(String shortLabel); - - /** - * Positionne le drapeau d'utilisation du cache des entites. - * <p/> - * Il s'agit d'un cache sur le referentiel, mise a jour a chaque - * modification sur une entite du referentiel. - * <p/> - * Sera util lorsque l'on editera le referentiel dans l'application. - * - * @param useCache la nouvelle valeur du drapeau - */ - void setUseCache(boolean useCache); - - /** @return une instance clonee de la configuration */ - DataSourceConfig clone(); - - /** - * Recopie cette configuration vers la configuratyion donnee en parametre. - * - * @param config la configuration destination - */ - void copyTo(DataSourceConfig config); - - /** @return les droits sur la source de donnees */ - EnumSet<DataPolicy> getPolicy(); - - /** - * Recupère les droits utilisables sur ce service de persistance. - * <p/> - * La liste des droits sera positionné dans le champ {@link #getPolicy()}. - * <p/> - * Cette méthode est appellé à l'ouverture du service si la connexion a bien - * été établie. - */ - void detectPolicy(); - - /** @return les droits sur la source de donnees formates. */ - String getPolicyLabel(); - - void fillWrights(StringBuilder buffer, boolean read, - boolean write, String label); - - /** - * @param canMigrate pour indiquer si on doit effecuter une tentative de - * mise a jour a l'ouverture du service. - */ - void setCanMigrate(boolean canMigrate); - - boolean isCanReadData(); - - boolean isCanReadReferentiel(); - - boolean isCanWriteData(); - - boolean isCanWriteReferentiel(); - - CreationMode getCreationMode(); - - void setCreationMode(CreationMode creationMode); - - DataSourceConfig getImportConfig(); - - void setImportConfig(DataSourceConfig importConfig); - - DataSourceConfig getImportDataConfig(); - - void setImportDataConfig(DataSourceConfig importDataConfig); - - Set<String> getImportDataIds(); - - void setImportDataIds(Set<String> importDataIds); - -// boolean hasH2ImportConfig(); -// -// boolean hasPGImportConfig(); - - boolean hasImportReferentielConfig(); - - boolean hasImportDataConfig(); - -// H2DataSourceConfig getH2ImportConfig(); -// -// PGDataSourceConfig getPGImportConfig(); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java deleted file mode 100644 index 8002ce2..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db; - -/** - * Le contrat d'un paramètre de la configuration d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceConfigParam { - - /** - * @return le lastName de la clef utilisée pour stocker la valeur de la - * propriété. - */ - String getMapName(); - - /** @return le lastName de la propriété. */ - String getPropertyName(); - - /** @return le type de la propriété. */ - Class<?> getType(); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java deleted file mode 100644 index 4a970c0..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db; - -/** - * L'exception déclanché lors de l'accès aux méthodes de la source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSourceException extends Exception { - - private final static long serialVersionUID = 1L; - - protected final String methodName; - - public DataSourceException(String message, String methodName) { - super(message); - this.methodName = methodName; - } - - public DataSourceException(Throwable cause, String methodName) { - super(cause); - this.methodName = methodName; - } - - public DataSourceException(String message, Throwable cause, String methodName) { - super(message, cause); - this.methodName = methodName; - } - - public String getMethodName() { - return methodName; - } - -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java deleted file mode 100644 index 6846264..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java +++ /dev/null @@ -1,457 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Collections; -import java.util.HashSet; -import java.util.ServiceLoader; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * L'usine de source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSourceFactory { - - /** Logger */ - private static final Log log = - LogFactory.getLog(DataSourceFactory.class); - - /** l'ensemble des proversId découverts */ - protected static Set<DataSourceProvider<?, ?>> proversId; - - /** l'ensemble des services actuellement ouverts */ - protected static final Set<DataSource> services = - new HashSet<DataSource>(); - - /** - * un ecouteur sur les services pour mettre à jour la liste des services - * actifs - */ - //FIXME -// protected static final DataSourceListener l = -// new DataSourceListenerAdapter() { -// -// @Override -// public void onClosed(DataSourceEvent event) { -// DataSource s = event.getSource(); -// if (log.isDebugEnabled()) { -// log.debug("remove active service " + s.getLabel()); -// } -// services.remove(s); -// } -// -// @Override -// public void onOpened(DataSourceEvent event) { -// DataSource s = event.getSource(); -// if (log.isDebugEnabled()) { -// log.debug("add active service " + s.getLabel()); -// } -// services.add(s); -// } -// -// @Override -// public void onNewMessage(DataSourceEvent event) { -// if (log.isInfoEnabled()) { -// log.info(event.getMessage()); -// } -// } -// }; - - //FIXME -// public static Version getModelVersion() { -// if (ObserveServiceHelper.context != null) { -// ApplicationConfig config; -// config = ObserveServiceHelper.context.getContextValue(ApplicationConfig.class); -// if (config != null) { -// return config.getOption(Version.class, -// AbstractDataSourceMigration.DB_VERSION); -// } -// } -// return null; -// } - - /** - * @param label le label du service de persistance - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ -//FIXME -// public static H2DataSourceConfig newH2Config(String label, Object... params) { -// -// H2DataSourceConfig config = newConfig(label, -// H2DataSourceConfig.class, -// H2DataSource.class, -// params -// ); -// -// return config; -// } - - /** - * @param label le label du service de persistance - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ -//FIXME -// public static PGDataSourceConfig newPGConfig(String label, Object... params) { -// -// PGDataSourceConfig config = newConfig(label, -// PGDataSourceConfig.class, -// PGDataSource.class, -// params -// ); -// -// return config; -// } - -//FIXME -// public static PGDataSource newService(PGDataSourceConfig config) { -// -// PGDataSource service = newService(config, PGDataSource.class); -// -// return service; -// } - -//FIXME -// public static H2DataSource newService(H2DataSourceConfig config) { -// -// H2DataSource service = newService(config, H2DataSource.class); -// -// return service; -// } - -//FIXME -// public static DataSource newService(DataSourceConfig config) { -// -// DataSource service = null; -// -// if (config instanceof H2DataSourceConfig) { -// service = newService((H2DataSourceConfig) config); -// } else if (config instanceof PGDataSourceConfig) { -// service = newService((PGDataSourceConfig) config); -// } -// -// return service; -// } - - /** - * @param <C> le type de la configuration - * @param label le label du service de persistance - * @param configClass le type de configuration - * @param serviceClass le type de service - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ - private static <C extends DataSourceConfig, S extends DataSource> C newConfig(String label, - Class<C> configClass, - Class<S> serviceClass, - Object... params) { - - DataSourceProvider<C, S> provider = - getProvider(configClass, serviceClass); - - C config = provider.newConfig(label, params); - - return config; - } -// -//FIXME -// public static <C extends DataSourceConfig, S extends DataSource> S -// newService(C config, Class<S> serviceClass) { -// -// DataSourceProvider<C, S> provider = getProvider(config, serviceClass); -// -// S service = provider.newService(config); -// -// service.addDataSourceListener(l); -// -// service.init(); -// -// return service; -// } - - public static Set<DataSourceProvider<?, ?>> getProversId() { - if (proversId == null) { - proversId = discover(); - } - return proversId; - } -//FIXME -// public static void dispose() throws DataSourceException { -// if (log.isInfoEnabled()) { -// log.info("close all services (" + services.size() + ')'); -// } -// -// for (DataSource service : services) { -// // on supprime le listener qui met a jour la liste de services -// // sinon on entre en concurrence de modification -// service.removeDataSourceListener(l); -// if (service.isOpen()) { -// service.doClose(false); -// } -// } -// services.clear(); -// } - - @SuppressWarnings("unchecked") - protected static <C extends DataSourceConfig, S extends DataSource> - DataSourceProvider<C, S> getProvider(Class<C> configClass, - Class<S> serviceClass) { - - if (configClass == null) { - throw new NullPointerException("configClass can not be null"); - } - - if (serviceClass == null) { - throw new NullPointerException("serviceClass can not be null"); - } - - for (DataSourceProvider<?, ?> p : getProversId()) { - if (configClass.equals(p.getConfigClass()) && - serviceClass.equals(p.getServiceClass())) { - return (DataSourceProvider<C, S>) p; - } - } - return null; - } - - @SuppressWarnings("unchecked") - protected static <C extends DataSourceConfig, S extends DataSource> - DataSourceProvider<C, S> getProvider(C config, - Class<S> serviceClass) { - - if (config == null) { - throw new NullPointerException("config can not be null"); - } - - if (serviceClass == null) { - throw new NullPointerException("serviceClass can not be null"); - } - - Class<C> configClass = (Class<C>) config.getClass(); - return getProvider(configClass, serviceClass); - } - - protected static Set<DataSourceProvider<?, ?>> discover() { - Set<DataSourceProvider<?, ?>> detected; - detected = new HashSet<DataSourceProvider<?, ?>>(); - if (log.isDebugEnabled()) { - log.debug("init " + DataSourceFactory.class); - } - for (DataSourceProvider<?, ?> p : ServiceLoader.load(DataSourceProvider.class)) { - detected.add(p); - if (log.isDebugEnabled()) { - log.debug(t("observe.storage.message.provider.detected", p.getServiceClass().getName())); - } - } - - return Collections.unmodifiableSet(detected); - } - - /** - * Creates the config for an empty local storage. - * - * @param label label of storage - * @param dir directory of the database - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigEmpty( -// String label, -// File dir, -// String login, -// char[] password) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.EMPTY, -// H2DataSourceConfigParam.DIRECTORY, dir -// ); -// return config; -// } - - /** - * Creates the config for a new local storage loaded from the given {@code - * dump}. - * - * @param label label of storage - * @param dir directory of the database - * @param dump url of the dump to load - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to migrate db if required - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigFromDump( -// String label, -// File dir, -// URL dump, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_EXTERNAL_DUMP, -// H2DataSourceConfigParam.DUMP, dump, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an existing local storage with migration if - * required. - * - * @param label label of storage - * @param dir directory of the database - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to update database - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigUseLocalStorage( -// String label, -// File dir, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an new local storage with a copy of the - * referentiel of local storage given his {@code importConfig} with - * migration if required. - * - * @param label label of storage - * @param dir directory of the database - * @param importConfig import service configuration - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to allow migration - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigImportLocalStorage( -// String label, -// File dir, -// H2DataSourceConfig importConfig, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_LOCAL_STORAGE, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an new local storage with a copy of the - * referentiel of remote storage given his {@code importConfig} with - * migration if required. - * - * @param label label of storage - * @param dir directory of the database - * @param importConfig import service configuration - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to allow migration - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigImportRemoteStorage( -// String label, -// File dir, -// PGDataSourceConfig importConfig, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_REMOTE_STORAGE, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates a configuration to connect to a remote dn. - * - * @param dbName storage label - * @param login login to connect remote db - * @param password password to connect remote db - * @param url url of remote db - * @param canMigrate flag to allow migration - * @return the new instanciated configuration - */ -//FIXME -// public static PGDataSourceConfig newPGConfig( -// String dbName, -// String login, -// char[] password, -// String url, -// boolean canMigrate) { -// -// PGDataSourceConfig config = newPGConfig( -// dbName, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// PGDataSourceConfigParam.URL, url, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// -// return config; -// } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java deleted file mode 100644 index 405c6ab..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db; - -import org.hibernate.dialect.Dialect; - -import java.sql.Driver; - -/** - * Le contrat d'un provider de source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceProvider<C extends DataSourceConfig, S extends DataSource> { - - /** @return le type de configuration que le provider peut fournir. */ - Class<C> getConfigClass(); - - /** @return le type de service que le provider peut fournir. */ - Class<S> getServiceClass(); - - /** @return le dialect hibernate utilisé */ - Class<? extends Dialect> getDialectClass(); - - /** @return le driver sql du service */ - Class<? extends Driver> getDriverClass(); - - /** @return la classe de migration */ -// Class<? extends AbstractDataSourceMigration> getMigrationClass(); - - /** @return les paramètres utilisables sur la configuration */ - DataSourceConfigParam[] getParams(); - - /** - * Pour créer une nouvelle configuration. - * - * @param label le libellé du service - * @param params les paramètres de la configuration - * @return la nouvelle configuration instanciée mais non initialisée. - */ - C newConfig(String label, Object... params); - - /** - * Pour créer un nouveau service à partir de sa configuration. - * <p/> - * Note: le service n'est pas ouvert. - * - * @param config la configuration du service - * @return le service instancié non ouvert. - */ - S newService(C config); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java deleted file mode 100644 index 3aa71f6..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 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% - */ -package fr.ird.observe.business.db.constants; - -import fr.ird.observe.business.db.DataSourceConfig; -import fr.ird.observe.business.db.DataSourceConfigParam; -import fr.ird.observe.db.constantes.CreationMode; -import org.hibernate.cfg.Environment; -import org.nuiton.topia.migration.TopiaMigrationEngine; - -import java.util.Set; - -/** - * Les différents parametres communs a tout type de configuration. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public enum CommonDataSourceConfigParam implements DataSourceConfigParam { - - /** le lastName d'utilisateur pour se connecter à la base */ - LOGIN( - "login", - Environment.USER, - String.class - ), - /** le mot de passe de l'utilisateur pour se connecter à la base */ - PASSWORD( - "password", - Environment.PASS, - char[].class - ), - /** un drapeau pour voir les requetes sql lors de la migration. */ - SHOW_MIGRATION_SQL( - TopiaMigrationEngine.MIGRATION_SHOW_SQL, - Boolean.class - ), - /** un drapeau pour voir la progression des requetes sql lors de la migration. */ - SHOW_MIGRATION_PROGRESSION( - TopiaMigrationEngine.MIGRATION_SHOW_PROGRESSION, - Boolean.class - ), - /** un drapeau pour autoriser les migrations. */ - CAN_MIGRATE( - "migrate", - Boolean.class - ), - /** - * le type de création de la base. - * <p/> - * Si on veut juste utiliser une base sans opération de création, on - * n'utilise pas ce paramètre. - */ - CREATION_MODE("creationMode", CreationMode.class), - - /** - * le service de persistance à utiliser en mode création pour importer un - * référentiel. - * <p/> - * Cette donnée sera utilisée uniquement si le mode de création est : - * <p/> - * {@link CreationMode#IMPORT_LOCAL_STORAGE} - * ou {@link CreationMode#IMPORT_REMOTE_STORAGE}. - */ - IMPORT_CONFIG("importConfig", DataSourceConfig.class), - /** - * le service de persistance à utiliser en mode création pour importer - * des données. - */ - IMPORT_DATA_CONFIG("importDataConfig", DataSourceConfig.class), - - /** - * Les ids à importer (si {@code null} alors on import tout). - */ - IMPORT_DATA_IDS("importDataIds", Set.class); - - private final String mapName; - - private final String propertyName; - - private final Class<?> type; - - CommonDataSourceConfigParam(String name, Class<?> type) { - this(name, name, type); - } - - CommonDataSourceConfigParam(String propertyName, - String mapName, - Class<?> type) { - this.mapName = mapName; - this.propertyName = propertyName; - this.type = type; - } - - @Override - public String getMapName() { - return mapName; - } - - @Override - public String getPropertyName() { - return propertyName; - } - - @Override - public Class<?> getType() { - return type; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java index 2451881..8538cbe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.business.report.model; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.db.ObserveSwingDataSource; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -82,7 +81,7 @@ public class ReportExecute { } public void populate(Report report, - String tripId) throws DataSourceException { + String tripId) { if (!checkDataSource(source)) { // source de donnee fermée @@ -94,7 +93,7 @@ public class ReportExecute { doPopulateVariables(tripId); } - public DataMatrix execute(Map<String, Object> variables) throws DataSourceException { + public DataMatrix execute(Map<String, Object> variables) { if (report == null) { @@ -208,7 +207,7 @@ public class ReportExecute { return true; } - protected void doPopulateVariables(String tripId) throws DataSourceException { + protected void doPopulateVariables(String tripId) { // on nettoye les univers de variables avant tout variablesUniverse.clear(); @@ -248,7 +247,7 @@ public class ReportExecute { // } } - protected void doPopulateRepeatVariables(Map<String, Object> variables) throws DataSourceException { + protected void doPopulateRepeatVariables(Map<String, Object> variables) { // on nettoye les univers de variables de répétition avant tout repeatVariablesUniverse.clear(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java index 621740d..91f5bde 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceFactory; + import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -117,7 +117,8 @@ public class ObserveValidator<B> extends SwingValidator<B> { throw new IllegalStateException( "pas de context d'application enregistré... utiliser la " + "methode " + - DataSourceFactory.class.getName() + + //FIXME +// DataSourceFactory.class.getName() + "#setApplicationContext(context)"); } dataContext = rootContext.getValidationContext(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java index 8bd8c2e..8c5f73d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java @@ -22,7 +22,8 @@ package fr.ird.observe.business.validation; 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.AbstractObserveDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -52,7 +53,7 @@ public class ValidationContext { public static final String VALIDATION_TRANSACTION_NAME = "validation"; - protected DataSource dataSource; + protected ObserveSwingDataSource dataSource; //FIXME // protected TopiaContext tx; @@ -76,7 +77,7 @@ public class ValidationContext { cleanTransaction(); } - public DataSource getDataSource() { + public ObserveSwingDataSource getDataSource() { return dataSource; } @@ -134,12 +135,12 @@ public class ValidationContext { return dataContext; } - public void setDataSource(DataSource dataSource) { + public void setDataSource(ObserveSwingDataSource dataSource) { if (this.dataSource != null) { closeDataSource(); } if (log.isDebugEnabled()) { - log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getShortLabel())); + log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getLabel())); } this.dataSource = dataSource; } @@ -255,7 +256,7 @@ public class ValidationContext { } //FIXME -// public TopiaContext getTx() throws DataSourceException { +// public TopiaContext getTx() { // if (tx == null) { // if (dataSource != null) { // if (log.isInfoEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java index a176494..3f26531 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java @@ -23,8 +23,6 @@ package fr.ird.observe.ui.actions; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.configuration.ObserveSwingApplicationConfigOption; import fr.ird.observe.db.ObserveSwingDataSource; @@ -43,14 +41,8 @@ import org.nuiton.config.ConfigOptionDef; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; -import javax.swing.AbstractAction; -import javax.swing.DefaultCellEditor; -import javax.swing.DefaultListCellRenderer; -import javax.swing.Icon; -import javax.swing.JComboBox; -import javax.swing.JList; -import javax.swing.JTable; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.util.EventObject; @@ -100,11 +92,7 @@ public class ShowConfigAction extends AbstractAction { ObserveConfigUIBuilder helper; - try { - helper = buildUI(config, dataSource); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load some data", e); - } + helper = buildUI(config, dataSource); helper.buildUI(ui, "observe.config.category.directories"); @@ -114,7 +102,7 @@ public class ShowConfigAction extends AbstractAction { } - protected ObserveConfigUIBuilder buildUI(ObserveSwingApplicationConfig config, ObserveSwingDataSource dataSource) throws DataSourceException { + protected ObserveConfigUIBuilder buildUI(ObserveSwingApplicationConfig config, ObserveSwingDataSource dataSource) { //FIXME // SpeciesListTableCellEditor editor; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index e67bd3a..586f716 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -25,8 +25,8 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.SendMessageAble; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.business.validation.ValidationService; import fr.ird.observe.db.ObserveSwingDataSource; @@ -186,9 +186,9 @@ public class AdminTabUIHandler implements SendMessageAble { return WizardState.FAILED; } - protected void replicateData(DataSource source, - DataSource target, - String... tripIds) throws DataSourceException { + protected void replicateData(ObserveSwingDataSource source, + ObserveSwingDataSource target, + String... tripIds) { //FIXME // ReplicationService service = getReplicationService(); // if (tripIds == null || tripIds.length == 0) { @@ -202,31 +202,31 @@ public class AdminTabUIHandler implements SendMessageAble { // } } - protected void replicateReferentiel(DataSource source, - DataSource target) throws DataSourceException { + protected void replicateReferentiel(ObserveSwingDataSource source, + ObserveSwingDataSource target) { //FIXME // getReplicationService().replicateReferentiel(source, target); } //FIXME -// protected TopiaContext beginTransaction(DataSource source, String methodName) throws DataSourceException { +// protected TopiaContext beginTransaction(DataSource source, String methodName) { // TopiaContext ctxt = source.beginTransaction(methodName); // return ctxt; // } //FIXME -// protected void commitTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void commitTransaction(DataSource source, TopiaContext tx, String methodName) { // source.commitTransaction(tx, methodName); // } //FIXME -// protected void closeTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void closeTransaction(DataSource source, TopiaContext tx, String methodName) { // source.closeTransaction(tx, methodName); // } //FIXME -// protected void rollbackTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void rollbackTransaction(DataSource source, TopiaContext tx, String methodName) { // source.rollbackTransaction(tx, methodName); // } @@ -371,9 +371,9 @@ public class AdminTabUIHandler implements SendMessageAble { // } } - protected void removeStorageServiceLogger(DataSource service) { -// if (service.containsObserveSwingDataSourceListener(serviceLogger)) { -// service.removeObserveSwingDataSourceListener(serviceLogger); + protected void removeStorageServiceLogger(ObserveSwingDataSource service) { +// if (service.containsDataSourceListener(serviceLogger)) { +// service.removeDataSourceListener(serviceLogger); // } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index f22fc0c..e5cbec6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -444,7 +444,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { //FIXME // protected void validateReferentiel(ValidationMessageDetector detector, // TopiaContext ctxt, -// DataSelectionModel dataModel) throws DataSourceException, TopiaException { +// DataSelectionModel dataModel), TopiaException { // // DataService dataService = getDataService(); // Set<Class<?>> classes = dataModel.getSelectedReferentiel(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx index c7106cc..6156c05 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx @@ -35,7 +35,7 @@ <import> fr.ird.observe.business.db.DataContext - fr.ird.observe.business.db.DataSource + fr.ird.observe.db.ObserveSwingDataSource fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.ObserveSwingApplicationContext fr.ird.observe.ui.actions.shared.GoUpUIAction @@ -61,8 +61,8 @@ initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> <!--FIXME a supprimer a la fin de la migration de service --> - <DataSource id='dataSource' - initializer='null'/> + <ObserveSwingDataSource id='dataSource' + initializer='ObserveSwingApplicationContext.get().getDataSource()'/> <DataContext id='dataContext' javaBean='getContextValue(DataContext.class)'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java index c33bf06..5a40d9e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java @@ -23,7 +23,8 @@ package fr.ird.observe.ui.content; */ 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.IdDto; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.BlockingLayerUI; @@ -49,7 +50,7 @@ public interface ObserveContentUI<E extends IdDto> extends JAXXObject { DataContext getDataContext(); - DataSource getDataSource(); + ObserveSwingDataSource getDataSource(); SwingValidatorMessageTableModel getErrorTableModel(); 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 06e68bb..cc1e8ac 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -24,9 +24,9 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; 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 dd5ceaf..6cfbec7 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 @@ -271,7 +271,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co //FIXME // protected final void obtainChildPosition(E bean, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // String containerId = getSelectedParentId(); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java index 1209507..c753cc2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableUIInitializer; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 585c342..9a6abe7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -297,7 +297,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip //FIXME // @Override -// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java index aba9b82..91fd1c6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.HooksCompositionDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 33f070a..c0f7776 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -26,10 +26,10 @@ import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.longline.TdrDto; @@ -50,13 +50,11 @@ import org.nuiton.jaxx.runtime.JaxxFileChooser; import org.nuiton.validator.NuitonValidatorScope; import javax.sql.rowset.serial.SerialBlob; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Component; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -261,7 +259,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> //FIXME // @Override -// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 93ad580..78ba65a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -295,7 +295,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei //FIXME // @Override -// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 4c3821f..477693c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -208,7 +208,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciesList; // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 47cc1c1..698f71e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SexDto; @@ -127,7 +127,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam // protected NonTargetSample loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciess; // @@ -176,7 +176,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam // } @Override - protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) throws DataSourceException { + protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) { boolean withLengths = !objets.isEmpty(); @@ -205,7 +205,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam //FIXME // @Override -// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) { // // if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index a429375..1a4d8f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -71,7 +71,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineDto, //FIXME // @Override -// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // List<Species> speciesList; // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index 354e09b..f8b90e8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -137,7 +136,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciesList; // List<WeightCategory> categorieList; @@ -231,7 +230,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar // } @Override - protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetCatch diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 441ffec..dd5146a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -191,7 +190,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<WeightCategory> categorieList; // List<ReasonForDiscard> reasonForDiscardList; @@ -296,7 +295,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD } @Override - protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetDiscarded montee sur le pont diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index 66da3e7..0c94b6e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; 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.DataSourceException; + + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -137,7 +137,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto // protected TargetSample loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // String setId = dataContext.getSelectedSetId(); // @@ -182,7 +182,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto // } @Override - protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) throws DataSourceException { + protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) { boolean withLengths = !objets.isEmpty(); @@ -218,7 +218,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto //FIXME // @Override -// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) { // // if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 7a47fa6..a83ae3d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -29,8 +29,10 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constantes.ConnexionStatus; @@ -708,7 +710,6 @@ public class StorageUIHandler { ObserveSwingApplicationContext.get().getDecoratorService(); return decoratorService; } - protected void computeBackupReport(SelectDataUI stepUI, StorageUIModel model, StringBuilder sb) { @@ -802,7 +803,7 @@ public class StorageUIHandler { addCloseTag("ul", sb); } - protected void computeImportDataReport(StorageUIModel model, StringBuilder sb) throws DataSourceException { + protected void computeImportDataReport(StorageUIModel model, StringBuilder sb) { //FIXME // DataSelectionModel dataModel = model.getSelectDataModel(); @@ -948,17 +949,26 @@ public class StorageUIHandler { } - protected void checkImportDbVersion(StorageUIModel model, DataSource dataSource) throws DataSourceException { + protected void checkImportDbVersion(StorageUIModel model, ObserveSwingDataSource dataSource) { + //FIXME try { - dataSource.doOpen(); + dataSource.open(); - Version importServiceDbVersion = dataSource.getDbVersion(); + Version importServiceDbVersion = dataSource.getVersion(); Version currentDbVersion = model.getModelVersion(); if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } + } catch (DatabaseConnexionNotAuthorizedException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } + } catch (DatabaseNotFoundException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } } finally { - dataSource.doClose(false); + dataSource.close(); } } 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 fa83798..17d982d 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 @@ -42,7 +42,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { //FIXME // @Override -// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { // return dataService.getActivityLonglineStub(source, id); // } 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 c8332da..e4abe09 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 @@ -41,7 +41,7 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { } // @Override -// protected ActivitySeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected ActivitySeine getEntity(DataService dataService, DataSource source) { // return dataService.getActivitySeineStub(source, id); // } 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 1067ca8..bf25cce 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 @@ -42,7 +42,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { //FIXME // @Override -// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) { // return dataService.getFloatinObjectStub(source, id); // } 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 ecc7df7..83e8a5b 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 @@ -40,7 +40,7 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { } // @Override -// protected Route getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected Route getEntity(DataService dataService, DataSource source) { // return dataService.getRouteStub(source, id); // } 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 a881387..5827a9d 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 @@ -42,7 +42,7 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { //FIXME // @Override -// protected SetLongline getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected SetLongline getEntity(DataService dataService, DataSource source) { // return (SetLongline) dataService.loadEntity(source, id, true); // } 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 7c97b8e..3e6e259 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 @@ -42,7 +42,7 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { //FIXME // @Override -// protected SetSeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected SetSeine getEntity(DataService dataService, DataSource source) { // return (SetSeine) dataService.loadEntity(source, id, true); // } 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 2297ba1..2d4fbc6 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 @@ -41,7 +41,7 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { //FIXME // @Override -// protected TripLongline getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected TripLongline getEntity(DataService dataService, DataSource source) { // return dataService.getTripLonglineStub(source, id); // } 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 ff3e2f7..b18213c 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 @@ -45,7 +45,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { } // @Override -// protected TripSeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected TripSeine getEntity(DataService dataService, DataSource source) { // return dataService.getTripSeineStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java index 7ac148c..8e8754a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java @@ -22,7 +22,8 @@ package fr.ird.observe.ui.tree.actions; * #L% */ -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -51,13 +52,13 @@ public class ChangeTripProgramActionListener implements ActionListener { //FIXME // private final DataService dataService; - private final DataSource dataSource; + private final ObserveSwingDataSource dataSource; public ChangeTripProgramActionListener(ObserveTreeHelper treeHelper, //FIXME // DataService dataService, Object dataService, - DataSource dataSource, + ObserveSwingDataSource dataSource, String tripId, String programId) { this.tripId = tripId; 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 c3e45f0..07f9e3d 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 @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -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.longline.SetLonglineDto; @@ -91,7 +90,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataService) throws DataSourceException { + NavDataProvider dataService) { //FIXME // List<String> result = new ArrayList<String>(); 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 e90bab7..d299ecc 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 @@ -21,7 +21,7 @@ */ 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.tree.ObserveNode; @@ -54,7 +54,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataService) throws DataSourceException { + NavDataProvider dataService) { //FIXME // List<String> result = new ArrayList<String>(); 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 d4395cc..8517b48 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 @@ -21,7 +21,7 @@ */ 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.tree.ObserveNode; @@ -71,7 +71,7 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDt @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { //FIXME // List<Class> result = new ArrayList<Class>(); 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 244aa7e..e9f15ba 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 @@ -21,7 +21,7 @@ */ 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; @@ -79,7 +79,7 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); //FIXME 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 09c1e67..c6a8377 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 @@ -21,7 +21,7 @@ */ 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; @@ -71,7 +71,7 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); //FIXME 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 b418489..310874e 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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -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.tree.ObserveNode; @@ -57,7 +57,7 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> { @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { // FIXME // List<String> result = new ArrayList<String>(); 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 5a3a559..43f4c03 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 @@ -21,7 +21,7 @@ */ 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; @@ -63,7 +63,7 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<String> result = new ArrayList<String>(); result.add(SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d7839fa8a937efee9fb5244878c5db8ff1f42c85 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 2 ++ .../list/impl/seine/ActivitySeinesUIHandler.java | 15 ++++++++ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 6 ++-- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 21 ++++++++--- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 8 ----- .../ui/tree/loadors/AbstractNodeChildLoador.java | 17 +-------- .../loadors/AbstractReferenceDtoChildLoador.java | 15 ++++++++ .../loadors/ActivityLonglineNodeChildLoador.java | 11 +++--- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 18 ++++++---- .../loadors/FloatingObjectNodeChildLoador.java | 17 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 12 +++---- .../loadors/ReferenceCommonNodeChildLoador.java | 42 ++++++++++------------ .../loadors/ReferenceLonglineNodeChildLoador.java | 25 ++++++------- .../loadors/ReferenceSeineNodeChildLoador.java | 26 ++++++-------- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 25 ++++++++----- .../tree/loadors/SetLonglineNodeChildLoador.java | 12 +++---- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 16 ++++----- .../v1/seine/ActivitySeineServiceController.java | 10 +++++- .../v1/seine/RouteServiceController.java | 3 +- .../service/seine/ActivitySeineService.java | 5 ++- .../services/service/seine/RouteService.java | 3 +- .../service/seine/ActivitySeineServiceTopia.java | 31 +++++++++++++++- .../services/service/seine/RouteServiceTopia.java | 22 +++++------- 27 files changed, 211 insertions(+), 159 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 95939d3..5701626 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 @@ -406,10 +406,12 @@ public class DecoratorService extends DecoratorProvider { registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); + registerReferenceDtoDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s"); registerMultiJXPathDecorator( ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", 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 4421b4a..3ee3ed5 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 @@ -116,6 +116,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<ReferenceDto> getChilds(RouteDto bean) { +<<<<<<< HEAD ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); ReferenceSetDto<ActivitySeineStubDto> activitySeineStubByRoute = service.getActivitySeineStubByRoute(bean.getId()); @@ -124,6 +125,20 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti } return new ArrayList<>(activitySeineStubByRoute.getReference()); +======= + ObserveSwingDataSource source = getDataSource(); + //FIXME +// DataService dataService = getDataService(); +// +// List<ActivitySeine> list = dataService.getActivitySeineByRoute(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " activities."); +// } +// +// return list; + return null; +>>>>>>> chargement des noeuds des routes (refs #7553) } @Override 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 24189b2..ae5455f 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 @@ -56,7 +56,7 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { private boolean reloadEntity; - //FIXME makle abstratc + //FIXME make abstratc protected ReferenceDto<E> fetchEntity() { return null; } @@ -65,11 +65,11 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { this(internalClass, entity, null); } - protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?, ?> childLoador) { this(type, entity, null, childLoador); } - protected DtoNodeSupport(Class<E> type, ReferenceDto<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); } 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 83e8a5b..a9e8b74 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,8 +22,13 @@ 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.seine.RouteDto; +import fr.ird.observe.services.service.seine.RouteService; /** * Created on 4/9/15. @@ -39,9 +44,17 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { super(RouteDto.class, entity); } -// @Override -// protected Route getEntity(DataService dataService, DataSource source) { -// return dataService.getRouteStub(source, id); -// } + @Override + protected ReferenceDto<RouteDto> fetchEntity() { + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + FormDto<RouteDto> formDto = routeService.loadToRead(entity.getId()); + ReferenceDto<RouteDto> referenceDto = + ReferenceDtos.newReferenceDto(RouteDto.class, Lists.newArrayList(RouteDto.PROPERTY_ID, + RouteDto.PROPERTY_DATE)); + referenceDto.setPropertyValue(RouteDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(RouteDto.PROPERTY_DATE, formDto.getForm().getDate()); + + return referenceDto; + } } 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 b18213c..787ad27 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 @@ -44,20 +44,12 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { super(TripSeineDto.class, entity); } -// @Override -// protected TripSeine getEntity(DataService dataService, DataSource source) { -// return dataService.getTripSeineStub(source, id); -// } - @Override protected ReferenceDto<TripSeineDto> fetchEntity() { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); -// "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" -// + libelle + "}$s##${observerLabel}$s" - ReferenceDto<TripSeineDto> referenceDto = ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, TripSeineDto.PROPERTY_START_DATE, 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 cd8338e..1194c64 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,8 +22,6 @@ 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; @@ -35,7 +33,7 @@ import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNodeChildLoador<ReferenceDto<O>, O, ObserveNode> { +public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoador<T, O, ObserveNode> { private static final long serialVersionUID = 1L; @@ -56,17 +54,4 @@ public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNo // return result; // } - //FIXME -// protected DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - - //FIXME -// protected DecoratorService getDecoratorService() { -// return getDataService().getDecoratorService(); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java new file mode 100644 index 0000000..3b22e6b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java @@ -0,0 +1,15 @@ +package fr.ird.observe.ui.tree.loadors; + +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public abstract class AbstractReferenceDtoChildLoador<O extends IdDto> extends AbstractNodeChildLoador<ReferenceDto<O>, O> { + + protected AbstractReferenceDtoChildLoador(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 07f9e3d..47091aa 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 @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -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; @@ -42,7 +41,7 @@ import static org.nuiton.i18n.I18n.n; * @since 3.7 */ //FIXME -public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//AbstractNodeChildLoador<String> { +public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -53,7 +52,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } public ActivityLonglineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override @@ -88,7 +87,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { @@ -103,9 +102,9 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(null); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } 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 a58c40f..16cdd2a 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 @@ -38,7 +38,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglinesNodeChildLoador extends AbstractNodeChildLoador<ActivityLonglineDto> { +public class ActivityLonglinesNodeChildLoador extends AbstractReferenceDtoChildLoador<ActivityLonglineDto> { private static final long serialVersionUID = 1L; 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 a6f8dfe..8aa8449 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 @@ -44,7 +44,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<FloatingObjectDto> { +public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoador<FloatingObjectDto> { private static final long serialVersionUID = 1L; 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 81720b3..53a7242 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 @@ -21,14 +21,17 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; 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.seine.ActivitySeineDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.tree.ActivitySeineNode; -import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; /** @@ -37,7 +40,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<ActivitySeineDto> { +public class ActivitySeinesNodeChildLoador extends AbstractReferenceDtoChildLoador<ActivitySeineDto> { private static final long serialVersionUID = 1L; @@ -50,11 +53,14 @@ public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<Activ String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); +// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME -// List<ActivitySeineDto> data = getDataService().getActivitySeineStubByRoute(dataSource, parentId); +// List<ActivitySeineDto> data = getDataService().getActivitySeineByRoute(dataSource, parentId); // return data; - return null; + ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ReferenceSetDto<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(activitySeineStubByRoute.getReference())); } 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 d299ecc..07bfbb1 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,9 +22,8 @@ package fr.ird.observe.ui.tree.loadors; -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.List; @@ -37,12 +36,12 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXMEString> { +public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; public FloatingObjectNodeChildLoador() { - super(IdDto.class); + super(String.class); } static { @@ -52,7 +51,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { @@ -66,12 +65,10 @@ return null; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - //FIXME -// ObserveNode result = ObserveTreeHelper.createStringNode(data); -// return result; - return null; + ObserveNode result = ObserveTreeHelper.createStringNode(data); + return result; } 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 8b2b865..19856f8 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 @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<TripLonglineDto> { +public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoador<TripLonglineDto> { private static final long serialVersionUID = 1L; 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 8f3f563..6c38c60 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 @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; @@ -44,7 +45,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSeineDto> { +public class ProgramSeineNodeChildLoador extends AbstractReferenceDtoChildLoador<TripSeineDto> { private static final long serialVersionUID = 1L; @@ -121,15 +122,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei { // Add gears //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesSeine"); + result.add(child); } { // Add routes - //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_ROUTE, RoutesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("route", RoutesNodeChildLoador.class); + result.add(child); } } 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 8517b48..08e9ae1 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.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; +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<IdDto> {//FIXME Class> { +public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -65,37 +65,33 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDt } public ReferenceCommonNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { + List<Class> result = new ArrayList<Class>(); //FIXME -// 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; +// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { +// result.add(anEnum.getContract()); +// } + UIHelper.sortReferentiel(result); + return result; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { //FIXME -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - - return null; + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } 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 e9f15ba..91c5968 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,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; -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; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -73,11 +71,11 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id } public ReferenceLonglineNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -91,15 +89,14 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - return null; + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } 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 c6a8377..a6a4b8e 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,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; -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; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -65,11 +63,11 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto } public ReferenceSeineNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -84,15 +82,13 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { -//FIXME -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - return null; + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } 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 98da3e2..3f3c48c 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 @@ -47,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { +public class RootNodeChildLoador extends AbstractReferenceDtoChildLoador<ProgramDto> { private static final long serialVersionUID = 1L; 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 d1f8582..ef1f626 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 @@ -21,14 +21,18 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; 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.seine.RouteDto; -import fr.ird.observe.ui.tree.ObserveDataProvider; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.RouteSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -39,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { +public class RoutesNodeChildLoador extends AbstractReferenceDtoChildLoador<RouteDto> { private static final long serialVersionUID = 1L; @@ -56,14 +60,20 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); +// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME // List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); // return data; - return null; + + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + ReferenceSetDto<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(routeByTripSeine.getReference())); } + + @Override public ObserveNode createNode(ReferenceDto<RouteDto> data, NavDataProvider dataProvider) { @@ -74,9 +84,8 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { ObserveNode result = new RouteSeineNode(data); // Creation d'un node activites - //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("activitySeine", ActivitySeinesNodeChildLoador.class); + result.add(child); return result; } 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 310874e..a6b2415 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,8 +23,6 @@ package fr.ird.observe.ui.tree.loadors; */ -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; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { +public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -51,11 +49,11 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> { } public SetLonglineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -71,9 +69,9 @@ return null; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(null); + ObserveNode result = ObserveTreeHelper.createStringNode(data); 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 43f4c03..1378a00 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,13 +22,12 @@ package fr.ird.observe.ui.tree.loadors; -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; @@ -42,7 +41,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { +public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -57,11 +56,11 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F } public SetSeineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -80,10 +79,9 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { -// ObserveNode result = ObserveTreeHelper.createStringNode(data); -// return result; -return null; + ObserveNode result = ObserveTreeHelper.createStringNode(data); + return result; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index 263fba8..37cf567 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -24,9 +24,12 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +<<<<<<< HEAD +======= +import fr.ird.observe.services.dto.ReferenceDto; +>>>>>>> chargement des noeuds des routes (refs #7553) import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.service.seine.ActivitySeineService; /** @@ -39,8 +42,13 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override +<<<<<<< HEAD public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { return service.getActivitySeineStubByRoute(routeId); +======= + public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { + return service.getActivitySeineByRoute(routeId); +>>>>>>> chargement des noeuds des routes (refs #7553) } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index fa69e04..309ad47 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.service.seine.RouteService; /** @@ -40,7 +39,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { return service.getRouteByTripSeine(tripSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index a7c1337..3c60a73 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -26,7 +26,6 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -39,7 +38,11 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivitySeineService extends ObserveService { @ReadDataPermission +<<<<<<< HEAD ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); +======= + ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId); +>>>>>>> chargement des noeuds des routes (refs #7553) @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 242c630..ec04df2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -40,7 +39,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface RouteService extends ObserveService { @ReadDataPermission - ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId); + ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId); @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 9f45ff4..50d3598 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; @@ -53,6 +52,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override +<<<<<<< HEAD public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); @@ -75,15 +75,44 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE, activitySeine.getSetSeine() != null); +======= + public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { + + ReferenceLocale referenceLocale = getReferenceLocale(); + + Route route = loadEntity(RouteDto.class, Route.class, routeId); + + LinkedHashSet<ReferenceDto<ActivitySeineDto>> stubs = Sets.newLinkedHashSet(); + + for (ActivitySeine activitySeine : route.getActivitySeine()) { + + ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, + Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + //FIXME + "hasSetSeine")); + stub.setId(activitySeine.getTopiaId()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, activitySeine.getVesselActivitySeine()); + stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); + + stubs.add(stub); +>>>>>>> chargement des noeuds des routes (refs #7553) stubs.add(stub); } +<<<<<<< HEAD Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); ReferenceSetDto<ActivitySeineStubDto> stubReferences = ReferenceSetDtos.newReferenceSetDto(ActivitySeineStubDto.class, stubs, lastUpdateOptional.orNull()); return stubReferences; +======= + ReferenceSetDto<ActivitySeineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivitySeineDto.class, stubs, null); + return result; +>>>>>>> chargement des noeuds des routes (refs #7553) } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 49e7bf6..2e14e7d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.lang3.time.DateUtils; @@ -54,29 +53,26 @@ import java.util.LinkedHashSet; public class RouteServiceTopia extends ObserveServiceTopia implements RouteService { @Override - public ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - LinkedHashSet<ReferenceDto<RouteStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<RouteDto>> stubs = Sets.newLinkedHashSet(); for (Route route : tripSeine.getRoute()) { - ReferenceDto<RouteStubDto> stub = ReferenceDtos.newReferenceDto(RouteStubDto.class, - Lists.newArrayList(RouteStubDto.PROPERTY_DATE)); - - stub.setId(route.getTopiaId()); - stub.setPropertyValue(RouteStubDto.PROPERTY_DATE, route.getDate()); + ReferenceDto<RouteDto> stub = ReferenceDtos.newReferenceDto(RouteDto.class, + Lists.newArrayList(RouteDto.PROPERTY_ID, + RouteDto.PROPERTY_DATE)); + stub.setId(tripSeine.getTopiaId()); + stub.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); stubs.add(stub); } - Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); - ReferenceSetDto<RouteStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(RouteStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; + ReferenceSetDto<RouteDto> result = ReferenceSetDtos.newReferenceSetDto(RouteDto.class, stubs, null); + return result; } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bc488fdc02ceab48b1f18fe6c716649411128221 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) --- .../src/main/filters/observe-ui.properties | 72 +-- .../business/db/model/DataSelectionModel.java | 482 +++++++++++++++++++++ .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 12 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 7 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 13 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 12 +- 8 files changed, 551 insertions(+), 75 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index 7a0608a..aaa1d4d 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -25,48 +25,48 @@ icon.navigation.referentiel=navigation/ird/referentiel24.png icon.navigation.sub.referentiel=navigation/ird/sub_referentiel16.png -icon.navigation.fr.ird.observe.entities.referentiel.Program=navigation/ird/program24.png - -icon.navigation.fr.ird.observe.entities.seine.TripSeine=navigation/ird/trip24.png -icon.navigation.fr.ird.observe.entities.seine.Route=navigation/ird/route24.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine=navigation/ird/activity24.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine.sub=navigation/ird/observedSystem24.png -icon.navigation.fr.ird.observe.entities.seine.FloatingObject=navigation/ird/floatingObject24.png -icon.navigation.fr.ird.observe.entities.seine.FloatingObject.sub=navigation/ird/sub_floatingObject16.png -icon.navigation.fr.ird.observe.entities.seine.SetSeine=navigation/ird/set24.png -icon.navigation.fr.ird.observe.entities.seine.SetSeine.sub=navigation/ird/sub_set16.png - -icon.navigation.fr.ird.observe.entities.Trip=navigation/ird/trip24.png -icon.navigation.fr.ird.observe.entities.Activity=navigation/ird/activity24.png -icon.navigation.fr.ird.observe.entities.Set=navigation/ird/set24.png - -icon.navigation.fr.ird.observe.entities.longline.TripLongline=navigation/ird/trip24.png -icon.navigation.fr.ird.observe.entities.longline.ActivityLongline=navigation/ird/route24.png -icon.navigation.fr.ird.observe.entities.longline.ActivityLongline.sub=navigation/ird/observedSystem24.png -icon.navigation.fr.ird.observe.entities.longline.SetLongline=navigation/ird/set24.png -icon.navigation.fr.ird.observe.entities.longline.SetLongline.sub=navigation/ird/sub_set16.png -icon.navigation.fr.ird.observe.entities.longline.CatchLongline=navigation/ird/floatingObject24.png -icon.navigation.fr.ird.observe.entities.longline.CatchLongline.sub=navigation/ird/sub_floatingObject16.png -icon.navigation.fr.ird.observe.entities.longline.Tdr=navigation/ird/floatingObject24.png -icon.navigation.fr.ird.observe.entities.longline.Tdr.sub=navigation/ird/sub_floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.referential.ProgramDto=navigation/ird/program24.png + +icon.navigation.fr.ird.observe.services.dto.seine.TripSeineDto=navigation/ird/trip24.png +icon.navigation.fr.ird.observe.services.dto.seine.RouteDto=navigation/ird/route24.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto=navigation/ird/activity24.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto.sub=navigation/ird/observedSystem24.png +icon.navigation.fr.ird.observe.services.dto.seine.FloatingObjectDto=navigation/ird/floatingObject24.png +icon.navigation.fr.ird.observe.services.dto.seine.FloatingObjectDto.sub=navigation/ird/sub_floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.seine.SetSeineDto=navigation/ird/set24.png +icon.navigation.fr.ird.observe.services.dto.seine.SetSeineDto.sub=navigation/ird/sub_set16.png + +icon.navigation.fr.ird.observe.services.dto.TripDto=navigation/ird/trip24.png +icon.navigation.fr.ird.observe.services.dto.ActivityDto=navigation/ird/activity24.png +icon.navigation.fr.ird.observe.services.dto.SetDto=navigation/ird/set24.png + +icon.navigation.fr.ird.observe.services.dto.longline.TripLonglineDto=navigation/ird/trip24.png +icon.navigation.fr.ird.observe.services.dto.longline.ActivityLonglineDto=navigation/ird/route24.png +icon.navigation.fr.ird.observe.services.dto.longline.ActivityLonglineDto.sub=navigation/ird/observedSystem24.png +icon.navigation.fr.ird.observe.services.dto.longline.SetLonglineDto=navigation/ird/set24.png +icon.navigation.fr.ird.observe.services.dto.longline.SetLonglineDto.sub=navigation/ird/sub_set16.png +icon.navigation.fr.ird.observe.services.dto.longline.CatchLonglineDto=navigation/ird/floatingObject24.png +icon.navigation.fr.ird.observe.services.dto.longline.CatchLonglineDto.sub=navigation/ird/sub_floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.longline.TdrDto=navigation/ird/floatingObject24.png +icon.navigation.fr.ird.observe.services.dto.longline.TdrDto.sub=navigation/ird/sub_floatingObject16.png icon.navigation.referentiel-16=navigation/ird/referentiel16.png icon.navigation.sub.referentiel-16=navigation/ird/sub_referentiel16.png -icon.navigation.fr.ird.observe.entities.referentiel.Program-16=navigation/ird/program16.png +icon.navigation.fr.ird.observe.services.dto.referential.ProgramDto-16=navigation/ird/program16.png -icon.navigation.fr.ird.observe.entities.seine.TripSeine-16=navigation/ird/trip16.png -icon.navigation.fr.ird.observe.entities.seine.Route-16=navigation/ird/route16.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine-16=navigation/ird/activity16.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine.sub-16=navigation/ird/observedSystem16.png -icon.navigation.fr.ird.observe.entities.seine.FloatingObject-16=navigation/ird/floatingObject16.png -icon.navigation.fr.ird.observe.entities.seine.SetSeine-16=navigation/ird/set16.png +icon.navigation.fr.ird.observe.services.dto.seine.TripSeineDto-16=navigation/ird/trip16.png +icon.navigation.fr.ird.observe.services.dto.seine.RouteDto-16=navigation/ird/route16.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto-16=navigation/ird/activity16.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto.sub-16=navigation/ird/observedSystem16.png +icon.navigation.fr.ird.observe.services.dto.seine.FloatingObjecDtot-16=navigation/ird/floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.seine.SetSeineDto-16=navigation/ird/set16.png -icon.navigation.fr.ird.observe.entities.longline.TripLongline-16=navigation/ird/trip16.png -icon.navigation.fr.ird.observe.entities.longline.ActivityLongline-16=navigation/ird/route16.png -icon.navigation.fr.ird.observe.entities.longline.SetLongline-16=navigation/ird/set16.png -icon.navigation.fr.ird.observe.entities.longline.CatchLongline-16=navigation/ird/floatingObject16.png -icon.navigation.fr.ird.observe.entities.longline.Tdr-16=navigation/ird/floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.longline.TripLonglineDto-16=navigation/ird/trip16.png +icon.navigation.fr.ird.observe.services.dto.longline.ActivityLonglineDto-16=navigation/ird/route16.png +icon.navigation.fr.ird.observe.services.dto.longline.SetLonglineDto-16=navigation/ird/set16.png +icon.navigation.fr.ird.observe.services.dto.longline.CatchLonglineDto-16=navigation/ird/floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.longline.TdrDto-16=navigation/ird/floatingObject16.png # icones d'action sur les editeurs numeriques #icon.action.numbereditor-showpopup=action-numbereditor-showpopup.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java new file mode 100644 index 0000000..f51b7f8 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java @@ -0,0 +1,482 @@ +package fr.ird.observe.business.db.model; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ + +import fr.ird.observe.services.dto.ReferenceDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +/** + * Un modèle pour représenter la sélection de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class DataSelectionModel implements Serializable { + +// public static void populate(DataSelectionModel model, +// ObserveSwingDataSource source) throws Exception { +// +// Preconditions.checkState(source.isOpen()); +// +// Map<String, List<String>> datas = new HashMap<String, List<String>>(); +// +// List<ProgramDto> programs = service.getAllProgramStub(source); +// for (Program program : programs) { +// +// if (Programs.isProgramSeine(program)) { +// List<TripSeine> trips = service.getTripSeineStubByProgram(source, program.getTopiaId()); +// populate(model, program, trips, datas); +// } +// +// if (Programs.isProgramLongline(program)) { +// List<TripLongline> trips = service.getTripLonglineStubByProgram(source, program.getTopiaId()); +// populate(model, program, trips, datas); +// } +// +// } +// model.setDatas(datas); +// +// } + +// protected static <T extends Trip> void populate(DataSelectionModel model, +// Program program, +// List<T> trips, +// Map<String, List<String>> datas) { +// +// model.cacheEntity(program); +// +// if (!trips.isEmpty()) { +// List<String> tripIds = new ArrayList<String>(); +// +// if (model.isUseOpenData()) { +// +// // ajout de toutes les marées ouvertes ou non +// for (T trip : trips) { +// trip.setProgram(program); +// model.cacheEntity(trip); +// tripIds.add(trip.getTopiaId()); +// } +// +// } else { +// +// // ajout de toutes les marées non ouvertes +// for (T trip : trips) { +// trip.setProgram(program); +// if (!trip.isOpen()) { +// model.cacheEntity(trip); +// tripIds.add(trip.getTopiaId()); +// } +// } +// +// } +// +// if (!tripIds.isEmpty()) { +// +// datas.put(program.getTopiaId(), tripIds); +// if (log.isDebugEnabled()) { +// log.debug("Add program " + program.getLabel1() + " with " + tripIds.size() + " trip(s)."); +// } +// +// } +// +// } +// +// } + + public static final String PROPERTY_USE_REFERENTIEL = "useReferentiel"; + + public static final String PROPERTY_USE_DATA = "useData"; + + public static final String PROPERTY_USE_OPEN_DATA = "useOpenData"; + + public static final String PROPERTY_SELECTED_DATA = "selectedData"; + + public static final String PROPERTY_SELECTED_REFERENTIEL = "selectedReferentiel"; + + public static final String PROPERTY_DATAS = "datas"; + + /** Logger */ + private static final Log log = LogFactory.getLog(DataSelectionModel.class); + + private static final long serialVersionUID = 2L; + + /** un drapeau pour selectionner ou non les donnees observers */ + protected boolean useData; + + /** un drapeau pour selectionner ou non des donnees observers ouvertes */ + protected boolean useOpenData; + + /** un drapeau pour selectionner ou non des donnees observer */ + protected boolean useReferentiel; + + /** la liste des programs utilisables (qui ont des marees) */ + protected transient Map<String, List<String>> datas; + + /** + * Le cache des entités chargées pour construire le modèle de sélection. + * + * Ces entités pourront ensuite être injectées dans les noeuds sans avoir à les recharger. + * + * @since 4.0 + */ + protected final Map<String, ReferenceDto> entityCache; + + /** la liste des marees selectionnee */ + protected transient Set<String> selectedData; + + /** la liste des referentiels possibles */ + protected final Set<Class<?>> referentiel; + + /** la liste des referentiels selectionnes */ + protected final Set<Class<?>> selectedReferentiel; + + /** nb marees */ + protected int nbTrips; + + /** nb referentiels */ + protected final int nbReferentiels; + + protected final PropertyChangeSupport pcs; + + public void populate() throws Exception { + throw new UnsupportedOperationException(); + } + + public DataSelectionModel() { + pcs = new PropertyChangeSupport(this); + //FIXME +// Class<?>[] classes = TopiaEntityHelper.getContracts(Entities.REFERENCE_ENTITIES); +// List<Class<?>> list = Arrays.asList(classes); +// referentiel = new HashSet<Class<?>>(list); + referentiel = new HashSet<Class<?>>(); + selectedReferentiel = new HashSet<Class<?>>(); + nbReferentiels = referentiel.size(); + entityCache = new TreeMap<String, ReferenceDto>(); + } + + public boolean isUseReferentiel() { + return useReferentiel; + } + + public boolean isUseData() { + return useData; + } + + public boolean isUseOpenData() { + return useOpenData; + } + + public boolean isEmpty() { + if (isUseReferentiel()) { + if (!isReferentielEmpty()) { + return false; + } + } + if (isUseData()) { + if (!isDataEmpty()) { + return false; + } + } + return true; + } + + protected void cacheEntity(ReferenceDto entity) { + entityCache.put(entity.getId(), entity); + } + + public ReferenceDto getEntityCache(String id) { + return entityCache.get(id); + } + + public boolean isReferentielEmpty() { + return selectedReferentiel.isEmpty(); + } + +// public boolean isReferentielFull() { +// return selectedReferentiel.size() == nbReferentiels; +// } + + public boolean isDataEmpty() { + return selectedData == null || selectedData.isEmpty(); + } + +// public boolean isDataFull() { +// return selectedData != null && selectedData.size() == nbTrips; +// } + + public Set<Class<?>> getSelectedReferentiel() { + return selectedReferentiel; + } + +// public Map<String, List<String>> getDatas() { +// if (datas == null) { +// datas = new HashMap<String, List<String>>(); +// } +// return datas; +// } + + public Set<String> getSelectedData() { + if (selectedData == null) { + selectedData = new HashSet<String>(); + } + return selectedData; + } + +// public Map<String, List<String>> getSelectedDataByProgram() { +// if (datas == null || selectedData == null || selectedData.isEmpty()) { +// return Collections.emptyMap(); +// } +// Map<String, List<String>> result = +// new HashMap<String, List<String>>(datas.size()); +// +// for (String m : selectedData) { +// +// // on recherche son program +// for (String p : datas.keySet()) { +// if (datas.get(p).contains(m)) { +// List<String> trips = result.get(p); +// if (trips == null) { +// trips = new ArrayList<String>(); +// result.put(p, trips); +// } +// trips.add(m); +// break; +// } +// } +// } +// return result; +// } +// +// public boolean isSelectedData(String id) { +// +// if (Trips.isTripId(id)) { +// +// // recherche directe sur les ids de marees +// return getSelectedData().contains(id); +// } +// +// if (id.startsWith(Program.class.getName())) { +// // on doit verifier que toutes les marees du program sont sélectionnées +// List<String> tripIds = datas.get(id); +// if (CollectionUtils.isEmpty(tripIds)) { +// +// // pas de marées +// return false; +// } +// +// for (String tripId : tripIds) { +// if (!isSelectedData(tripId)) { +// +// // au moins une marée non sélectionnée +// +// return false; +// } +// } +// +// // toutes les marées sont sélectionnée +// return true; +// } +// +// // ne devrait pas arrivée +// return false; +// +// } +// +// public boolean isSelectedReferentiel(Class<?> type) { +// checkReferentielType(type); +// return getSelectedReferentiel().contains(type); +// } +// +// public void setUseReferentiel(boolean useReferentiel) { +// this.useReferentiel = useReferentiel; +// firePropertyChange(PROPERTY_USE_REFERENTIEL, useReferentiel); +// } +// +// public void setUseData(boolean useData) { +// this.useData = useData; +// firePropertyChange(PROPERTY_USE_DATA, useData); +// } +// +// public void setUseOpenData(boolean useOpenData) { +// this.useOpenData = useOpenData; +// firePropertyChange(PROPERTY_USE_OPEN_DATA, useOpenData); +// } +// +// public void addSelectedReferentiel(Class<?> type) { +// checkReferentielType(type); +// if (log.isDebugEnabled()) { +// log.debug("Add referentiel type " + type); +// } +// getSelectedReferentiel().add(type); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } +// +// public void addAllSelectedReferentiel() { +// getSelectedReferentiel().addAll(referentiel); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } +// +// public void removeSelectedReferentiel(Class<?> type) { +// checkReferentielType(type); +// if (log.isDebugEnabled()) { +// log.debug("remove referentiel type " + type); +// } +// getSelectedReferentiel().remove(type); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } + + public void removeAll() { + getSelectedReferentiel().clear(); + getSelectedData().clear(); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + +// public void removeAllSelectedReferentiel() { +// getSelectedReferentiel().clear(); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } +// +// public void setDatas(Map<String, List<String>> datas) { +// this.datas = datas; +// +// // on compte le count de marées totale +// int nbTrips = 0; +// if (datas != null) { +// for (List<String> marees : datas.values()) { +// nbTrips += marees.size(); +// } +// } +// this.nbTrips = nbTrips; +// +// if (log.isDebugEnabled()) { +// log.debug("Nb program registred : " + (datas == null ? 0 : datas.size())); +// log.debug("Nb trip registred : " + this.nbTrips); +// } +// firePropertyChange(PROPERTY_DATAS, datas); +// } +// +// public void addSelectedData(String id) { +// +// if (Trips.isTripId(id)) { +// +// // ajout d'une marée +// if (log.isDebugEnabled()) { +// log.debug("Add Trip " + id); +// } +// getSelectedData().add(id); +// } else if (id.startsWith(Program.class.getName())) { +// +// // ajout de toutes les marées du program +// +// if (log.isDebugEnabled()) { +// log.debug("Add all trips of program " + id); +// } +// getSelectedData().addAll(datas.get(id)); +// } +// +// +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } +// +// public void addAllSelectedData() { +// if (log.isDebugEnabled()) { +// log.debug("All all data."); +// } +// for (List<String> p : datas.values()) { +// getSelectedData().addAll(p); +// } +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } +// +// public void removeSelectedData(String id) { +// if (Trips.isTripId(id)) { +// +// // ajout d'une marée +// if (log.isDebugEnabled()) { +// log.debug("Remove maree " + id); +// } +// getSelectedData().remove(id); +// } else if (id.startsWith(Program.class.getName())) { +// +// // ajout de toutes les marées du program +// +// if (log.isDebugEnabled()) { +// log.debug("Remove all marees of program " + id); +// } +// getSelectedData().removeAll(datas.get(id)); +// } +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } +// +// public void removeAllSelectedData() { +// if (selectedData != null) { +// selectedData.clear(); +// } +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + pcs.firePropertyChange(propertyName, null, newValue); + } + + protected void firePropertyChange(String propertyName, + Object oldValue, + Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + +// protected void checkReferentielType(Class<?> type) { +// if (!referentiel.contains(type)) { +// throw new IllegalArgumentException( +// "given <" + type + "> is not in referentiel universe : " + +// referentiel); +// } +// } + + public void destroy() { + removeAll(); + // suppression de tous les listeners + PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners(); + for (PropertyChangeListener l : listeners) { + removePropertyChangeListener(l); + } + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + destroy(); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index b644e28..5efc71e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -385,8 +385,8 @@ public class StorageTabUIHandler { JTree tree = ui.selectTree; helper.setUI(tree, false, null); - - tree.setModel(helper.createModel(ui, dataModel, source)); +//FIXME +// tree.setModel(helper.createModel(ui, dataModel, source)); DataSelectionTreeSelectionModel selectionModel = ui.getSelectionModel(); selectionModel.initUI(tree); 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 eefe5e3..1ce8320 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.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.business.db.DataContext; @@ -110,12 +111,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel 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; } 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 ae5455f..a8eb79e 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 @@ -129,14 +129,13 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { protected void loadEntity(ObserveDataProvider oProvider) { //FIXME -// if (oProvider.getSelectionModel() != null) { + if (oProvider.getSelectionModel() != null) { if (log.isDebugEnabled()) { log.debug("try to get entity from selectionModel " + internalClass + " : " + id); } - //FIXME -// entity = (E) oProvider.getSelectionModel().getEntityCache(id); -// } + entity = (ReferenceDto<E>) oProvider.getSelectionModel().getEntityCache(id); + } if (entity == null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java index a078a82..96d76f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.tree; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; @@ -42,8 +43,7 @@ public class ObserveDataProvider implements NavDataProvider { //FIXME // protected DataService dataService; - //FIXME -// protected DataSelectionModel selectionModel; + protected DataSelectionModel selectionModel; private boolean creating; @@ -55,13 +55,12 @@ public class ObserveDataProvider implements NavDataProvider { this.dataSource = dataSource; } - //FIXME -// public void setSelectionModel(DataSelectionModel selectionModel) { -// if (log.isDebugEnabled()) { -// log.debug("Set selection model : " + selectionModel); -// } -// this.selectionModel = selectionModel; -// } + public void setSelectionModel(DataSelectionModel selectionModel) { + if (log.isDebugEnabled()) { + log.debug("Set selection model : " + selectionModel); + } + this.selectionModel = selectionModel; + } @Override public boolean isEnabled() { @@ -73,10 +72,9 @@ public class ObserveDataProvider implements NavDataProvider { return dataSource; } - //FIXME -// public DataSelectionModel getSelectionModel() { -// return selectionModel; -// } + public DataSelectionModel getSelectionModel() { + return selectionModel; + } //FIXME // protected DataService getDataService() { 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 671fb09..955bb95 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 @@ -24,6 +24,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -172,9 +173,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } public DefaultTreeModel createModel(JAXXContext context, - //FIXME -// DataSelectionModel dataModel, - Object dataModel, + DataSelectionModel dataModel, ObserveSwingDataSource source) { setDataSource(source); @@ -185,16 +184,14 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } ObserveDataProvider provider = getDataProvider(); - //FIXME -// provider.setSelectionModel(dataModel); + provider.setSelectionModel(dataModel); provider.setCreating(true); try { RootNodeChildLoador loador = getChildLoador(RootNodeChildLoador.class); - //FIXME -// loador.setAddData(dataModel.isUseData()); -// loador.setAddReferentiel(dataModel.isUseReferentiel()); + loador.setAddData(dataModel.isUseData()); + loador.setAddReferentiel(dataModel.isUseReferentiel()); ObserveNode node = new ObserveNode(String.class, "Root node", loador, false); DefaultTreeModel model = createModel(node); 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 1194c64..a508056 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 @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; @@ -47,11 +48,10 @@ public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoad return result; } - //FIXME -// protected DataSelectionModel getSelectionModel(NavDataProvider dataProvider) { -// ObserveDataProvider provider = (ObserveDataProvider) dataProvider; -// DataSelectionModel result = provider.getSelectionModel(); -// return result; -// } + protected DataSelectionModel getSelectionModel(NavDataProvider dataProvider) { + ObserveDataProvider provider = (ObserveDataProvider) dataProvider; + DataSelectionModel result = provider.getSelectionModel(); + return result; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3c6671172be2fb979357d613ef59910564ad6f0e Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 18:10:27 2015 +0200 fix id (refs #7553) --- .../java/fr/ird/observe/services/service/seine/RouteServiceTopia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 2e14e7d..cbe3b36 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -64,7 +64,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi ReferenceDto<RouteDto> stub = ReferenceDtos.newReferenceDto(RouteDto.class, Lists.newArrayList(RouteDto.PROPERTY_ID, RouteDto.PROPERTY_DATE)); - stub.setId(tripSeine.getTopiaId()); + stub.setId(route.getTopiaId()); stub.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); stubs.add(stub); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b005fd5f6d623b939e5983b54e45fa865a0889f7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 2 11:47:19 2015 +0200 chargement des objets flottants (refs #7553) --- .../open/impl/seine/ActivitySeineUIHandler.java | 28 ++++++++++++--------- .../open/impl/seine/ActivitySeineUIModel.java | 11 ++++---- .../tree/loadors/ActivitySeineNodeChildLoador.java | 15 +++++------ .../v1/seine/FloatingObjectServiceController.java | 8 +++--- .../service/seine/FloatingObjectService.java | 6 ++--- .../service/seine/FloatingObjectServiceTopia.java | 29 ++++++++++++++++++---- 6 files changed, 58 insertions(+), 39 deletions(-) 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 5b5eaa4..9fcbf16 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,11 +25,15 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDtos; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIModel; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; @@ -423,18 +427,18 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei public String getActivity6Label() { - //FIXME -// try { -// List<VesselActivitySeine> activitys = getDataService().getList(getDataSource(), VesselActivitySeine.class); -// for (VesselActivitySeine a : activitys) { -// if (ActivitySeineImpl.ACTIVITY_FIN_DE_PECHE.equals(a.getCode())) { -// String label = getDecoratorService().decorate(a); -// return label; -// } -// } -// } catch (DataSourceException ex) { -// ErrorDialogUI.showError(ex); -// } + ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferenceSetDto<VesselActivitySeineDto> activities = service.getReferentialReferenceSet(VesselActivitySeineDto.class); + + for (ReferenceDto vesselActivity : activities.getReference()) { + //FIXME +// if (ActivitySeineDto.ACTIVITY_FIN_DE_PECHE.equals(a.getCode())) { + if ("6".equals(vesselActivity.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE))) { + String label = getDecoratorService().decorate(VesselActivitySeineDto.class.getSimpleName(), + vesselActivity); + return label; + } + } throw new IllegalStateException(t("observe.error.no.activity.6")); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index cbb7e4b..648a1f0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -24,13 +24,10 @@ package fr.ird.observe.ui.content.open.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; -import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; -import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.BinderModelBuilder; -import java.io.Serializable; import java.util.Set; /** @@ -99,9 +96,11 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt } public boolean isChangedZoneOperation() { - ReferentialReferenceDto<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine(); - Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE); - return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code); + //FIXME +// ReferentialReferenceDto<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine(); +// Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE); +// return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code); + return false; } @Override 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 8aa8449..6e98c4c 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 @@ -21,19 +21,22 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; 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.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.tree.FloatingObjectSeineNode; -import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.SetSeineNode; 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; @@ -115,12 +118,10 @@ public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoado String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<FloatingObject> data = getDataService().getFloatinObjectStubByActivitySeine(dataSource, parentId); -// return data; - return null; + FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + ReferenceSetDto<FloatingObjectDto> floatingObjectByActivitySeine = service.getFloatingObjectByActivitySeine(parentId); + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(floatingObjectByActivitySeine.getReference())); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index f2b2ce4..bda3565 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -24,12 +24,10 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; import fr.ird.observe.services.service.seine.FloatingObjectService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,8 +38,8 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId) { - return service.getFloatingObjectStubByActivitySeine(activitySeineId); + public ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId) { + return service.getFloatingObjectByActivitySeine(activitySeineId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index 7a541fd..aec83dc 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface FloatingObjectService extends ObserveService { @ReadDataPermission - List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId); + ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId); @ReadDataPermission FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index 18a8b19..b8bb2ed 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -23,32 +23,35 @@ package fr.ird.observe.services.service.seine; */ import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; 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.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; import fr.ird.observe.services.service.DataNotFoundException; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements FloatingObjectService { - @Override - public List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId) { + public ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId) { ReferenceLocale referenceLocale = getReferenceLocale(); ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - List<FloatingObjectStubDto> stubs = Lists.newLinkedList(); for(FloatingObject floatingObject : activitySeine.getFloatingObject()) { @@ -58,7 +61,23 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } - return stubs; + LinkedHashSet<ReferenceDto<FloatingObjectDto>> stubs = Sets.newLinkedHashSet(); + + for (FloatingObject floatingObject : activitySeine.getFloatingObject()) { + + ReferenceDto<FloatingObjectDto> stub = ReferenceDtos.newReferenceDto(FloatingObjectDto.class, + Lists.newArrayList(FloatingObjectDto.PROPERTY_ID, + FloatingObjectDto.PROPERTY_OBJECT_TYPE)); + + stub.setId(floatingObject.getTopiaId()); + stub.setPropertyValue(FloatingObjectDto.PROPERTY_OBJECT_TYPE, referenceLocale.getLabel(floatingObject.getObjectType())); + + stubs.add(stub); + + } + + ReferenceSetDto<FloatingObjectDto> result = ReferenceSetDtos.newReferenceSetDto(FloatingObjectDto.class, stubs, null); + return result; } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b82e3cdb114caff7063e883d22c463789336a762 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 11:32:19 2015 +0200 fecthEntity sur les noeuds (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 7 ++++++ .../ird/observe/ui/tree/ActivityLonglineNode.java | 20 +++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 20 +++++++++++++++++ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 5 +---- .../observe/ui/tree/FloatingObjectSeineNode.java | 22 ++++++++++++++----- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 ++++++++++++++----- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 18 ++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 25 ++++++++++++++++++++++ .../loadors/ActivityLonglineNodeChildLoador.java | 14 ++++++------ .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 ---- .../tree/loadors/SetLonglineNodeChildLoador.java | 17 ++++++++------- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- 13 files changed, 143 insertions(+), 35 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 5701626..867d736 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 @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -416,6 +417,8 @@ public class DecoratorService extends DecoratorProvider { ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(ActivitySeineDto.class, + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s"); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); registerDefaultReferenceDtoDecorator(SexDto.class, libelle); //FIXME Use startDate - endDate @@ -433,6 +436,7 @@ public class DecoratorService extends DecoratorProvider { registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s"); //FIXME Remove this registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this @@ -530,6 +534,9 @@ public class DecoratorService extends DecoratorProvider { // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); + registerReferenceDtoDecorator(TripLonglineDto.class, + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" + + libelle + "}$s##${observerLabel}$s"); String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator 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 17d982d..0ec485b 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,8 +22,13 @@ 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.longline.ActivityLonglineDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; /** @@ -40,6 +45,21 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { super(ActivityLonglineDto.class, entity, ObserveTreeHelper.getChildLoador(ActivityLonglineNodeChildLoador.class)); } + @Override + protected ReferenceDto<ActivityLonglineDto> fetchEntity() { + ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + FormDto<ActivityLonglineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<ActivityLonglineDto> referenceDto = + ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, + ActivityLonglineDto.PROPERTY_TIME_STAMP)); + referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, formDto.getForm().getTimeStamp()); + + return referenceDto; + } + //FIXME // @Override // protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { 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 e4abe09..eb4ed1d 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,8 +22,13 @@ 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.seine.ActivitySeineDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; /** @@ -40,6 +45,21 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { super(ActivitySeineDto.class, entity, ObserveTreeHelper.getChildLoador(ActivitySeineNodeChildLoador.class)); } + @Override + protected ReferenceDto<ActivitySeineDto> fetchEntity() { + ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + FormDto<ActivitySeineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<ActivitySeineDto> referenceDto = + ReferenceDtos.newReferenceDto(ActivitySeineDto.class, Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, + ActivitySeineDto.PROPERTY_TIME)); + referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, formDto.getForm().getTime()); + + return referenceDto; + } + // @Override // protected ActivitySeine getEntity(DataService dataService, DataSource source) { // return dataService.getActivitySeineStub(source, id); 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 a8eb79e..17f8914 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 @@ -56,10 +56,7 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { private boolean reloadEntity; - //FIXME make abstratc - protected ReferenceDto<E> fetchEntity() { - return null; - } + protected abstract ReferenceDto<E> fetchEntity(); protected DtoNodeSupport(Class<E> internalClass, ReferenceDto<E> entity) { this(internalClass, entity, null); 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 bf25cce..fcfc125 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,8 +22,13 @@ 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.seine.FloatingObjectDto; +import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.tree.loadors.FloatingObjectNodeChildLoador; /** @@ -40,10 +45,17 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { super(FloatingObjectDto.class, entity, ObserveTreeHelper.getChildLoador(FloatingObjectNodeChildLoador.class)); } - //FIXME -// @Override -// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) { -// return dataService.getFloatinObjectStub(source, id); -// } + @Override + protected ReferenceDto<FloatingObjectDto> fetchEntity() { + FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + FormDto<FloatingObjectDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<FloatingObjectDto> referenceDto = + ReferenceDtos.newReferenceDto(FloatingObjectDto.class, Lists.newArrayList(FloatingObjectDto.PROPERTY_ID)); + referenceDto.setPropertyValue(FloatingObjectDto.PROPERTY_ID, formDto.getForm().getId()); + + return referenceDto; + } } 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 5827a9d..d30feff 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,8 +22,13 @@ 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.longline.SetLonglineDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.tree.loadors.SetLonglineNodeChildLoador; /** @@ -40,10 +45,17 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { super(SetLonglineDto.class, entity, ObserveTreeHelper.getChildLoador(SetLonglineNodeChildLoador.class)); } - //FIXME -// @Override -// protected SetLongline getEntity(DataService dataService, DataSource source) { -// return (SetLongline) dataService.loadEntity(source, id, true); -// } + @Override + protected ReferenceDto<SetLonglineDto> fetchEntity() { + SetLonglineService service = ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + FormDto<SetLonglineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<SetLonglineDto> referenceDto = + ReferenceDtos.newReferenceDto(SetLonglineDto.class, Lists.newArrayList(SetLonglineDto.PROPERTY_ID)); + referenceDto.setPropertyValue(SetLonglineDto.PROPERTY_ID, formDto.getForm().getId()); + + return referenceDto; + } } 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 3e6e259..b77bdf3 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,8 +22,13 @@ 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.seine.SetSeineDto; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.tree.loadors.SetSeineNodeChildLoador; /** @@ -40,6 +45,19 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { super(SetSeineDto.class, entity, ObserveTreeHelper.getChildLoador(SetSeineNodeChildLoador.class)); } + @Override + protected ReferenceDto<SetSeineDto> fetchEntity() { + SetSeineService service = ObserveSwingApplicationContext.get().newService(SetSeineService.class); + FormDto<SetSeineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<SetSeineDto> referenceDto = + ReferenceDtos.newReferenceDto(SetSeineDto.class, Lists.newArrayList(SetSeineDto.PROPERTY_ID)); + referenceDto.setPropertyValue(SetSeineDto.PROPERTY_ID, formDto.getForm().getId()); + + return referenceDto; + } + //FIXME // @Override // protected SetSeine getEntity(DataService dataService, DataSource source) { 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 2d4fbc6..6f87e8a 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,8 +22,13 @@ 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.longline.TripLonglineDto; +import fr.ird.observe.services.service.longline.TripLonglineService; /** * Created on 4/9/15. @@ -39,6 +44,26 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { super(TripLonglineDto.class, entity); } + @Override + protected ReferenceDto<TripLonglineDto> fetchEntity() { + TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + FormDto<TripLonglineDto> formDto = tripLonglineService.loadToRead(entity.getId()); + + ReferenceDto<TripLonglineDto> referenceDto = + ReferenceDtos.newReferenceDto(TripLonglineDto.class, Lists.newArrayList(TripLonglineDto.PROPERTY_ID, + TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); + + return referenceDto; + } + //FIXME // @Override // protected TripLongline getEntity(DataService dataService, DataSource source) { 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 47091aa..2bbd351 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,6 +23,8 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; @@ -30,6 +32,7 @@ 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; @@ -91,13 +94,10 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str String parentId, NavDataProvider dataService) { - //FIXME -// List<String> result = new ArrayList<String>(); -// result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); -// result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); -// return result; - - return null; + List<String> result = new ArrayList<String>(); + result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); + result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); + return result; } 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 6e98c4c..375c753 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 @@ -78,7 +78,7 @@ public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoado parentNode.add(child); //FIXME -// ActivitySeineDto activitySeine = ((ActivitySeineNode) parentNode).getEntity(); +// ReferenceDto<ActivitySeineDto> activitySeine = ((ActivitySeineNode) parentNode).getEntity(); // SetSeine set = activitySeine.getSetSeine(); // if (set != null) { 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 53a7242..63be2af 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 @@ -53,10 +53,6 @@ public class ActivitySeinesNodeChildLoador extends AbstractReferenceDtoChildLoad String parentId, NavDataProvider dataProvider) throws Exception { -// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<ActivitySeineDto> data = getDataService().getActivitySeineByRoute(dataSource, parentId); -// return data; ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); ReferenceSetDto<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId); 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 a6b2415..07af584 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,10 +23,13 @@ package fr.ird.observe.ui.tree.loadors; */ +import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; 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; @@ -57,15 +60,13 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String parentId, NavDataProvider dataProvider) { -// FIXME -// List<String> result = new ArrayList<String>(); -// result.add("longlineGlobalComposition"); -// result.add("longlineDetailComposition"); -// result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); -// result.add(SetLonglineTdrDto.PROPERTY_TDR); + 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; + return result; } @Override 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 1378a00..39c79ea 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 @@ -74,7 +74,7 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, Str result.add(SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH); //FIXME // result.add(SetSeine.PROPERTY_NON_TARGET_SAMPLE); - return null; + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b2c4b4947f1e665a6a9e71f506fc33e82045f3e4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:14:31 2015 +0200 rebase sur develop --- .../observe/ObserveSwingApplicationContext.java | 3 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 23 ++------------ .../content/list/impl/seine/RoutesUIHandler.java | 3 +- .../list/impl/seine/TripSeinesUIHandler.java | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 14 ++++++--- .../v1/seine/ActivitySeineServiceController.java | 9 ------ .../service/seine/ActivitySeineService.java | 4 --- .../service/seine/ActivitySeineServiceTopia.java | 36 ---------------------- .../service/seine/TripSeineServiceTopia.java | 1 - 10 files changed, 18 insertions(+), 81 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 46518fc..598f78b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -43,6 +43,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; @@ -745,7 +746,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { String programName = (String) programDtoRef.getPropertyValue("label"); log.info("- " + programName); if (ProgramDtos.isProgramSeine(programDtoRef)) { - ReferenceSetDto<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); + ReferenceSetDto<TripSeineDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); for (ReferenceDto tripSeine : tripSeines.getReference()) { log.info(" - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL) + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) 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 3ee3ed5..cb32499 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 @@ -25,11 +25,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteDtos; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -116,29 +114,14 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<ReferenceDto> getChilds(RouteDto bean) { -<<<<<<< HEAD ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); - ReferenceSetDto<ActivitySeineStubDto> activitySeineStubByRoute = service.getActivitySeineStubByRoute(bean.getId()); + ReferenceSetDto<ActivitySeineDto> activitySeineByRoute = service.getActivitySeineByRoute(bean.getId()); if (log.isDebugEnabled()) { - log.debug("Will use " + activitySeineStubByRoute.sizeReference() + " activities."); + log.debug("Will use " + activitySeineByRoute.sizeReference() + " activities."); } - return new ArrayList<>(activitySeineStubByRoute.getReference()); -======= - ObserveSwingDataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<ActivitySeine> list = dataService.getActivitySeineByRoute(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " activities."); -// } -// -// return list; - return null; ->>>>>>> chargement des noeuds des routes (refs #7553) + return new ArrayList<>(activitySeineByRoute.getReference()); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index 48a4067..07833df 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -28,7 +28,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.seine.RouteService; @@ -113,7 +112,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto protected List<ReferenceDto> getChilds(TripSeineDto bean) { RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); - ReferenceSetDto<RouteStubDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); + ReferenceSetDto<RouteDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); if (log.isDebugEnabled()) { log.debug("Will use " + routeByTripSeine.sizeReference() + " routes."); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index f81d211..ec61f50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -30,7 +30,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; @@ -98,7 +97,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe protected List<ReferenceDto> getChilds(ProgramDto bean) { TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); if (log.isDebugEnabled()) { log.debug("Will use " + tripSeineByProgram.sizeReference() + " trips."); 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 aab10b4..eeae2be 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 @@ -635,7 +635,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // add the program in tree ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.addProgram((ProgramDto) bean); + //FIXME +// treeHelper.addProgram((ProgramDto) bean); } return true; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index a83ae3d..01e5cbc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -29,10 +29,6 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constantes.ConnexionStatus; @@ -49,7 +45,10 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceDumpProducerService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; @@ -710,6 +709,7 @@ public class StorageUIHandler { ObserveSwingApplicationContext.get().getDecoratorService(); return decoratorService; } + protected void computeBackupReport(SelectDataUI stepUI, StorageUIModel model, StringBuilder sb) { @@ -950,7 +950,6 @@ public class StorageUIHandler { } protected void checkImportDbVersion(StorageUIModel model, ObserveSwingDataSource dataSource) { - //FIXME try { dataSource.open(); @@ -959,10 +958,15 @@ public class StorageUIHandler { if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } + } catch (DatabaseConnexionNotAuthorizedException e) { if (log.isErrorEnabled()) { log.error("", e); } + } catch (BabModelVersionException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } } catch (DatabaseNotFoundException e) { if (log.isErrorEnabled()) { log.error("", e); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index 37cf567..368aa10 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -24,10 +24,6 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; -<<<<<<< HEAD -======= -import fr.ird.observe.services.dto.ReferenceDto; ->>>>>>> chargement des noeuds des routes (refs #7553) import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -42,13 +38,8 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override -<<<<<<< HEAD - public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - return service.getActivitySeineStubByRoute(routeId); -======= public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { return service.getActivitySeineByRoute(routeId); ->>>>>>> chargement des noeuds des routes (refs #7553) } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 3c60a73..05b91b2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -38,11 +38,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivitySeineService extends ObserveService { @ReadDataPermission -<<<<<<< HEAD - ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); -======= ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId); ->>>>>>> chargement des noeuds des routes (refs #7553) @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 50d3598..54135b3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -52,30 +51,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override -<<<<<<< HEAD - public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - - Route route = loadEntity(RouteDto.class, Route.class, routeId); - - ReferenceLocale referenceLocale = getReferenceLocale(); - - LinkedHashSet<ReferenceDto<ActivitySeineStubDto>> stubs = Sets.newLinkedHashSet(); - - for (ActivitySeine activitySeine : route.getActivitySeine()) { - - ReferenceDto<ActivitySeineStubDto> stub = - ReferenceDtos.newReferenceDto(ActivitySeineStubDto.class, - Lists.newArrayList(ActivitySeineStubDto.PROPERTY_TIME, - ActivitySeineStubDto.PROPERTY_VESSEL_ACTIVITY_SEINE_LABEL, - ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE)); - - stub.setId(activitySeine.getTopiaId()); - stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_TIME, activitySeine.getTime()); - stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_VESSEL_ACTIVITY_SEINE_LABEL, - referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE, - activitySeine.getSetSeine() != null); -======= public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -98,21 +73,10 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); stubs.add(stub); ->>>>>>> chargement des noeuds des routes (refs #7553) - - stubs.add(stub); } -<<<<<<< HEAD - Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); - ReferenceSetDto<ActivitySeineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(ActivitySeineStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; -======= ReferenceSetDto<ActivitySeineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivitySeineDto.class, stubs, null); return result; ->>>>>>> chargement des noeuds des routes (refs #7553) } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index c8fe1f3..3f39477 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4cd024ed605b0eafd405441a857d2100e2d52687 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:18:23 2015 +0200 fix error --- .../src/main/java/fr/ird/observe/ui/DecoratorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 867d736..af78e48 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 @@ -417,7 +417,7 @@ public class DecoratorService extends DecoratorProvider { ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); - registerReferenceDtoDecorator(ActivitySeineDto.class, + registerReferenceDtoDecorator(ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s"); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); registerDefaultReferenceDtoDecorator(SexDto.class, libelle); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a5cbe0c691a58de3154d0c5fae93225ecce61bc6 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:28:21 2015 +0200 fix error --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 598f78b..98888d7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -44,7 +44,6 @@ import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; @@ -748,9 +747,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { if (ProgramDtos.isProgramSeine(programDtoRef)) { ReferenceSetDto<TripSeineDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); for (ReferenceDto tripSeine : tripSeines.getReference()) { - log.info(" - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL) - + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) - + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + log.info(" - " + tripSeine.getPropertyValue(TripSeineDto.PROPERTY_VESSEL) + + " " + tripSeine.getPropertyValue(TripSeineDto.PROPERTY_START_DATE) + + " - " + tripSeine.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f052d03c8f200a20657fa702bb8e26381af1ced9 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:14:41 2015 +0200 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) --- .../fr/ird/observe/business/db/constants/DataContextType.java | 9 ++++++++- .../java/fr/ird/observe/ui/content/ContentUIInitializer.java | 2 +- .../main/java/fr/ird/observe/ui/content/ContentUIManager.java | 3 +++ .../src/main/java/fr/ird/observe/ui/content/ContentUIModel.java | 9 +++++++++ .../observe/ui/content/list/impl/seine/TripSeinesUIHandler.java | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java index 3c8b0dd..122b953 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java @@ -314,7 +314,14 @@ public enum DataContextType { public static DataContextType acceptId(String s) { DataContextType result = null; for (DataContextType type : DataContextType.values()) { - if (s.startsWith(type.getType().getName())) { + + //FIXME kmorin 20151005 comment checker que l'id topia match le DTO +// if (s.startsWith(type.getType().getName())) { +// result = type; +// break; +// } + String[] entityFullClass = s.split("#")[0].split("\\."); + if (type.getType().getSimpleName().startsWith(entityFullClass[entityFullClass.length - 1])) { result = type; break; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 58d00cb..3aa315d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -662,7 +662,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); // init list - Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getName()); + Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); if (log.isDebugEnabled()) { log.debug("Will use decorator " + decorator); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index d9fcbd9..3e2a2e1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -328,6 +328,9 @@ public class ContentUIManager { content.open(); } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("", e); + } ErrorDialogUI.showError(e); } finally { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index f73eaf5..1c12d36 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -90,6 +90,15 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab public ContentUIModel(Class<E> beanType) { this.beanType = beanType; + try { + setBean(beanType.newInstance()); + + } catch (Exception e) { + // ne devrait jamain arrive + if (log.isErrorEnabled()) { + log.error(e); + } + } //FIXME // ObserveEntityEnum constant = ObserveEntityEnum.valueOf(beanType); // if (constant != null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index ec61f50..062b87e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -110,7 +110,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected void loadParentBean() { ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - FormDto<ProgramDto> programDtoFormDto = service.loadToEdit(ProgramDto.class, getSelectedParentId()); + FormDto<ProgramDto> programDtoFormDto = service.loadToRead(ProgramDto.class, getSelectedParentId()); getModel().setFormDto(programDtoFormDto); ProgramDtos.copyProgramDto(programDtoFormDto.getForm(), getBean()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 282ac9f37e0cc97cb3b23af77c32c2d139b558f8 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:30:25 2015 +0200 remove fixme --- .../fr/ird/observe/business/db/constants/DataContextType.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java index 122b953..73448a7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java @@ -315,13 +315,9 @@ public enum DataContextType { DataContextType result = null; for (DataContextType type : DataContextType.values()) { - //FIXME kmorin 20151005 comment checker que l'id topia match le DTO -// if (s.startsWith(type.getType().getName())) { -// result = type; -// break; -// } String[] entityFullClass = s.split("#")[0].split("\\."); - if (type.getType().getSimpleName().startsWith(entityFullClass[entityFullClass.length - 1])) { + String typeName = type.getType().getSimpleName(); + if (typeName.startsWith(entityFullClass[entityFullClass.length - 1])) { result = type; break; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3636751335b51bcac643b79530dd02e2686ef3b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:53:17 2015 +0200 Correction du code suite au merge sur les Openable --- .../observe/ui/content/open/ContentOpenableUI.jaxx | 4 +-- .../ui/content/open/ContentOpenableUIHandler.java | 12 ++++----- .../ui/content/open/ContentOpenableUIModel.java | 4 +-- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 30 +++++++++++++--------- .../entities/longline/TripLonglineTopiaDao.java | 5 ++-- .../observe/entities/seine/TripSeineTopiaDao.java | 6 ++--- .../service/longline/TripLonglineServiceTopia.java | 2 +- .../service/seine/TripSeineServiceTopia.java | 2 +- 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx index 12cbfa9..b7cf93e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx @@ -23,12 +23,12 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends OpenableDto' + genericType='E extends IdDto'
<import> fr.ird.observe.services.dto.AbstractObserveDto - fr.ird.observe.services.dto.OpenableDto + fr.ird.observe.services.dto.IdDto fr.ird.observe.ui.actions.shared.CancelCreateUIAction fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction 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 6cfbec7..2208490 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 @@ -24,7 +24,8 @@ package fr.ird.observe.ui.content.open; import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveNode; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends ContentUIHandler<E> { +public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentUIHandler<E> { protected static final String POSITION_OPENABLE = "positionOpenable"; @@ -81,6 +82,8 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co protected abstract boolean doOpenData(); + public abstract boolean doCloseData(); + public final void openDataUI() { boolean ok = false; try { @@ -132,11 +135,6 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public boolean doCloseData() { - getBean().setOpen(false); - return true; - } - public final void afterCloseData() { ContentOpenableUI<E> ui = getUi(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java index 1d8f522..c7bad89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.open; -import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; /** @@ -30,7 +30,7 @@ import fr.ird.observe.ui.content.ContentUIModel; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public abstract class ContentOpenableUIModel<E extends OpenableDto> extends ContentUIModel<E> { +public abstract class ContentOpenableUIModel<E extends IdDto> extends ContentUIModel<E> { public static final String PROPERTY_CAN_REOPEN = "canReopen"; 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 955bb95..660ec55 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 @@ -26,6 +26,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -57,7 +58,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeModel; @@ -402,17 +403,22 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - 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); + public <E extends IdDto> ObserveNode addOpenable(ObserveNode parentNode, E bean) { + if (bean instanceof TripSeineDto) { + ReferenceDto<TripSeineDto> ref = null; //TODO + return addTripSeine(parentNode, ref); + } else if (bean instanceof TripLonglineDto) { + ReferenceDto<TripLonglineDto> ref = null; //TODO + return addTripLongline(parentNode, ref); + } else if (bean instanceof RouteDto) { + ReferenceDto<RouteDto> ref = null; //TODO + return addRoute(parentNode, ref); + } else if (bean instanceof ActivitySeineDto) { + ReferenceDto<ActivitySeineDto> ref = null;//TODO + return addActivitySeine(parentNode, ref); + } else if (bean instanceof ActivityLonglineDto) { + ReferenceDto<ActivityLonglineDto> ref = null;//TODO + return addActivityLongline(parentNode, ref); } throw new IllegalStateException("Can not come here!"); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 842f7c7..430b555 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -41,6 +41,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongline> { @@ -77,11 +78,11 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } - public List<TripMapPointDto> extractTripMapActivityPoints(String tripId) { + public LinkedHashSet<TripMapPointDto> extractTripMapActivityPoints(String tripId) { TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); - List<TripMapPointDto> tripMapPoints = Lists.newLinkedList(); + LinkedHashSet<TripMapPointDto> tripMapPoints = new LinkedHashSet<>(); // add departure harbours Harbour departureHarbour = tripLongline.getDepartureHarbour(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 4bf20af..a68cacd 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.entities.seine; -import com.google.common.collect.Lists; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.Harbour; @@ -40,6 +39,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -80,11 +80,11 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } - public List<TripMapPointDto> extractTripMapActivityPoints(String tripId) { + public LinkedHashSet<TripMapPointDto> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); - List<TripMapPointDto> tripMapPoints = Lists.newLinkedList(); + LinkedHashSet<TripMapPointDto> tripMapPoints = new LinkedHashSet<>(); // add departure harbours Harbour departureHarbour = tripSeine.getDepartureHarbour(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 8ea8e6d..486424d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -94,7 +94,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public TripMapDto getTripLonglineMap(String tripLonglineId) { - List<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); + LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); TripMapDto tripMapDto = new TripMapDto(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 3f39477..6b24fbe 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -91,7 +91,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public TripMapDto getTripSeineMap(String tripSeineId) { - List<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); + LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); TripMapDto tripMapDto = new TripMapDto(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 2107f8a20e3bdd6f0f73e9547cd9299731369ab0 Merge: cc4e981 3636751 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:54:11 2015 +0200 Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop .../src/main/filters/observe-ui.properties | 72 +-- .../observe/ObserveSwingApplicationContext.java | 17 +- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 ------------------- .../observe/business/db/DataSourceProvider.java | 72 --- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/db/constants/DataContextType.java | 5 +- .../business/db/model/DataSelectionModel.java | 482 +++++++++++++++++++++ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../java/fr/ird/observe/ui/DecoratorService.java | 169 ++++---- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 28 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 18 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 3 + .../fr/ird/observe/ui/content/ContentUIModel.java | 9 + .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../content/impl/longline/BranchlineUIHandler.java | 6 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 6 +- .../impl/longline/SetLonglineUIHandler.java | 7 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../impl/seine/FloatingObjectUIHandler.java | 7 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 7 +- .../ui/content/list/ContentListUIHandler.java | 14 +- .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 1 + .../list/impl/seine/ActivitySeinesUIHandler.java | 7 +- .../content/list/impl/seine/RoutesUIHandler.java | 3 +- .../list/impl/seine/TripSeinesUIHandler.java | 5 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 14 +- .../ui/content/open/ContentOpenableUIModel.java | 4 +- .../impl/longline/ActivityLonglineUIHandler.java | 1 + .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/ActivitySeineUIHandler.java | 29 +- .../open/impl/seine/ActivitySeineUIModel.java | 11 +- .../open/impl/seine/TripSeineUIHandler.java | 4 + .../ui/content/ref/ContentReferenceUIHandler.java | 27 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 6 +- .../ui/content/table/ContentTableUIHandler.java | 10 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 5 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 28 +- .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 15 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 25 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 25 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 31 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 25 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 80 ++-- .../ird/observe/ui/tree/ProgramLonglineNode.java | 34 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 35 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 24 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 25 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 23 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 30 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 31 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 30 +- .../loadors/AbstractReferenceDtoChildLoador.java | 15 + .../loadors/ActivityLonglineNodeChildLoador.java | 9 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 7 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 29 +- .../loadors/ActivitySeinesNodeChildLoador.java | 23 +- .../loadors/FloatingObjectNodeChildLoador.java | 23 +- .../loadors/ProgramLonglineNodeChildLoador.java | 7 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 31 +- .../loadors/ReferenceCommonNodeChildLoador.java | 7 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 8 +- .../loadors/ReferenceSeineNodeChildLoador.java | 10 +- .../ui/tree/loadors/RootNodeChildLoador.java | 43 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 30 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 9 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 7 +- .../ui/util/decorator/ReferenceDecorator.java | 56 +-- .../decorator/ReferenceReferentialDecorator.java | 33 -- .../observe-application-swing_fr_FR.properties | 2 +- .../v1/seine/ActivitySeineServiceController.java | 5 +- .../v1/seine/FloatingObjectServiceController.java | 8 +- .../v1/seine/RouteServiceController.java | 3 +- .../v1/seine/TripSeineServiceController.java | 3 +- .../entities/longline/TripLonglineTopiaDao.java | 5 +- .../observe/entities/seine/TripSeineTopiaDao.java | 6 +- .../service/seine/ActivitySeineService.java | 3 +- .../service/seine/FloatingObjectService.java | 6 +- .../services/service/seine/RouteService.java | 3 +- .../services/service/seine/TripSeineService.java | 3 +- .../service/seine/TripSeineServiceRestTest.java | 44 +- .../service/longline/TripLonglineServiceTopia.java | 2 +- .../service/seine/ActivitySeineServiceTopia.java | 37 +- .../service/seine/FloatingObjectServiceTopia.java | 29 +- .../services/service/seine/RouteServiceTopia.java | 20 +- .../service/seine/TripSeineServiceTopia.java | 36 +- .../service/seine/TripSeineServiceTopiaTest.java | 29 +- 114 files changed, 1434 insertions(+), 1968 deletions(-) -- 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