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 cdaf1841ef9ad4a6d18e560a37ca7d00d1f11cc1 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 14 19:35:33 2015 +0200 Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) --- .../main/java/fr/ird/observe/ObserveContext.java | 373 ++++++------ .../observe/business/LonglinePositionAware.java | 56 ++ .../observe/business/db/DataSourceProvider.java | 3 +- .../report/model/operations/GroupByLength.java | 103 ---- .../report/model/operations/SumColumn.java | 132 ----- .../report/model/operations/SumIntColumn.java | 128 ---- .../report/model/operations/SumIntRow.java | 132 ----- .../business/report/model/operations/SumRow.java | 128 ---- .../validation/ValidationMessageDetector.java | 647 +++++++++++---------- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 6 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 27 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 18 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 2 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 6 +- .../observe/ui/actions/ReloadStorageAction.java | 72 +-- .../ui/actions/SaveStorageToFileAction.java | 22 +- .../ird/observe/ui/actions/ShowConfigAction.java | 199 +++---- .../observe/ui/actions/StartH2WebServerAction.java | 14 +- .../observe/ui/actions/StartServerModeAction.java | 72 +-- .../observe/ui/actions/StopH2WebServerAction.java | 11 +- .../observe/ui/actions/StopServerModeAction.java | 19 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 4 +- .../ui/actions/shared/CloseOpenUIAction.java | 4 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 7 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 9 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 3 + .../fr/ird/observe/ui/admin/AdminUILauncher.java | 1 + .../ird/observe/ui/admin/config/SelectDataUI.css | 2 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 8 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 41 +- .../ObsoleteEntityListCellRenderer.java | 11 +- .../synchronize/ObsoleteEntityTableModel.java | 51 +- .../ui/admin/synchronize/SynchronizeModel.java | 103 ++-- .../ui/admin/synchronize/SynchronizeUI.jaxx | 9 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 27 +- .../validate/ValidateEntityListCellRenderer.java | 18 +- .../ui/admin/validate/ValidateUIHandler.java | 40 +- .../main/java/fr/ird/observe/ui/content/Common.css | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 12 +- .../ird/observe/ui/content/ContentUIHandler.java | 34 +- .../ird/observe/ui/content/ContentUIManager.java | 35 ++ .../ui/content/impl/longline/BranchlineUI.css | 42 +- .../content/impl/longline/BranchlineUIHandler.java | 5 +- .../LonglineDetailCompositionUIHandler.java | 49 +- ...onglineDetailCompositionUIValidationHelper.java | 18 +- .../impl/longline/LonglineGlobalCompositionUI.css | 6 +- .../LonglineGlobalCompositionUIHandler.java | 4 + .../impl/longline/SectionTemplatesTableModel.java | 129 ++-- .../content/impl/longline/SectionsTableModel.java | 173 +++--- .../ui/content/impl/longline/SetLonglineUI.css | 106 ++-- .../ui/content/impl/longline/SetLonglineUI.jaxx | 9 +- .../impl/longline/SetLonglineUIHandler.java | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.css | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 13 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- .../seine/ActivitySeineObservedSystemUIModel.java | 21 +- .../FloatingObjectTransmittingBuoyOperationUI.css | 37 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 15 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 57 +- .../ui/content/impl/seine/FloatingObjectUI.css | 12 +- .../observe/ui/content/impl/seine/SetSeineUI.css | 40 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 8 - .../ird/observe/ui/content/list/ContentListUI.jaxx | 4 +- .../ui/content/list/ContentListUIHandler.java | 16 +- .../impl/longline/ActivityLonglinesUIHandler.java | 29 +- .../ui/content/list/impl/longline/CommonListUI.css | 8 +- .../list/impl/longline/TripLonglinesUIHandler.java | 31 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 30 +- .../ui/content/list/impl/seine/CommonListUI.css | 12 +- .../content/list/impl/seine/RoutesUIHandler.java | 33 +- .../list/impl/seine/TripSeinesUIHandler.java | 34 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 2 +- .../open/impl/longline/ActivityLonglineUI.css | 23 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 5 +- .../content/open/impl/longline/TripLonglineUI.css | 40 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 7 +- .../open/impl/longline/TripLonglineUIHandler.java | 11 +- .../ui/content/open/impl/seine/ActivitySeineUI.css | 44 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../open/impl/seine/ActivitySeineUIHandler.java | 5 +- .../observe/ui/content/open/impl/seine/RouteUI.css | 6 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 3 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 10 +- .../ui/content/open/impl/seine/TripSeineUI.css | 45 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 7 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 644 ++++++++++---------- .../observe/ui/content/ref/ReferenceHomeUI.jaxx | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 3 +- .../ref/ReferentialContentUIInitializer.java | 17 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 6 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/HarbourUI.css | 6 +- .../ui/content/ref/impl/HarbourUIModel.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/PersonUI.css | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 6 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 2 +- .../observe/ui/content/ref/impl/SpeciesListUI.css | 6 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 3 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 6 +- .../ui/content/ref/impl/VesselUIHandler.java | 6 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 8 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../ird/observe/ui/content/table/CommonTable.css | 2 +- .../ui/content/table/ContentTableModel.java | 49 +- .../observe/ui/content/table/ContentTableUI.jaxx | 5 +- .../ui/content/table/ContentTableUIHandler.java | 359 ++++++------ .../content/table/ContentTableUIInitializer.java | 24 +- .../ui/content/table/ContentTableUIModel.java | 5 +- .../ui/content/table/ObserveContentTableUI.java | 3 +- .../table/impl/longline/BaitsCompositionUI.css | 13 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 3 +- .../impl/longline/BaitsCompositionUIHandler.java | 42 +- .../impl/longline/BaitsCompositionUIModel.java | 6 +- .../impl/longline/BranchlinesCompositionUI.css | 11 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 3 +- .../longline/BranchlinesCompositionUIHandler.java | 50 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../table/impl/longline/CatchLonglineUI.css | 70 +-- .../table/impl/longline/CatchLonglineUI.jaxx | 11 +- .../impl/longline/CatchLonglineUIHandler.java | 548 ++++++++--------- .../ui/content/table/impl/longline/EncounterUI.css | 8 +- .../content/table/impl/longline/EncounterUI.jaxx | 2 +- .../table/impl/longline/EncounterUIHandler.java | 22 +- .../impl/longline/FloatlinesCompositionUI.css | 8 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 5 +- .../longline/FloatlinesCompositionUIHandler.java | 49 +- .../GearUseFeaturesLonglineTableModel.java | 16 +- .../impl/longline/GearUseFeaturesLonglineUI.css | 15 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 3 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 231 ++++---- .../longline/GearUseFeaturesLonglineUIModel.java | 6 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 26 +- .../table/impl/longline/HooksCompositionUI.css | 11 +- .../table/impl/longline/HooksCompositionUI.jaxx | 3 +- .../impl/longline/HooksCompositionUIHandler.java | 50 +- .../impl/longline/LonglinePositionHelper.java | 117 ++-- .../content/table/impl/longline/SensorUsedUI.css | 14 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 46 +- .../impl/longline/SizeMeasuresTableModel.java | 25 +- .../ui/content/table/impl/longline/TdrUI.css | 74 +-- .../content/table/impl/longline/TdrUIHandler.java | 103 ++-- .../impl/longline/WeightMeasuresTableModel.java | 22 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 12 +- .../GearUseFeatureMeasurementCellRenderer.java | 15 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 12 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 7 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 232 ++++---- .../impl/seine/GearUseFeaturesSeineUIModel.java | 17 +- .../content/table/impl/seine/NonTargetCatchUI.css | 21 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 17 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 391 ++++++------- .../content/table/impl/seine/NonTargetSampleUI.css | 18 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 8 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 305 +++++----- .../table/impl/seine/ObjectObservedSpeciesUI.css | 6 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 8 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 24 +- .../table/impl/seine/ObjectSchoolEstimateUI.css | 4 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 21 +- .../content/table/impl/seine/SchoolEstimateUI.css | 6 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 7 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 130 +++-- .../ui/content/table/impl/seine/TargetCatchUI.css | 8 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +- .../table/impl/seine/TargetCatchUIHandler.java | 397 +++++++------ .../table/impl/seine/TargetDiscardCatchUI.css | 8 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 15 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 538 ++++++++--------- .../content/table/impl/seine/TargetSampleUI.jaxx | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 289 ++++----- .../ui/storage/StorageBackupUILauncher.java | 14 +- .../ird/observe/ui/storage/StorageUIHandler.java | 18 +- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 4 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/storage/tabs/StorageTabUIHandler.java | 28 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 1 - .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 5 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 1 + .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 2 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 20 +- .../EditableTableWithCacheTableModelSupport.java | 21 +- .../observe-application-swing_en_GB.properties | 181 ++++++ .../observe-application-swing_es_ES.properties | 181 ++++++ .../observe-application-swing_fr_FR.properties | 181 ++++++ ...glineDetailCompositionValidatorServiceTest.java | 139 ++--- 204 files changed, 5127 insertions(+), 4828 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java index 7a9ccf8..df5267a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java @@ -22,10 +22,14 @@ package fr.ird.observe; import fr.ird.observe.business.ObserveApplicationContext; -import fr.ird.observe.ui.actions.ChangeStorageAction; +import fr.ird.observe.business.ObserveServiceHelper; +import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.business.db.constants.DbMode; +import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUIMode; import fr.ird.observe.ui.UIHelper; +import fr.ird.observe.ui.actions.ChangeStorageAction; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.actions.shared.CancelCreateUIAction; import fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction; @@ -39,6 +43,7 @@ import fr.ird.observe.ui.actions.shared.ResetEditUIAction; import fr.ird.observe.ui.actions.shared.SaveEditUIAction; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction; +import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.CardLayout2; @@ -47,10 +52,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; -import javax.swing.ActionMap; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.util.Arrays; import java.util.List; @@ -108,7 +111,7 @@ public class ObserveContext extends ObserveApplicationContext { public static boolean isClosed() { //FIXME // return ObserveServiceHelper.isClosed(); - return null; + return false; } public ObserveConfig getConfig() { @@ -306,42 +309,43 @@ public class ObserveContext extends ObserveApplicationContext { // chargement de la base locale // création de la source de données sur la base locale - DataSource service = - ObserveServiceHelper.newLocalStorageService(getConfig()); - - // la source sera utilisée dans les ui - prepareMainStorage(service); - - if (log.isInfoEnabled()) { - log.info(t("observe.init.local.db.detected", service.getLabel())); - } - - // la base locale existe, on l'ouvre - try { - service.doOpen(); - } catch (Exception eee) { - // la base n'a pas pu être ouverte - - Throwable cause = eee.getCause(); - while (cause != null && cause.getCause() != null) { - cause = cause.getCause(); - } - if (cause != null) { - if (cause instanceof JdbcSQLException) { - JdbcSQLException error = (JdbcSQLException) cause; - if (error.getMessage().contains("Locked")) { - JOptionPane.showMessageDialog( - null, - t("observe.error.open.first.db"), - t("observe.title.error.dialog"), - JOptionPane.ERROR_MESSAGE - ); - return; - } - } - } - throw eee; - } + //FIXME +// DataSource service = +// ObserveServiceHelper.newLocalStorageService(getConfig()); +// +// // la source sera utilisée dans les ui +// prepareMainStorage(service); +// +// if (log.isInfoEnabled()) { +// log.info(t("observe.init.local.db.detected", service.getLabel())); +// } +// +// // la base locale existe, on l'ouvre +// try { +// service.doOpen(); +// } catch (Exception eee) { +// // la base n'a pas pu être ouverte +// +// Throwable cause = eee.getCause(); +// while (cause != null && cause.getCause() != null) { +// cause = cause.getCause(); +// } +// if (cause != null) { +// if (cause instanceof JdbcSQLException) { +// JdbcSQLException error = (JdbcSQLException) cause; +// if (error.getMessage().contains("Locked")) { +// JOptionPane.showMessageDialog( +// null, +// t("observe.error.open.first.db"), +// t("observe.title.error.dialog"), +// JOptionPane.ERROR_MESSAGE +// ); +// return; +// } +// } +// } +// throw eee; +// } } /** @@ -363,151 +367,152 @@ public class ObserveContext extends ObserveApplicationContext { String.valueOf(true)); } - service.addDataSourceListener(new DataSourceListenerAdapter() { - - @Override - public void onOpening(DataSourceEvent event) { - DataSource s = event.getSource(); - UIHelper.displayInfo( - t("observe.message.db.loading", s.getLabel())); - } - - @Override - public void onOpened(DataSourceEvent event) { - - // le service est disponible, on enregistre les listeners - DataSource source = event.getSource(); - - try { - openOnUI(source); - } catch (Exception e) { - - // la base n'a pas pu être chargée proprement - // ceci peut être due a une base dans une version pas - // assez recente, on doit donc refermer cette base - if (log.isErrorEnabled()) { - log.error("Could not obtain open datas from " + source.getLabel(), e); - } - ErrorDialogUI.showError(e); - - // fermeture de la source - try { - source.doClose(false); - } catch (DataSourceException e1) { - throw new RuntimeException(e1); - } - } - - } - - @Override - public void onClosing(DataSourceEvent event) { - - super.onClosing(event); - - DataSource source = event.getSource(); - - // on désenregistre la source du service de données - getDataService().unregisterDataSource(source); - - // on dettache la validation - getValidationContext().closeDataSource(); - - ObserveMainUI mainUI = getObserveMainUI(); - DataContext dataContext = getDataContext(); - dataContext.setEnabled(false); - - // suppresion des opens dans le context de données - dataContext.populateOpens(); - - mainUI.getTreeHelper().cleanNavigationUI(mainUI); - - // on met a jour l'état dans la config - getConfig().setMainStorageOpened(false); - } - - - @Override - public void onClosed(DataSourceEvent event) { - // le service est indisponible, il faut supprimer toutes les - // references vers le service - DataSource source = event.getSource(); - - // gestion JMX -// if (ObserveServiceHelper.isUseJMX()) { + //FIXME +// service.addDataSourceListener(new DataSourceListenerAdapter() { // -// dettachHibernateMBean(source); +// @Override +// public void onOpening(DataSourceEvent event) { +// DataSource s = event.getSource(); +// UIHelper.displayInfo( +// t("observe.message.db.loading", s.getLabel())); +// } +// +// @Override +// public void onOpened(DataSourceEvent event) { +// +// // le service est disponible, on enregistre les listeners +// DataSource source = event.getSource(); +// +// try { +// openOnUI(source); +// } catch (Exception e) { +// +// // la base n'a pas pu être chargée proprement +// // ceci peut être due a une base dans une version pas +// // assez recente, on doit donc refermer cette base +// if (log.isErrorEnabled()) { +// log.error("Could not obtain open datas from " + source.getLabel(), e); +// } +// ErrorDialogUI.showError(e); +// +// // fermeture de la source +// try { +// source.doClose(false); +// } catch (DataSourceException e1) { +// throw new RuntimeException(e1); +// } // } - - ObserveMainUI mainUI = getObserveMainUI(); - - // nettoyage de l'ui ( suppression navigation et autres ) - if (mainUI != null) { - - if (log.isDebugEnabled()) { - log.debug("dispose ui from storage " + - source.getLabel() + ": " + mainUI.getName()); - } - - mainUI.setMode(ObserveUIMode.NO_DB); - - UIHelper.displayInfo( - t("observe.message.db.closed", source.getLabel())); - - } - } - - protected void openOnUI(DataSource source) throws DataSourceException { - // on rend le service disponible dans le service de données - getDataService().registerDataSource(source); - - // on rend le service disponible dans le service de validation - getValidationContext().setDataSource(source); - - // toutes les données sont chargées, on peut declarer le service - // comme ouvert dans la configuration - ObserveConfig config = getConfig(); - config.setMainStorageOpened(true); - config.setMainStorageOpenedLocal(source instanceof H2DataSource); - - if (source instanceof H2DataSource) { - config.setLocalStorageExist(true); - } - - // gestion JMX -// if (ObserveServiceHelper.isUseJMX()) { -// createHibernateMBean(source); +// +// } +// +// @Override +// public void onClosing(DataSourceEvent event) { +// +// super.onClosing(event); +// +// DataSource source = event.getSource(); +// +// // on désenregistre la source du service de données +// getDataService().unregisterDataSource(source); +// +// // on dettache la validation +// getValidationContext().closeDataSource(); +// +// ObserveMainUI mainUI = getObserveMainUI(); +// DataContext dataContext = getDataContext(); +// dataContext.setEnabled(false); +// +// // suppresion des opens dans le context de données +// dataContext.populateOpens(); +// +// mainUI.getTreeHelper().cleanNavigationUI(mainUI); +// +// // on met a jour l'état dans la config +// getConfig().setMainStorageOpened(false); +// } +// +// +// @Override +// public void onClosed(DataSourceEvent event) { +// // le service est indisponible, il faut supprimer toutes les +// // references vers le service +// DataSource source = event.getSource(); +// +// // gestion JMX +//// if (ObserveServiceHelper.isUseJMX()) { +//// +//// dettachHibernateMBean(source); +//// } +// +// ObserveMainUI mainUI = getObserveMainUI(); +// +// // nettoyage de l'ui ( suppression navigation et autres ) +// if (mainUI != null) { +// +// if (log.isDebugEnabled()) { +// log.debug("dispose ui from storage " + +// source.getLabel() + ": " + mainUI.getName()); +// } +// +// mainUI.setMode(ObserveUIMode.NO_DB); +// +// UIHelper.displayInfo( +// t("observe.message.db.closed", source.getLabel())); +// // } - - // remplissage de l'ui - ObserveMainUI mainUI = getObserveMainUI(); - - if (mainUI != null) { - if (log.isDebugEnabled()) { - log.debug("loading ui for storage " + source.getLabel() + - ": " + mainUI.getName()); - } - - DataContext dataContext = mainUI.getDataContext(); - dataContext.setEnabled(true); - - ObserveTreeHelper treeHelper = mainUI.getTreeHelper(); - - treeHelper.cleanNavigationUI(mainUI); - - - String[] openIds = getDataService().getOpenIds(source); - mainUI.getDataContext().populateOpens(openIds); - treeHelper.loadNavigationUI(source, mainUI); - - mainUI.setMode(ObserveUIMode.DB); - - mainUI.getStatus().setStatus( - t("observe.message.db.loaded", source.getLabel())); - - } - } - }); +// } +// +// protected void openOnUI(DataSource source) throws DataSourceException { +// // on rend le service disponible dans le service de données +// getDataService().registerDataSource(source); +// +// // on rend le service disponible dans le service de validation +// getValidationContext().setDataSource(source); +// +// // toutes les données sont chargées, on peut declarer le service +// // comme ouvert dans la configuration +// ObserveConfig config = getConfig(); +// config.setMainStorageOpened(true); +// config.setMainStorageOpenedLocal(source instanceof H2DataSource); +// +// if (source instanceof H2DataSource) { +// config.setLocalStorageExist(true); +// } +// +// // gestion JMX +//// if (ObserveServiceHelper.isUseJMX()) { +//// createHibernateMBean(source); +//// } +// +// // remplissage de l'ui +// ObserveMainUI mainUI = getObserveMainUI(); +// +// if (mainUI != null) { +// if (log.isDebugEnabled()) { +// log.debug("loading ui for storage " + source.getLabel() + +// ": " + mainUI.getName()); +// } +// +// DataContext dataContext = mainUI.getDataContext(); +// dataContext.setEnabled(true); +// +// ObserveTreeHelper treeHelper = mainUI.getTreeHelper(); +// +// treeHelper.cleanNavigationUI(mainUI); +// +// +// String[] openIds = getDataService().getOpenIds(source); +// mainUI.getDataContext().populateOpens(openIds); +// treeHelper.loadNavigationUI(source, mainUI); +// +// mainUI.setMode(ObserveUIMode.DB); +// +// mainUI.getStatus().setStatus( +// t("observe.message.db.loaded", source.getLabel())); +// +// } +// } +// }); } // protected void createHibernateMBean(DataSource source) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java b/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java new file mode 100644 index 0000000..a508bcb --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java @@ -0,0 +1,56 @@ +package fr.ird.observe.business; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 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 fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; + +import java.beans.PropertyChangeListener; + +/** + * Created on 1/6/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.11 + */ +//FIXME +public interface LonglinePositionAware { + + void setSection(SectionDto section); + + SectionDto getSection(); + + void setBasket(BasketDto basket); + + BasketDto getBasket(); + + void setBranchline(BranchlineDto branchline); + + BranchlineDto getBranchline(); + + void addPropertyChangeListener(PropertyChangeListener listener); + + void addPropertyChangeListener(String property, PropertyChangeListener listener); + +} 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 index 9c45b21..405c6ab 100644 --- 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 @@ -21,7 +21,6 @@ */ package fr.ird.observe.business.db; -import fr.ird.observe.services.dto.migration.AbstractDataSourceMigrationDto; import org.hibernate.dialect.Dialect; import java.sql.Driver; @@ -47,7 +46,7 @@ public interface DataSourceProvider<C extends DataSourceConfig, S extends DataSo Class<? extends Driver> getDriverClass(); /** @return la classe de migration */ - Class<? extends AbstractDataSourceMigration> getMigrationClass(); +// Class<? extends AbstractDataSourceMigration> getMigrationClass(); /** @return les paramètres utilisables sur la configuration */ DataSourceConfigParam[] getParams(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java deleted file mode 100644 index b8a946a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java +++ /dev/null @@ -1,103 +0,0 @@ -package fr.ird.observe.business.report.model.operations; - -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2015 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 fr.ird.observe.business.report.model.DataMatrix; -import fr.ird.observe.business.report.model.Report; -import fr.ird.observe.business.report.model.ReportOperation; - -import java.awt.*; -import java.util.HashSet; -import java.util.Set; - -/** - * To group by legnth (first column, second row is count). - * - * I don't know how to make this with hibernate the group by + sum does not work :(. - * - * Created on 5/23/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 4.0 - */ -public class GroupByLength extends ReportOperation { - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "GroupByLength"; - - @Override - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Set<String> lengths = new HashSet<String>(); - for (int i = 0; i < incoming.getHeight(); i++) { - lengths.add((String) incoming.getValue(0, i)); - } - Dimension result = new Dimension(incoming.getWidth(), lengths.size()); - return result; - } - - //FIXME -// @Override -// public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) { -// -// // Première passe pour grouper par classe de taille -// Map<String, MutableInt> data = new LinkedHashMap<String, MutableInt>(); -// for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { -// -// String length = (String) incoming.getValue(0, i); -// Integer count = Integer.valueOf(incoming.getValue(1, i).toString()); -// -// MutableInt mutableInt = data.get(length); -// if (mutableInt == null) { -// mutableInt = new MutableInt(); -// data.put(length, mutableInt); -// } -// mutableInt.add(count); -// -// } -// -// // Deuxième passe pour remplir la matrice -// DataMatrix result = createTmpMatrix(model, incoming); -// int row = 0; -// for (Map.Entry<String, MutableInt> entry : data.entrySet()) { -// String length = entry.getKey(); -// MutableInt mutableInt = entry.getValue(); -// result.setValue(0, row, length); -// result.setValue(1, row, mutableInt.intValue()); -// row++; -// } -// -// return result; -// } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java deleted file mode 100644 index dafdeeb..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java +++ /dev/null @@ -1,132 +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.report.model.operations; - -import fr.ird.observe.report.model.DataMatrix; -import fr.ird.observe.report.model.Report; -import fr.ird.observe.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; - - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * Opération pour calculer la somme de toutes les cellules d'une colonne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle ligne en bas - * du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumColumn extends ReportOperation { - - /** Logger */ - private static final Log log = - LogFactory.getLog(SumColumn.class); - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "SumColumn"; - - - public SumColumn() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(TopiaContext tx, - Report model, - DataMatrix incoming, - Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) { - - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du resultat - - DataMatrix tmpMatrix = createTmpMatrix(model, incoming); - - for (int i = 0, nbColumns = incoming.getWidth(); i < nbColumns; i++) { - - Object result = getColumnData(i, incoming); - tmpMatrix.setValue(i, 0, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [" + i + ",0] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - protected Object getColumnData(int column, DataMatrix incoming) { - Double result = 0d; - - int nbRows = incoming.getHeight(); - - for (int row = 0; row < nbRows; row++) { - Serializable o = incoming.getValue(column, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Dimension result = new Dimension(incoming.getWidth(), 1); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.java deleted file mode 100644 index b260ed5..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.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.report.model.operations; - -import fr.ird.observe.business.report.model.DataMatrix; -import fr.ird.observe.business.report.model.Report; -import fr.ird.observe.business.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.*; -import java.io.Serializable; - -/** - * Opération pour calculer la somme entière de toutes les cellules d'une colonne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle ligne en bas - * du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumIntColumn extends ReportOperation { - - /** Logger */ - private static final Log log = - LogFactory.getLog(SumIntColumn.class); - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "SumIntColumn"; - - - public SumIntColumn() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - //FIXME -// @Override -// public DataMatrix execute(TopiaContext tx, -// Report model, -// DataMatrix incoming, -// Map<String, Object> variables, -// Map<String, List<?>> repeatVariablesUniverse) { -// -// if (log.isDebugEnabled()) { -// log.debug("Launch " + this); -// } -// -// // construction du resultat -// -// DataMatrix tmpMatrix = createTmpMatrix(model, incoming); -// -// for (int i = 0, nbColumns = incoming.getWidth(); i < nbColumns; i++) { -// -// Object result = getColumnData(i, incoming); -// tmpMatrix.setValue(i, 0, result); -// if (log.isDebugEnabled()) { -// log.debug("objectOperation [" + i + ",0] = " + result); -// } -// } -// -// DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); -// return result; -// } - - protected Object getColumnData(int column, DataMatrix incoming) { - Double result = 0d; - - int nbRows = incoming.getHeight(); - - for (int row = 0; row < nbRows; row++) { - Serializable o = incoming.getValue(column, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result.intValue(); - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Dimension result = new Dimension(incoming.getWidth(), 1); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java deleted file mode 100644 index 7566a4b..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java +++ /dev/null @@ -1,132 +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.report.model.operations; - -import fr.ird.observe.report.model.DataMatrix; -import fr.ird.observe.report.model.Report; -import fr.ird.observe.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; - - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * Opération pour calculer la somme entière de toutes les cellules d'une ligne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle colonne à - * droite du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumIntRow extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(SumIntRow.class); - - public static final String OPERATION_NAME = "SumIntRow"; - - private static final long serialVersionUID = 1L; - - public SumIntRow() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(TopiaContext tx, - Report model, - DataMatrix incoming, - Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) { - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du result - - DataMatrix tmpMatrix = createTmpMatrix(model, incoming); - - for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { - - Object result = getRowData(i, incoming); - tmpMatrix.setValue(0, i, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [0, " + i + "] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - - protected Object getRowData(int row, DataMatrix incoming) { - - Double result = 0d; - - int nbColumns = incoming.getWidth(); - - for (int col = 0; col < nbColumns; col++) { - Serializable o = incoming.getValue(col, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result.intValue(); - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(incoming.getWidth(), 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(1, incoming.getHeight()); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.java deleted file mode 100644 index 4153a05..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.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.report.model.operations; - -import fr.ird.observe.business.report.model.DataMatrix; -import fr.ird.observe.business.report.model.Report; -import fr.ird.observe.business.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.*; -import java.io.Serializable; - -/** - * Opération pour calculer la somme de toutes les cellules d'une ligne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle colonne à - * droite du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumRow extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(SumRow.class); - - public static final String OPERATION_NAME = "SumRow"; - - private static final long serialVersionUID = 1L; - - public SumRow() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - //FIXME -// @Override -// public DataMatrix execute(TopiaContext tx, -// Report model, -// DataMatrix incoming, -// Map<String, Object> variables, -// Map<String, List<?>> repeatVariablesUniverse) { -// if (log.isDebugEnabled()) { -// log.debug("Launch " + this); -// } -// -// // construction du result -// -// DataMatrix tmpMatrix = createTmpMatrix(model, incoming); -// -// for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { -// -// Object result = getRowData(i, incoming); -// tmpMatrix.setValue(0, i, result); -// if (log.isDebugEnabled()) { -// log.debug("objectOperation [0, " + i + "] = " + result); -// } -// } -// -// DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); -// return result; -// } - - - protected Object getRowData(int row, DataMatrix incoming) { - - Double result = 0d; - - int nbColumns = incoming.getWidth(); - - for (int col = 0; col < nbColumns; col++) { - Serializable o = incoming.getValue(col, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(incoming.getWidth(), 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(1, incoming.getHeight()); - return result; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java index 3cbbb24..6d0b462 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java @@ -21,31 +21,21 @@ */ package fr.ird.observe.business.validation; -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.business.ObserveServiceHelper; import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.nuiton.topia.persistence.EntityVisitor; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityRef; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Deque; import java.util.HashSet; import java.util.LinkedList; -import java.util.List; import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; /** * Le detecteur de messages de validation. @@ -53,8 +43,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ -public class ValidationMessageDetector implements EntityVisitor, - SimpleBeanValidatorListener { +public class ValidationMessageDetector implements SimpleBeanValidatorListener { /** Logger */ private static final Log log = @@ -63,18 +52,18 @@ public class ValidationMessageDetector implements EntityVisitor, public static final String SEPARATOR = "/"; /** le path courant depuis le depart */ - protected Deque<TopiaEntity> path; + protected Deque<IdDto> path; /** le dictionnaire des paths d'entites detectees */ - protected SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> refs; +// protected SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> refs; protected StringBuilder accessorExpression; - protected TopiaEntity root; + protected IdDto root; - protected TopiaEntityRef currentRef; +// protected TopiaEntityRef currentRef; - protected Set<TopiaEntity> explored; + protected Set<IdDto> explored; /** le dictionnaire des validateurs utilisables */ protected final ValidatorsMap validators; @@ -90,37 +79,39 @@ public class ValidationMessageDetector implements EntityVisitor, public ValidationMessageDetector(ValidatorsMap validators) { this.validators = validators; - path = new LinkedList<TopiaEntity>(); - explored = new HashSet<TopiaEntity>(); - refs = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(); + path = new LinkedList<IdDto>(); + explored = new HashSet<IdDto>(); + //FIXME +// refs = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(); accessorExpression = new StringBuilder(); for (SimpleBeanValidator<?> v : validators.values()) { v.setBean(null); } } - public void detectMessages(TopiaEntity... entities) { + public void detectMessages(IdDto... entities) { // try { // on reinitialise tous les validateurs // for (BeanValidator<?> v : validators.values()) { // v.setBean(null); //// v.setContextName(contextName); // } - for (TopiaEntity e : entities) { + for (IdDto e : entities) { if (log.isDebugEnabled()) { - log.debug("start for entity " + e.getTopiaId()); + log.debug("start for entity " + e.getId()); } // détection sur l'entité e - try { - e.accept(this); - } catch (TopiaException e1) { - throw new RuntimeException("could not vist entity " + e.getTopiaId(), e1); - } + //FIXME +// try { +// e.accept(this); +// } catch (TopiaException e1) { +// throw new RuntimeException("could not vist entity " + e.getTopiaId(), e1); +// } } } - @Override - public void start(TopiaEntity e) { +// @Override + public void start(IdDto e) { if (root == null) { // start come in start method since // last clear method invocation @@ -128,29 +119,30 @@ public class ValidationMessageDetector implements EntityVisitor, addPath(e, "$root", -1); } explored.add(e); - SimpleBeanValidator<TopiaEntity> validator = getValidator(e); + SimpleBeanValidator<IdDto> validator = getValidator(e); if (log.isDebugEnabled()) { - log.debug("with entity " + e.getTopiaId() + " : " + accessorExpression); + log.debug("with entity " + e.getId() + " : " + accessorExpression); } if (validator != null) { validator.addSimpleBeanValidatorListener(this); addEntityInContext(e); - try { - currentRef = new TopiaEntityRef( - root, - e, - accessorExpression.toString(), - path.toArray(new TopiaEntity[path.size()])); - validator.setBean(e); - } finally { - validator.removeSimpleBeanValidatorListener(this); - validator.setBean(null); - } + //FIXME +// try { +// currentRef = new TopiaEntityRef( +// root, +// e, +// accessorExpression.toString(), +// path.toArray(new TopiaEntity[path.size()])); +// validator.setBean(e); +// } finally { +// validator.removeSimpleBeanValidatorListener(this); +// validator.setBean(null); +// } } } - @Override - public void end(TopiaEntity e) { +// @Override + public void end(IdDto e) { if (root != null && root.equals(e)) { // global visit is done root = null; @@ -159,290 +151,294 @@ public class ValidationMessageDetector implements EntityVisitor, removeEntityFromContext(e); } - private void addEntityInContext(TopiaEntity e) { + private void addEntityInContext(IdDto e) { DataContext context = getContext().getDataContext(); - ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(e); - switch (anEnum) { - case Route: - context.setSelectedRouteId(e.getTopiaId()); - break; - case TripSeine: { - context.setSelectedTripId(e.getTopiaId()); - Program program = ((TripSeine) e).getProgram(); - if (program != null) { - context.setSelectedProgramId(program.getTopiaId()); - } else { - context.setSelectedProgramId(null); - } - } - break; - case ActivitySeine: - context.setSelectedActivityId(e.getTopiaId()); - break; - case SetSeine: - context.setSelectedSetId(e.getTopiaId()); - break; - case TripLongline: { - context.setSelectedTripId(e.getTopiaId()); - Program program = ((TripLongline) e).getProgram(); - if (program != null) { - context.setSelectedProgramId(program.getTopiaId()); - } else { - context.setSelectedProgramId(null); - } - } - break; - case ActivityLongline: - context.setSelectedActivityId(e.getTopiaId()); - break; - case SetLongline: - context.setSelectedSetId(e.getTopiaId()); - break; - case FloatingObject: - context.setSelectedFloatingObjectId(e.getTopiaId()); - break; - case NonTargetLength: - break; - case TargetLength: - break; - case TransmittingBuoy: - break; - case NonTargetCatch: - break; - case TargetCatch: - break; - case NonTargetSample: - break; - case TargetSample: - break; - case ObjectObservedSpecies: - break; - case SchoolEstimate: - break; - case ObjectSchoolEstimate: - break; - case VesselActivitySeine: - break; - case SurroundingActivity: - break; - case Vessel: - break; - case VesselSizeCategory: - break; - case WeightCategory: - break; - case ReasonForNullSet: - break; - case ReasonForNoFishing: - break; - case SpeciesFate: - break; - case ObjectFate: - break; - case Species: - break; - case SpeciesGroup: - break; - case DetectionMode: - break; - case Person: - break; - case Ocean: - break; - case TransmittingBuoyOperation: - break; - case ObjectOperation: - break; - case Organism: - break; - case LengthWeightParameter: - break; - case Country: - break; - case Program: - break; - case ReasonForDiscard: - break; - case SpeciesStatus: - break; - case ObservedSystem: - break; - case TransmittingBuoyType: - break; - case VesselType: - break; - case ObjectType: - break; - case Wind: - break; - } + //FIXME +// ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(e); +// switch (anEnum) { +// case Route: +// context.setSelectedRouteId(e.getTopiaId()); +// break; +// case TripSeine: { +// context.setSelectedTripId(e.getTopiaId()); +// Program program = ((TripSeine) e).getProgram(); +// if (program != null) { +// context.setSelectedProgramId(program.getTopiaId()); +// } else { +// context.setSelectedProgramId(null); +// } +// } +// break; +// case ActivitySeine: +// context.setSelectedActivityId(e.getTopiaId()); +// break; +// case SetSeine: +// context.setSelectedSetId(e.getTopiaId()); +// break; +// case TripLongline: { +// context.setSelectedTripId(e.getTopiaId()); +// Program program = ((TripLongline) e).getProgram(); +// if (program != null) { +// context.setSelectedProgramId(program.getTopiaId()); +// } else { +// context.setSelectedProgramId(null); +// } +// } +// break; +// case ActivityLongline: +// context.setSelectedActivityId(e.getTopiaId()); +// break; +// case SetLongline: +// context.setSelectedSetId(e.getTopiaId()); +// break; +// case FloatingObject: +// context.setSelectedFloatingObjectId(e.getTopiaId()); +// break; +// case NonTargetLength: +// break; +// case TargetLength: +// break; +// case TransmittingBuoy: +// break; +// case NonTargetCatch: +// break; +// case TargetCatch: +// break; +// case NonTargetSample: +// break; +// case TargetSample: +// break; +// case ObjectObservedSpecies: +// break; +// case SchoolEstimate: +// break; +// case ObjectSchoolEstimate: +// break; +// case VesselActivitySeine: +// break; +// case SurroundingActivity: +// break; +// case Vessel: +// break; +// case VesselSizeCategory: +// break; +// case WeightCategory: +// break; +// case ReasonForNullSet: +// break; +// case ReasonForNoFishing: +// break; +// case SpeciesFate: +// break; +// case ObjectFate: +// break; +// case Species: +// break; +// case SpeciesGroup: +// break; +// case DetectionMode: +// break; +// case Person: +// break; +// case Ocean: +// break; +// case TransmittingBuoyOperation: +// break; +// case ObjectOperation: +// break; +// case Organism: +// break; +// case LengthWeightParameter: +// break; +// case Country: +// break; +// case Program: +// break; +// case ReasonForDiscard: +// break; +// case SpeciesStatus: +// break; +// case ObservedSystem: +// break; +// case TransmittingBuoyType: +// break; +// case VesselType: +// break; +// case ObjectType: +// break; +// case Wind: +// break; +// } } - private void removeEntityFromContext(TopiaEntity e) { + private void removeEntityFromContext(IdDto e) { DataContext context = getContext().getDataContext(); - ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(e); - switch (anEnum) { - case Route: - context.setSelectedRouteId(null); - break; - case TripSeine: - context.setSelectedTripId(null); - context.setSelectedProgramId(null); - break; - case ActivitySeine: - context.setSelectedActivityId(null); - break; - case SetSeine: - context.setSelectedSetId(null); - break; - case TripLongline: - context.setSelectedTripId(null); - context.setSelectedProgramId(null); - break; - case ActivityLongline: - context.setSelectedActivityId(null); - break; - case SetLongline: - context.setSelectedSetId(null); - break; - case FloatingObject: - context.setSelectedFloatingObjectId(null); - break; - case NonTargetLength: - break; - case TargetLength: - break; - case TransmittingBuoy: - break; - case NonTargetCatch: - break; - case TargetCatch: - break; - case NonTargetSample: - break; - case TargetSample: - break; - case ObjectObservedSpecies: - break; - case SchoolEstimate: - break; - case ObjectSchoolEstimate: - break; - case VesselActivitySeine: - break; - case SurroundingActivity: - break; - case Vessel: - break; - case VesselSizeCategory: - break; - case WeightCategory: - break; - case ReasonForNullSet: - break; - case ReasonForNoFishing: - break; - case SpeciesFate: - break; - case ObjectFate: - break; - case Species: - break; - case SpeciesGroup: - break; - case DetectionMode: - break; - case Person: - break; - case Ocean: - break; - case TransmittingBuoyOperation: - break; - case ObjectOperation: - break; - case Organism: - break; - case LengthWeightParameter: - break; - case Country: - break; - case Program: - break; - case ReasonForDiscard: - break; - case SpeciesStatus: - break; - case ObservedSystem: - break; - case TransmittingBuoyType: - break; - case VesselType: - break; - case ObjectType: - break; - case Wind: - break; - } + //FIXME +// ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(e); +// switch (anEnum) { +// case Route: +// context.setSelectedRouteId(null); +// break; +// case TripSeine: +// context.setSelectedTripId(null); +// context.setSelectedProgramId(null); +// break; +// case ActivitySeine: +// context.setSelectedActivityId(null); +// break; +// case SetSeine: +// context.setSelectedSetId(null); +// break; +// case TripLongline: +// context.setSelectedTripId(null); +// context.setSelectedProgramId(null); +// break; +// case ActivityLongline: +// context.setSelectedActivityId(null); +// break; +// case SetLongline: +// context.setSelectedSetId(null); +// break; +// case FloatingObject: +// context.setSelectedFloatingObjectId(null); +// break; +// case NonTargetLength: +// break; +// case TargetLength: +// break; +// case TransmittingBuoy: +// break; +// case NonTargetCatch: +// break; +// case TargetCatch: +// break; +// case NonTargetSample: +// break; +// case TargetSample: +// break; +// case ObjectObservedSpecies: +// break; +// case SchoolEstimate: +// break; +// case ObjectSchoolEstimate: +// break; +// case VesselActivitySeine: +// break; +// case SurroundingActivity: +// break; +// case Vessel: +// break; +// case VesselSizeCategory: +// break; +// case WeightCategory: +// break; +// case ReasonForNullSet: +// break; +// case ReasonForNoFishing: +// break; +// case SpeciesFate: +// break; +// case ObjectFate: +// break; +// case Species: +// break; +// case SpeciesGroup: +// break; +// case DetectionMode: +// break; +// case Person: +// break; +// case Ocean: +// break; +// case TransmittingBuoyOperation: +// break; +// case ObjectOperation: +// break; +// case Organism: +// break; +// case LengthWeightParameter: +// break; +// case Country: +// break; +// case Program: +// break; +// case ReasonForDiscard: +// break; +// case SpeciesStatus: +// break; +// case ObservedSystem: +// break; +// case TransmittingBuoyType: +// break; +// case VesselType: +// break; +// case ObjectType: +// break; +// case Wind: +// break; +// } } - @Override - public void visit(TopiaEntity e, +// @Override + public void visit(IdDto e, String name, Class<?> type, Object value) { - TopiaEntity e1 = getTopiaValue(value); + IdDto e1 = getTopiaValue(value); if (e1 != null) { addPath(e1, name, -1); try { - try { - e1.accept(this); - } catch (TopiaException ex) { - if (log.isErrorEnabled()) { - log.error(ex.getMessage(), ex); - } - } + //FIXME +// try { +// e1.accept(this); +// } catch (TopiaException ex) { +// if (log.isErrorEnabled()) { +// log.error(ex.getMessage(), ex); +// } +// } } finally { removePath(); } } } - @Override - public void visit(TopiaEntity e, +// @Override + public void visit(IdDto e, String name, Class<?> collectionType, Class<?> type, int index, Object value) { - TopiaEntity e1 = getTopiaValue(value); + IdDto e1 = getTopiaValue(value); if (e1 != null) { addPath(e1, name, index); try { - try { - e1.accept(this); - } catch (TopiaException ex) { - if (log.isErrorEnabled()) { - log.error(ex.getMessage(), ex); - } - } + //FIXME +// try { +// e1.accept(this); +// } catch (TopiaException ex) { +// if (log.isErrorEnabled()) { +// log.error(ex.getMessage(), ex); +// } +// } } finally { removePath(); } } } - @Override - public void visit(TopiaEntity e, +// @Override + public void visit(IdDto e, String name, Class<?> collectionType, Class<?> type, Object value) { Collection<?> cValue = (Collection<?>) value; - if (TopiaEntity.class.isAssignableFrom(type) && + if (IdDto.class.isAssignableFrom(type) && cValue != null && !cValue.isEmpty()) { int i = 0; for (Object currentValue : cValue) { @@ -451,26 +447,28 @@ public class ValidationMessageDetector implements EntityVisitor, } } - public SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> getRefs() { - // on renvoie toujours une copie - // pour pouvoir au plus tôt nettoyer le detecteur - TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> result; - result = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(refs); - return result; - } - - @Override + //FIXME +// public SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> getRefs() { +// // on renvoie toujours une copie +// // pour pouvoir au plus tôt nettoyer le detecteur +// TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> result; +// result = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(refs); +// return result; +// } + + //FIXME +// @Override public void clear() { path.clear(); - refs.clear(); +// refs.clear(); root = null; explored.clear(); accessorExpression.setLength(0); } - protected TopiaEntity getTopiaValue(Object value) { - TopiaEntity topiaEntity = (TopiaEntity) (value != null && - value instanceof TopiaEntity ? value : null); + protected IdDto getTopiaValue(Object value) { + IdDto topiaEntity = (IdDto) (value != null && + value instanceof IdDto ? value : null); if (topiaEntity != null && explored.contains(topiaEntity)) { // entite deja visitee topiaEntity = null; @@ -478,31 +476,34 @@ public class ValidationMessageDetector implements EntityVisitor, return topiaEntity; } - protected <T extends TopiaEntity> SimpleBeanValidator<T> getValidator(T e) { + protected <T extends IdDto> SimpleBeanValidator<T> getValidator(T e) { Class<T> contractClass; - contractClass = (Class<T>) ObserveDAOHelper.getContractClass(e.getClass()); - return validators.getValidator(contractClass); + //FIXME +// contractClass = (Class<T>) ObserveDAOHelper.getContractClass(e.getClass()); +// return validators.getValidator(contractClass); + return null; } - protected void addPath(TopiaEntity e, String name, int index) { + protected void addPath(IdDto e, String name, int index) { path.add(e); if (accessorExpression.length() > 0) { accessorExpression.append(SEPARATOR); } accessorExpression.append(name); if (index > -1) { + //FIXME accessorExpression.append("[@topiaId=\""); - accessorExpression.append(e.getTopiaId()); + accessorExpression.append(e.getId()); accessorExpression.append("\"]"); } if (log.isTraceEnabled()) { - log.trace("add to stack : " + e.getTopiaId() + ", new size : " + + log.trace("add to stack : " + e.getId() + ", new size : " + path.size() + ", path : " + accessorExpression); } } protected void removePath() { - TopiaEntity e = path.removeLast(); + IdDto e = path.removeLast(); if (path.isEmpty()) { accessorExpression.setLength(0); } else { @@ -513,7 +514,7 @@ public class ValidationMessageDetector implements EntityVisitor, } } if (log.isTraceEnabled()) { - log.trace("remove from stack : " + e.getTopiaId() + + log.trace("remove from stack : " + e.getId() + ", new size : " + path.size() + ", path : " + accessorExpression); } @@ -530,16 +531,17 @@ public class ValidationMessageDetector implements EntityVisitor, return; } - if (log.isDebugEnabled()) { - log.debug("will add " + Arrays.toString(messagesToAdd) + - " for " + currentRef.getAccessorExpression()); - } - List<SimpleBeanValidatorMessage<?>> list = refs.get(currentRef); - if (list == null) { - // first time for this entity - list = new ArrayList<SimpleBeanValidatorMessage<?>>(); - refs.put(currentRef, list); - } + //FIXME +// if (log.isDebugEnabled()) { +// log.debug("will add " + Arrays.toString(messagesToAdd) + +// " for " + currentRef.getAccessorExpression()); +// } +// List<SimpleBeanValidatorMessage<?>> list = refs.get(currentRef); +// if (list == null) { +// // first time for this entity +// list = new ArrayList<SimpleBeanValidatorMessage<?>>(); +// refs.put(currentRef, list); +// } for (String m : messagesToAdd) { SimpleBeanValidatorMessage<?> message; message = new SimpleBeanValidatorMessage( @@ -550,7 +552,8 @@ public class ValidationMessageDetector implements EntityVisitor, if (log.isDebugEnabled()) { log.debug("add message " + message); } - list.add(message); + //FIXME +// list.add(message); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 4170505..a328950 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -107,17 +107,17 @@ JSplitPane { } #menuDbLanguageFR { - action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferenceLocale.FR, t("observe.action.locale.fr"), t("observe.action.db.locale.fr.tip"))}; + action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferentialLocale.FR, t("observe.action.locale.fr"), t("observe.action.db.locale.fr.tip"))}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "fr_FR")}; } #menuDbLanguageUK { - action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferenceLocale.UK, t("observe.action.locale.uk"), t("observe.action.db.locale.uk.tip"))}; + action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferentialLocale.UK, t("observe.action.locale.uk"), t("observe.action.db.locale.uk.tip"))}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "en_GB")}; } #menuDbLanguageES { - action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferenceLocale.ES, t("observe.action.locale.es"), t("observe.action.db.locale.es.tip"))}; + action: {new fr.ird.observe.ui.actions.ChangeDbLanguageAction(this, ReferentialLocale.ES, t("observe.action.locale.es"), t("observe.action.db.locale.es.tip"))}; enabled: {!getHandler().acceptLocale(getConfig().getDbLocale(), "es_ES")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index b95579e..dda06dc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -26,12 +26,10 @@ <import> fr.ird.observe.ObserveConfig fr.ird.observe.business.db.DataContext - fr.ird.observe.services.dto.TripDto - fr.ird.observe.services.dto.ActivityDto - fr.ird.observe.services.dto.SetDto + fr.ird.observe.services.dto.seine.RouteDto fr.ird.observe.services.dto.referential.ProgramDto - fr.ird.observe.services.dto.constants.ReferenceLocale + fr.ird.observe.services.dto.constants.ReferentialLocale fr.ird.observe.ui.admin.AdminStep fr.ird.observe.ui.content.ContentUIManager @@ -52,6 +50,11 @@ javax.swing.JComponent javax.swing.UIManager javax.swing.Icon + + <!-- FIXME --> + <!--fr.ird.observe.services.dto.TripDto--> + <!--fr.ird.observe.services.dto.ActivityDto--> + <!--fr.ird.observe.services.dto.SetDto--> </import> <ObserveUIMode id='mode' javaBean='ObserveUIMode.NO_DB'/> @@ -154,15 +157,15 @@ void $afterCompleteSetup() { <JMenu id='menuNavigation'> <JMenuItem id='menuNavigationProgram' - onActionPerformed="getTreeHelper().selectOpenNode(this, Program.class)"/> - <JMenuItem id='menuNavigationTrip' - onActionPerformed="getTreeHelper().selectOpenNode(this, Trip.class)"/> + onActionPerformed="getTreeHelper().selectOpenNode(this, ProgramDto.class)"/> + <!--<JMenuItem id='menuNavigationTrip'--> + <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Trip.class)"/>--> <JMenuItem id='menuNavigationRoute' - onActionPerformed="getTreeHelper().selectOpenNode(this, Route.class)"/> - <JMenuItem id='menuNavigationActivity' - onActionPerformed="getTreeHelper().selectOpenNode(this, Activity.class)"/> - <JMenuItem id='menuNavigationSet' - onActionPerformed="getTreeHelper().selectOpenNode(this, Set.class)"/> + onActionPerformed="getTreeHelper().selectOpenNode(this, RouteDto.class)"/> + <!--<JMenuItem id='menuNavigationActivity'--> + <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Activity.class)"/>--> + <!--<JMenuItem id='menuNavigationSet'--> + <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Set.class)"/>--> <JSeparator/> <JMenuItem id='menuNavigationReferentiel' onActionPerformed='getTreeHelper().selectNode("observe.common.referentiel")'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 87426f2..6dd8bb9 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -21,14 +21,14 @@ */ package fr.ird.observe.ui; -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; +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.constants.ReferentialLocale; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUI; @@ -49,7 +49,6 @@ import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.Icon; import javax.swing.SwingUtilities; @@ -285,7 +284,7 @@ public class ObserveMainUIHandler { // pas d'écran selectionne return; } - ContentUIModel<? extends TopiaEntity> model = selectedUI.getModel(); + ContentUIModel<? extends AbstractObserveDto> model = selectedUI.getModel(); if (!model.isEditable()) { // modele non editable @@ -398,11 +397,12 @@ public class ObserveMainUIHandler { if (ui.getConfig().isMainStorageOpened()) { DataSource service = ObserveContext.get().getDataSource(); - if (service instanceof H2DataSource) { - icon = (Icon) ui.storageStatus.getClientProperty("localIcon"); - } else { + //FIXME +// if (service instanceof H2DataSource) { +// icon = (Icon) ui.storageStatus.getClientProperty("localIcon"); +// } else { icon = (Icon) ui.storageStatus.getClientProperty("remoteIcon"); - } +// } } else { icon = (Icon) ui.storageStatus.getClientProperty("noneIcon"); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java index 3d0b828..c48df86 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java @@ -307,7 +307,7 @@ public class UIHelper extends SwingUtil { DecoratorService decoratorService = ObserveContext.get().getDecoratorService(); Decorator<E> decorator = decoratorService.getDecoratorByType(beanClass); String beanStr; - String messageDelete; + String messageDelete = null; String type = DecoratorService.getEntityLabel(beanClass); type = t(type); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java index 422913f..47d49d9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java @@ -25,7 +25,7 @@ package fr.ird.observe.ui.actions; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveConfigOption; import fr.ird.observe.ObserveContext; -import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.ui.*; import fr.ird.observe.ui.ObserveUICallback; import jaxx.runtime.SwingUtil; @@ -50,9 +50,9 @@ public class ChangeDbLanguageAction extends AbstractAction { private final ObserveMainUI ui; - private final ReferenceLocale newLocale; + private final ReferentialLocale newLocale; - public ChangeDbLanguageAction(ObserveMainUI ui, ReferenceLocale newLocale, String name, String description) { + public ChangeDbLanguageAction(ObserveMainUI ui, ReferentialLocale newLocale, String name, String description) { super(name, SwingUtil.getUIManagerActionIcon("i18n-" + newLocale.getLocale().getLanguage())); this.ui = ui; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java index e4543b6..9b337a8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java @@ -28,8 +28,6 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.DataSourceFactory; -import fr.ird.observe.business.db.impl.H2DataSourceConfig; -import fr.ird.observe.business.db.impl.PGDataSourceConfig; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; @@ -103,39 +101,43 @@ public class ReloadStorageAction extends AbstractAction { ObserveConfig appConfig = ObserveContext.get().getConfig(); - if (config instanceof H2DataSourceConfig) { - - H2DataSourceConfig h2Config = (H2DataSourceConfig) config; - h2Config.setCanMigrate(appConfig.isCanMigrateH2()); - h2Config.detectPolicy(); - } - - if (config instanceof PGDataSourceConfig) { - PGDataSourceConfig pgConfig = (PGDataSourceConfig) config; - pgConfig.setCanMigrate(appConfig.isCanMigrateObstuna()); - //TODO Should try to reconnect ? to obtain new credentials ? -// pgConfig.canConnect(); -// pgConfig.detectPolicy(); - } - try { - // creation du service - storage = - DataSourceFactory.newService(config, storage.getClass()); - - // on conserve les noeuds a selectionner - ObserveContext.get().setNodesToReselect(ids); - - // attachement a l'ui - ObserveContext.get().prepareMainStorage(storage); - - // ouverture du service - storage.doOpen(); - } catch (Exception e) { - ErrorDialogUI.showError(e); - if (log.isErrorEnabled()) { - log.error(e.getMessage(), e); - } - } + //FIXME +// if (config instanceof H2DataSourceConfig) { +// +// H2DataSourceConfig h2Config = (H2DataSourceConfig) config; +// h2Config.setCanMigrate(appConfig.isCanMigrateH2()); +// h2Config.detectPolicy(); +// } + + //FIXME +// if (config instanceof PGDataSourceConfig) { +// PGDataSourceConfig pgConfig = (PGDataSourceConfig) config; +// pgConfig.setCanMigrate(appConfig.isCanMigrateObstuna()); +// //TODO Should try to reconnect ? to obtain new credentials ? +//// pgConfig.canConnect(); +//// pgConfig.detectPolicy(); +// } + + //FIXME +// try { +// // creation du service +// storage = +// DataSourceFactory.newService(config, storage.getClass()); +// +// // on conserve les noeuds a selectionner +// ObserveContext.get().setNodesToReselect(ids); +// +// // attachement a l'ui +// ObserveContext.get().prepareMainStorage(storage); +// +// // ouverture du service +// storage.doOpen(); +// } catch (Exception e) { +// ErrorDialogUI.showError(e); +// if (log.isErrorEnabled()) { +// log.error(e.getMessage(), e); +// } +// } } finally { ui.setBusy(false); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java index 6ef073f..5d453ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.actions; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.impl.H2DataSourceConfig; import fr.ird.observe.ui.storage.StorageBackupUILauncher; import jaxx.runtime.SwingUtil; @@ -65,9 +64,11 @@ public class SaveStorageToFileAction extends AbstractAction { DataSource service = ObserveMainUIHandler.getStorage(); - boolean local = service.getConfig() instanceof H2DataSourceConfig; +// boolean local = service.getConfig() instanceof H2DataSourceConfig; - if (!local && !(service.canReadData() && service.canWriteData())) { + //FIXME +// if (!local && !(service.canReadData() && service.canWriteData())) { + if (!(service.canReadData() && service.canWriteData())) { UIHelper.askUser( null, t("observe.title.can.not.export.obstuna"), @@ -79,13 +80,14 @@ public class SaveStorageToFileAction extends AbstractAction { return; } - String title = local ? - t("observe.title.save.localDB") : - t("observe.title.save.remoteDB"); - - StorageBackupUILauncher launcher = - new StorageBackupUILauncher(ui, ui, title); - launcher.start(); + //FIXME +// String title = local ? +// t("observe.title.save.localDB") : +// t("observe.title.save.remoteDB"); +// +// StorageBackupUILauncher launcher = +// new StorageBackupUILauncher(ui, ui, title); +// launcher.start(); } } 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 e41ba3e..87917e6 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 @@ -22,14 +22,13 @@ package fr.ird.observe.ui.actions; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveConfigOption; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUICallback; @@ -118,88 +117,90 @@ public class ShowConfigAction extends AbstractAction { } protected ObserveConfigUIBuilder buildUI(ObserveConfig config, DataSource dataSource) throws DataSourceException { - - SpeciesListTableCellEditor editor; - SpeciesListsTableCellRenderer renderer; - - if (dataSource == null) { - - editor = null; - renderer = null; - - } else { - - DataService dataService = ObserveContext.get().getDataService(); - - Decorator<SpeciesList> speciesListDecorator = dataService.getDecoratorService().getDecoratorByType(SpeciesList.class); - - // load species lists - List<SpeciesList> speciesLists = dataService.loadDecoratedEntities(dataSource, SpeciesList.class); - - Map<String, SpeciesList> speciesListMap = Entities.toIdMap(speciesLists); - - - editor = new SpeciesListTableCellEditor(speciesLists, speciesListMap, speciesListDecorator); - - - renderer = new SpeciesListsTableCellRenderer(speciesListMap, speciesListDecorator); - - } - - ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, editor, renderer); - - for (ObserveUICallback callback : ObserveUICallback.values()) { - helper.registerCallBack(callback); - } - - helper.setFinalizer(new MainCallBackFinalizer(ObserveUICallback.application.name())); - - helper.setCloseAction(new Runnable() { - @Override - public void run() { - ObserveMainUIHandler.restartEdit(); - } - }); - - // categorie repertoires - addDirectoriesOptions(helper); - - // categorie h2 - addH2Options(helper); - - // categorie obtuna - addObstunaOptions(helper); - - // categorie change storage - addChangeStorageOptions(helper); - - // categorie gps - addGpsOptions(helper); - - // categorie synchro - addSynchroOptions(helper); - - // categorie observations (seine) - addObservationsOptions(helper); - - if (dataSource != null) { - - // categorie speciesList (seine) - addSeineSpeciesListOptions(helper); - - // categorie speciesList (longline) - addLonglineSpeciesListOptions(helper); - - } - - // catégories map - addMapOptions(helper); - - // others - addOthersOptions(helper); - - return helper; - + //FIXME + +// SpeciesListTableCellEditor editor; +// SpeciesListsTableCellRenderer renderer; + +// if (dataSource == null) { +// +// editor = null; +// renderer = null; +// +// } else { +// +// DataService dataService = ObserveContext.get().getDataService(); +// +// Decorator<SpeciesList> speciesListDecorator = dataService.getDecoratorService().getDecoratorByType(SpeciesList.class); +// +// // load species lists +// List<SpeciesList> speciesLists = dataService.loadDecoratedEntities(dataSource, SpeciesList.class); +// +// Map<String, SpeciesList> speciesListMap = Entities.toIdMap(speciesLists); +// +// +// editor = new SpeciesListTableCellEditor(speciesLists, speciesListMap, speciesListDecorator); +// +// +// renderer = new SpeciesListsTableCellRenderer(speciesListMap, speciesListDecorator); +// +// } +// +// ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, editor, renderer); +// +// for (ObserveUICallback callback : ObserveUICallback.values()) { +// helper.registerCallBack(callback); +// } +// +// helper.setFinalizer(new MainCallBackFinalizer(ObserveUICallback.application.name())); +// +// helper.setCloseAction(new Runnable() { +// @Override +// public void run() { +// ObserveMainUIHandler.restartEdit(); +// } +// }); +// +// // categorie repertoires +// addDirectoriesOptions(helper); +// +// // categorie h2 +// addH2Options(helper); +// +// // categorie obtuna +// addObstunaOptions(helper); +// +// // categorie change storage +// addChangeStorageOptions(helper); +// +// // categorie gps +// addGpsOptions(helper); +// +// // categorie synchro +// addSynchroOptions(helper); +// +// // categorie observations (seine) +// addObservationsOptions(helper); +// +// if (dataSource != null) { +// +// // categorie speciesList (seine) +// addSeineSpeciesListOptions(helper); +// +// // categorie speciesList (longline) +// addLonglineSpeciesListOptions(helper); +// +// } +// +// // catégories map +// addMapOptions(helper); +// +// // others +// addOthersOptions(helper); +// +// return helper; + + return null; } protected void addDirectoriesOptions(ObserveConfigUIBuilder helper) { @@ -427,11 +428,11 @@ public class ShowConfigAction extends AbstractAction { private static final long serialVersionUID = 1L; - private final Map<String, SpeciesList> entityMap; + private final Map<String, SpeciesListDto> entityMap; - private final Decorator<SpeciesList> decorator; + private final Decorator<SpeciesListDto> decorator; - public SpeciesListsTableCellRenderer(Map<String, SpeciesList> entityMap, Decorator<SpeciesList> decorator) { + public SpeciesListsTableCellRenderer(Map<String, SpeciesListDto> entityMap, Decorator<SpeciesListDto> decorator) { this.entityMap = entityMap; this.decorator = decorator; } @@ -442,7 +443,7 @@ public class ShowConfigAction extends AbstractAction { int row, int column) { String speciesListId = String.valueOf(value); - SpeciesList speciesList = entityMap.get(speciesListId); + SpeciesListDto speciesList = entityMap.get(speciesListId); return super.getTableCellRendererComponent(table, decorator.toString(speciesList), isSelected, hasFocus, row, column); } @@ -452,23 +453,23 @@ public class ShowConfigAction extends AbstractAction { private static final long serialVersionUID = 1L; - private final Map<String, SpeciesList> entityMap; + private final Map<String, SpeciesListDto> entityMap; - private final Decorator<SpeciesList> decorator; + private final Decorator<SpeciesListDto> decorator; - protected SpeciesListTableCellEditor(List<SpeciesList> entities, - Map<String, SpeciesList> entityMap, - Decorator<SpeciesList> decorator) { + protected SpeciesListTableCellEditor(List<SpeciesListDto> entities, + Map<String, SpeciesListDto> entityMap, + Decorator<SpeciesListDto> decorator) { super(new JComboBox()); this.entityMap = entityMap; this.decorator = decorator; - final BeanFilterableComboBox<SpeciesList> component = new BeanFilterableComboBox<SpeciesList>(); + final BeanFilterableComboBox<SpeciesListDto> component = new BeanFilterableComboBox<SpeciesListDto>(); component.setI18nPrefix("observe.common."); component.setShowReset(true); - component.setBeanType(SpeciesList.class); + component.setBeanType(SpeciesListDto.class); setClickCountToStart(1); editorComponent = component; @@ -488,10 +489,10 @@ public class ShowConfigAction extends AbstractAction { public Object getCellEditorValue() { String result = null; Object selectedItem = component.getSelectedItem(); - if (SpeciesList.class.isInstance(selectedItem)) { - SpeciesList speciesList = (SpeciesList) component.getSelectedItem(); + if (SpeciesListDto.class.isInstance(selectedItem)) { + SpeciesListDto speciesList = (SpeciesListDto) component.getSelectedItem(); if (speciesList != null) { - result = speciesList.getTopiaId(); + result = speciesList.getId(); } } return result; @@ -517,7 +518,7 @@ public class ShowConfigAction extends AbstractAction { } }; - component.init((JXPathDecorator<SpeciesList>) this.decorator, entities); + component.init((JXPathDecorator<SpeciesListDto>) this.decorator, entities); } class SpeciesListListCellRenderer extends DefaultListCellRenderer { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java index ef63af4..1b54dce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java @@ -28,7 +28,6 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -76,12 +75,13 @@ public class StartH2WebServerAction extends AbstractAction { try { - Server server = Server.createWebServer("-webAllowOthers"); - server.start(); - - Server.openBrowser(server.getURL()); - - ui.setContextValue(server, ObserveMainUIHandler.H2_WEB_SERVER); + //FIXME +// Server server = Server.createWebServer("-webAllowOthers"); +// server.start(); +// +// Server.openBrowser(server.getURL()); +// +// ui.setContextValue(server, ObserveMainUIHandler.H2_WEB_SERVER); ui.setH2WebServer(true); } catch (Exception e) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java index c7a3f24..45d2fa2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java @@ -30,7 +30,6 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -83,41 +82,42 @@ public class StartServerModeAction extends AbstractAction { ui.setMode(ObserveUIMode.SERVER); - try { - - Server server = Server.createTcpServer("-tcp", - "-tcpAllowOthers", - "-ifExists", - "-baseDir", dbDirectory.getAbsolutePath(), - "-tcpDaemon", - "-tcpPort", - String.valueOf(port)); - - String url = String.format(ObserveMainUIHandler.H2_SERVER_URL_PATTERN, - server.getURL(), - dbDirectory.getAbsolutePath()); - - server.start(); - if (log.isInfoEnabled()) { - log.info("server starts at " + url); - } - - String text = t("observe.message.server.info", dbDirectory); - ui.getServerModeInfo().setText(text); - - ui.getServerModeURL().setText(url); - ui.getServerModeLogin().setText(h2Login); - ui.getServerModePassword().setText(h2Password); - - ui.setContextValue(server, ObserveMainUIHandler.H2_SERVER); - - } catch (SQLException e) { - - if (log.isErrorEnabled()) { - log.error("Could not start h2 server ", e); - } - ErrorDialogUI.showError(e); - } + //FIXME +// try { +// +// Server server = Server.createTcpServer("-tcp", +// "-tcpAllowOthers", +// "-ifExists", +// "-baseDir", dbDirectory.getAbsolutePath(), +// "-tcpDaemon", +// "-tcpPort", +// String.valueOf(port)); +// +// String url = String.format(ObserveMainUIHandler.H2_SERVER_URL_PATTERN, +// server.getURL(), +// dbDirectory.getAbsolutePath()); +// +// server.start(); +// if (log.isInfoEnabled()) { +// log.info("server starts at " + url); +// } +// +// String text = t("observe.message.server.info", dbDirectory); +// ui.getServerModeInfo().setText(text); +// +// ui.getServerModeURL().setText(url); +// ui.getServerModeLogin().setText(h2Login); +// ui.getServerModePassword().setText(h2Password); +// +// ui.setContextValue(server, ObserveMainUIHandler.H2_SERVER); +// +// } catch (SQLException e) { +// +// if (log.isErrorEnabled()) { +// log.error("Could not start h2 server ", e); +// } +// ErrorDialogUI.showError(e); +// } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java index aa25344..f405b8b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java @@ -27,7 +27,6 @@ import fr.ird.observe.ui.ObserveMainUIHandler; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -65,10 +64,12 @@ public class StopH2WebServerAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will stop web server mode..."); } - Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); - if (server != null) { - server.stop(); - } + + //FIXME +// Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); +// if (server != null) { +// server.stop(); +// } ui.setH2WebServer(false); } else { if (log.isWarnEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java index a20c773..aa0311b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java @@ -28,7 +28,6 @@ import fr.ird.observe.ui.ObserveUIMode; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.tools.Server; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -65,10 +64,11 @@ public class StopServerModeAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will stop server mode..."); } - Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_SERVER); - if (server != null) { - server.stop(); - } + //FIXME +// Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_SERVER); +// if (server != null) { +// server.stop(); +// } ui.setMode(ObserveUIMode.NO_DB); if (ui.isH2WebServer()) { @@ -85,10 +85,11 @@ public class StopServerModeAction extends AbstractAction { if (log.isInfoEnabled()) { log.info("Will stop web server mode..."); } - Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); - if (server != null) { - server.stop(); - } + //FIXME +// Server server = ui.getContextValue(Server.class, ObserveMainUIHandler.H2_WEB_SERVER); +// if (server != null) { +// server.stop(); +// } ui.setH2WebServer(false); } else { if (log.isWarnEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java index 21b76a7..250ed34 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java @@ -96,7 +96,7 @@ public class CloseAndCreateUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivitySeine.class); + treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); @@ -132,7 +132,7 @@ public class CloseAndCreateUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivityLongline.class); + treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java index 9491dc7..d9941cb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java @@ -101,7 +101,7 @@ public class CloseOpenUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivitySeine.class); + treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); @@ -143,7 +143,7 @@ public class CloseOpenUIAction extends AbstractUIAction { ); // selection du noeud de l'activity ouverte - treeHelper.selectOpenNode(getMainUI(), ActivityLongline.class); + treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class); // on conserve le path de l'activity TreePath path = tree.getSelectionPath(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java index 755cc19..c457766 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java @@ -22,13 +22,14 @@ package fr.ird.observe.ui.actions.shared; import fr.ird.observe.ObserveContext; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.ContentListUI; import fr.ird.observe.ui.content.open.ContentOpenableUI; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JComponent; import javax.swing.SwingUtilities; @@ -81,10 +82,10 @@ public class ReOpenUIAction extends AbstractUIAction { openUI = (ContentOpenableUI<?>) ui; } else if (ui instanceof ContentListUI<?, ?>) { - TopiaEntity selectedData = + IdDto selectedData = ((ContentListUI<?, ?>) ui).getSelectedData(); - String id = selectedData.getTopiaId(); + String id = selectedData.getId(); ObserveTreeHelper treeHelper = ui.getTreeHelper(); ObserveNode selectedNode = treeHelper.getSelectedNode(); 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 8dd8535..1177f43 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 @@ -29,6 +29,8 @@ 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.ui.admin.config.SelectDataUI; +import fr.ird.observe.ui.admin.resume.ShowResumeUI; import fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.business.validation.ValidationService; @@ -330,9 +332,10 @@ public class AdminTabUIHandler implements SendMessageAble { DataSelectionTreeSelectionModel selectionModel = tabUI.getSelectionModel(); ObserveTreeHelper helper = tabUI.getTreeHelper(); - if (log.isDebugEnabled()) { - log.debug("reload model " + selectDataModel); - } + //FIXME +// if (log.isDebugEnabled()) { +// log.debug("reload model " + selectDataModel); +// } selectionModel.clearSelection(); DataSource source = tabUI.getModel().getSafeLocalSource(true); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java index a68d1f8..e69e31d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java @@ -24,6 +24,9 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ui.UIHelper; +import fr.ird.observe.ui.admin.config.ConfigUI; +import fr.ird.observe.ui.admin.resume.ShowResumeUI; +import fr.ird.observe.ui.admin.save.SaveLocalUI; import jaxx.runtime.swing.wizard.WizardUILancher; import jaxx.runtime.swing.wizard.ext.WizardExtUtil; import jaxx.runtime.swing.wizard.ext.WizardState; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java index 4f80ccb..d8dd3d9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; +import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveUIMode; import fr.ird.observe.ui.UIHelper; import jaxx.runtime.JAXXContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css index 9aef87d..8b1dde3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css @@ -35,7 +35,7 @@ #selectionModel { selectionMode: {TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION}; - dataModel:{selectDataModel}; + //dataModel:{selectDataModel}; } #selectTreePane { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index c275b5b..5da08ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -27,7 +27,6 @@ <fr.ird.observe.ui.admin.AdminTabUI> <import> - fr.ird.observe.db.model.DataSelectionModel fr.ird.observe.ui.UIHelper fr.ird.observe.ui.admin.AdminUI fr.ird.observe.ui.admin.AdminStep @@ -47,8 +46,9 @@ <fr.ird.observe.ui.admin.AdminActionModel id='stepModel' initializer='null'/> - <DataSelectionModel id='selectDataModel' - initializer='getModel().getSelectionDataModel()'/> + <!--FIXME--> + <!--<DataSelectionModel id='selectDataModel'--> + <!--initializer='getModel().getSelectionDataModel()'/>--> <DataSelectionTreeSelectionModel id='selectionModel'/> @@ -67,7 +67,7 @@ public void initUI(AdminUI ui) { @Override public void destroy() { selectionModel.clearSelection(); - selectDataModel = null; + //selectDataModel = null; super.destroy(); } ]]> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java index d650be6..ac33a66 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java @@ -325,7 +325,8 @@ public class ImportGPSUIHandler extends AdminTabUIHandler { tableModel.clear(); } else { GPSActivityTableModel activityTableModel = tabUI.activitysModel; - tableModel.init(activityTableModel.getActivityAt(row), activityTableModel.getGPSPointAt(row)); + //FIXME +// tableModel.init(activityTableModel.getActivityAt(row), activityTableModel.getGPSPointAt(row)); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index 426d1e3..893457c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -213,11 +213,12 @@ public class ReportUIHandler extends AdminTabUIHandler { // avoid multi-cast return; } - DataSelectionModel value = (DataSelectionModel) evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug("selection model changed to " + value.getDatas()); - log.debug("IS USE DATA ? : " + value.isUseData()); - } + //FIXME +// DataSelectionModel value = (DataSelectionModel) evt.getNewValue(); +// if (log.isDebugEnabled()) { +// log.debug("selection model changed to " + value.getDatas()); +// log.debug("IS USE DATA ? : " + value.isUseData()); +// } updateSelectionModel(selectTabUI); } }); @@ -319,14 +320,15 @@ public class ReportUIHandler extends AdminTabUIHandler { // l'executeur n'est plus disponible, on ne fait rien return; } - try { - execute.populate(report, getModel().getSelectedTrip()); - } catch (RuntimeException eee) { - throw eee; - } catch (Exception eee) { - throw new IllegalStateException( - "Could not populate report " + report + " in executor", eee); - } + //FIXME +// try { +// execute.populate(report, getModel().getSelectedTrip()); +// } catch (RuntimeException eee) { +// throw eee; +// } catch (Exception eee) { +// throw new IllegalStateException( +// "Could not populate report " + report + " in executor", eee); +// } // on regénère l'ui de configuration des variables JPanel variablesPanel = tabUI.getReportVariableSelectorPanel(); @@ -434,11 +436,13 @@ public class ReportUIHandler extends AdminTabUIHandler { variables.put(ReportExecute.TRIP_ID_VARIABLE, mareeId); long startTime = TimeLog.getTime(); - data = execute.execute(variables); + //FIXME +// data = execute.execute(variables); timeLog.log(startTime, "execute", report.getName()); - if (log.isInfoEnabled()) { - log.info("Result to dispaly:\n" + data.getClipbordContent(true, true)); - } + //FIXME +// if (log.isInfoEnabled()) { +// log.info("Result to dispaly:\n" + data.getClipbordContent(true, true)); +// } } catch (Exception e) { if (log.isErrorEnabled()) { @@ -449,7 +453,8 @@ public class ReportUIHandler extends AdminTabUIHandler { } // calcul des données et contruction du tableau - model.getResultModel().populate(report, data); + //FIXME +// model.getResultModel().populate(report, data); // mise a jour du clipboard automatique si requis if (model.isAutoCopyToClipboard()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java index 8af99cd..23b99d5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java @@ -21,14 +21,13 @@ */ package fr.ird.observe.ui.admin.synchronize; -import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.services.dto.AbstractObserveDto; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaEntity; -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.util.List; import java.util.Map; @@ -56,7 +55,7 @@ public class ObsoleteEntityListCellRenderer extends DefaultListCellRenderer { boolean cellHasFocus) { Map.Entry<?, ?> entry = (Map.Entry<?, ?>) value; - TopiaEntity id = (TopiaEntity) entry.getKey(); + AbstractObserveDto id = (AbstractObserveDto) entry.getKey(); List<?> val = (List<?>) entry.getValue(); DecoratorService service = getDecoratorService(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java index 1cf07dd..6f43444 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.admin.synchronize; +import fr.ird.observe.services.dto.AbstractObserveDto; import org.nuiton.i18n.I18n; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityRef; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; @@ -44,12 +43,12 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { protected static final Class<?>[] COLUMN_CLASSES = { Boolean.class, - TopiaEntity.class + AbstractObserveDto.class }; private static final long serialVersionUID = 1L; - protected List<TopiaEntityRef> refs; +// protected List<TopiaEntityRef> refs; protected Set<Integer> selected; @@ -69,32 +68,36 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { return columnIndex == 0; } - public void initEntity(List<TopiaEntityRef> refs) { - // on nettoye toujours le model lors de l'init d'une entité - this.refs = refs; - selected.clear(); - // par defaut, on selectionne toutes les references - setSelectAll(true); - //fireTableDataChanged(); - } + //FIXME +// public void initEntity(List<TopiaEntityRef> refs) { +// // on nettoye toujours le model lors de l'init d'une entité +// this.refs = refs; +// selected.clear(); +// // par defaut, on selectionne toutes les references +// setSelectAll(true); +// //fireTableDataChanged(); +// } public List<Integer> getSelectedIndex() { return new ArrayList<Integer>(selected); } - public List<TopiaEntityRef> getSelectedRefs() { - List<TopiaEntityRef> result = new ArrayList<TopiaEntityRef>(); - if (!selected.isEmpty()) { - for (Integer i : selected) { - result.add(refs.get(i)); - } - } - return result; - } + //FIXME +// public List<TopiaEntityRef> getSelectedRefs() { +// List<TopiaEntityRef> result = new ArrayList<TopiaEntityRef>(); +// if (!selected.isEmpty()) { +// for (Integer i : selected) { +// result.add(refs.get(i)); +// } +// } +// return result; +// } @Override public int getRowCount() { - return refs == null ? 0 : refs.size(); + //FIXME +// return refs == null ? 0 : refs.size(); + return -1; } @Override @@ -108,7 +111,9 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { return selected.contains(rowIndex); } if (columnIndex == 1) { - return refs.get(rowIndex); + //FIXME +// return refs.get(rowIndex); + return null; } throw new IllegalStateException("can not get value for row " + rowIndex + ", col " + columnIndex); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java index edfa6c5..e8ed354 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java @@ -24,15 +24,6 @@ package fr.ird.observe.ui.admin.synchronize; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.DiffState; -import org.nuiton.topia.persistence.util.TopiaEntityRef; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; /** * Le modèle de l'opération de synchronization de réferentiel. @@ -43,16 +34,20 @@ import java.util.SortedMap; public class SynchronizeModel extends AdminActionModel { /** le dictionnaire des références sur du référentiel */ - protected SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs; + //FIXME +// protected SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs; /** le différentiel de référentiel */ - protected DiffState.DiffStateMap diff; + //FIXME +// protected DiffState.DiffStateMap diff; /** liste des actions utilisateurs */ - protected List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions; + //FIXME +// protected List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions; /** Universe of entities to update and with their topiaVersion to set. */ - protected Map<TopiaEntity, Long> versionsToUpdate; + //FIXME +// protected Map<TopiaEntity, Long> versionsToUpdate; /** data source we want to synchronize. */ protected DataSource source; @@ -67,43 +62,51 @@ public class SynchronizeModel extends AdminActionModel { super(AdminStep.SYNCHRONIZE); } - public SortedMap<TopiaEntity, List<TopiaEntityRef>> getObsoleteRefs() { - return obsoleteRefs; - } - - public void setObsoleteRefs(SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs) { - this.obsoleteRefs = obsoleteRefs; - } - - public DiffState.DiffStateMap getDiff() { - return diff; - } - - public void setDiff(DiffState.DiffStateMap diff) { - this.diff = diff; - } - - public List<SynchronizeUIHandler.ObsoleteRefReplaceAction> getReplaceActions() { - if (replaceActions == null) { - replaceActions = new ArrayList<SynchronizeUIHandler.ObsoleteRefReplaceAction>(); - } - return replaceActions; - } - - public void setReplaceActions(List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions) { - this.replaceActions = replaceActions; - } - - public Map<TopiaEntity, Long> getVersionsToUpdate() { - if (versionsToUpdate == null) { - versionsToUpdate = new HashMap<TopiaEntity, Long>(); - } - return versionsToUpdate; - } - - public void setVersionsToUpdate(Map<TopiaEntity, Long> versionsToUpdate) { - this.versionsToUpdate = versionsToUpdate; - } + //FIXME +// public SortedMap<TopiaEntity, List<TopiaEntityRef>> getObsoleteRefs() { +// return obsoleteRefs; +// } + + //FIXME +// public void setObsoleteRefs(SortedMap<TopiaEntity, List<TopiaEntityRef>> obsoleteRefs) { +// this.obsoleteRefs = obsoleteRefs; +// } + + //FIXME +// public DiffState.DiffStateMap getDiff() { +// return diff; +// } + + //FIXME +// public void setDiff(DiffState.DiffStateMap diff) { +// this.diff = diff; +// } + + //FIXME +// public List<SynchronizeUIHandler.ObsoleteRefReplaceAction> getReplaceActions() { +// if (replaceActions == null) { +// replaceActions = new ArrayList<SynchronizeUIHandler.ObsoleteRefReplaceAction>(); +// } +// return replaceActions; +// } + + //FIXME +// public void setReplaceActions(List<SynchronizeUIHandler.ObsoleteRefReplaceAction> replaceActions) { +// this.replaceActions = replaceActions; +// } + + //FIXME +// public Map<TopiaEntity, Long> getVersionsToUpdate() { +// if (versionsToUpdate == null) { +// versionsToUpdate = new HashMap<TopiaEntity, Long>(); +// } +// return versionsToUpdate; +// } + + //FIXME +// public void setVersionsToUpdate(Map<TopiaEntity, Long> versionsToUpdate) { +// this.versionsToUpdate = versionsToUpdate; +// } public DataSource getSource() { return source; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx index 51f5822..557ca32 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx @@ -30,8 +30,6 @@ fr.ird.observe.ui.admin.AdminUI fr.ird.observe.ui.admin.AdminStep - org.nuiton.topia.persistence.TopiaEntity - jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.wizard.ext.WizardState @@ -75,7 +73,8 @@ public void initUI(AdminUI ui) { public void destroy() { errorsSelectionModel.clearSelection(); errorsModel.removeAllElements(); - obsoleteTableModel.initEntity(null); + //FIXME + //obsoleteTableModel.initEntity(null); super.destroy(); } @@ -91,11 +90,11 @@ public void propertyChange(PropertyChangeEvent evt) { } protected void apply() { - getHandler().resolvObsoleteReferences( + /*getHandler().resolvObsoleteReferences( (TopiaEntity) obsoleteEntity, obsoleteTableModel.getSelectedRefs(), (TopiaEntity) getHandler().getSafeComboBox().getSelectedItem() - ); + );*/ } ]]> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index d73bb4c..1fa84f1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -121,11 +121,12 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { table, 0, UIHelper.newBooleanTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer( - table, 1, - UIHelper.newDecorateTableCellRenderer(renderer, - TopiaEntityRef.class) - ); + //FIXME +// UIHelper.setTableColumnRenderer( +// table, 1, +// UIHelper.newDecorateTableCellRenderer(renderer, +// TopiaEntityRef.class) +// ); UIHelper.setTableColumnEditor( table, 0, @@ -181,15 +182,15 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { sendMessage(t("observe.synchro.message.obsolete.entities.fixed", label)); - if (model.getObsoleteRefs().isEmpty()) { - sendMessage( - t("observe.synchro.message.all.obsolete.entities.fixed") - ); - } else { - //on recharge le dictionnaire des references - //FIXME + //FIXME +// if (model.getObsoleteRefs().isEmpty()) { +// sendMessage( +// t("observe.synchro.message.all.obsolete.entities.fixed") +// ); +// } else { +// //on recharge le dictionnaire des references // setObsoleteRefs(model.getObsoleteRefs()); - } +// } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java index 980ce13..baf70db 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -33,8 +33,6 @@ import java.beans.PropertyChangeListener; import java.util.HashMap; import java.util.Map; -import static org.nuiton.i18n.I18n.t; - public class ValidateEntityListCellRenderer extends DefaultListCellRenderer implements PropertyChangeListener { private static final long serialVersionUID = 1L; @@ -68,13 +66,15 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl } synchronized (renderCache) { renderCache.clear(); - if (model.getMessages() == null) { - return; - } - for (Class<?> klass : model.getMessageTypes()) { - String type = t(DecoratorService.getEntityLabel(klass)); - renderCache.put(klass, type); - } + //FIXME +// if (model.getMessages() == null) { +// return; +// } + //FIXME +// for (Class<?> klass : model.getMessageTypes()) { +// String type = t(DecoratorService.getEntityLabel(klass)); +// renderCache.put(klass, type); +// } } } 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 e540928..497decf 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 @@ -25,7 +25,6 @@ import com.google.common.base.Charsets; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.business.ObserveServiceHelper; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.validation.ValidationContext; import fr.ird.observe.business.validation.ValidationMessageDetector; import fr.ird.observe.business.validation.ValidationModelMode; @@ -51,7 +50,6 @@ import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import org.nuiton.validator.bean.simple.SimpleBeanValidators; import javax.swing.*; import java.beans.PropertyChangeEvent; @@ -60,11 +58,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Date; -import java.util.EnumSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.SortedMap; import java.util.concurrent.Callable; import static org.nuiton.i18n.I18n.t; @@ -134,24 +129,28 @@ public class ValidateUIHandler extends AdminTabUIHandler { // rien a faire pour le moment... return; } - DataSelectionModel selectDataModel; - selectDataModel = selectTabUI.getSelectDataModel(); + //FIXME +// DataSelectionModel selectDataModel; +// selectDataModel = selectTabUI.getSelectDataModel(); if (log.isDebugEnabled()) { log.debug("validation model changed to " + value); } switch (value) { case REFERENTIEL: - selectDataModel.setUseData(false); - selectDataModel.setUseReferentiel(true); + //FIXME +// selectDataModel.setUseData(false); +// selectDataModel.setUseReferentiel(true); break; case DATA: - selectDataModel.setUseData(true); - selectDataModel.setUseReferentiel(false); + //FIXME +// selectDataModel.setUseData(true); +// selectDataModel.setUseReferentiel(false); break; case ALL: - selectDataModel.setUseData(true); - selectDataModel.setUseReferentiel(true); + //FIXME +// selectDataModel.setUseData(true); +// selectDataModel.setUseReferentiel(true); break; } //updateModel(); @@ -215,11 +214,12 @@ public class ValidateUIHandler extends AdminTabUIHandler { DefaultListModel typeModel = tabUI.typeModel; tabUI.typeSelectionModel.clearSelection(); typeModel.clear(); - Class<?>[] classes = tabUI.getStepModel().getMessageTypes(); - classes = getDecoratorService().sortTypes(classes); - for (Class<?> e : classes) { - typeModel.addElement(e); - } + //FIXME +// Class<?>[] classes = tabUI.getStepModel().getMessageTypes(); +// classes = getDecoratorService().sortTypes(classes); +// for (Class<?> e : classes) { +// typeModel.addElement(e); +// } tabUI.typeList.setSelectedIndex(0); } @@ -611,7 +611,9 @@ public class ValidateUIHandler extends AdminTabUIHandler { if (!valid) { return t("observe.common.storage.not.valid"); } else { - return model.getCentralSourceModel().getPgConfig().getPolicyLabel(); + //FIXME +// return model.getCentralSourceModel().getPgConfig().getPolicyLabel(); + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css index e9f939a..f3e4867 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css @@ -47,7 +47,7 @@ BeanComboBox { } #comment2 { - _propertyName: {CommentableEntity.PROPERTY_COMMENT}; + _propertyName: {CommentableDto.PROPERTY_COMMENT}; text:{getStringValue(bean.getComment())}; } 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 c130a47..90dfd90 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 @@ -21,7 +21,7 @@ --> <org.jdesktop.swingx.JXTitledPanel - abstract='true' genericType='E extends TopiaEntity' implements="fr.ird.observe.ui.content.ObserveContentUI<E>" + abstract='true' genericType='E extends AbstractObserveDto' implements="fr.ird.observe.ui.content.ObserveContentUI<E>" title='{getHandler().updateTitle(getContentTitle())}' contentContainer='{contentContainer}' leftDecoration='{titleLeft}' @@ -34,9 +34,8 @@ _UPDATETip='t("observe.content.mode.update.tip")'> <import> - fr.ird.observe.db.DataContext - fr.ird.observe.DataService - fr.ird.observe.db.DataSource + fr.ird.observe.business.db.DataContext + fr.ird.observe.business.db.DataSource fr.ird.observe.ObserveConfig fr.ird.observe.ObserveContext fr.ird.observe.ui.actions.shared.GoUpUIAction @@ -61,8 +60,9 @@ <SwingValidatorMessageTableModel id='errorTableModel' initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> - <DataService id='dataService' - initializer='getContextValue(DataService.class)'/> + <!--FIXME--> + <!--<DataService id='dataService'--> + <!--initializer='getContextValue(DataService.class)'/>--> <DataSource id='dataSource' initializer='ObserveContext.get().getDataSource()'/> 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 5e5849d..403dac5 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 @@ -30,6 +30,7 @@ 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.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; @@ -607,7 +608,7 @@ public abstract class ContentUIHandler<E extends AbstractObserveDto> { protected void afterDelete() { ui.stopEdit(); removeAllMessages(ui); - if (!(getBean() instanceof ReferenceEntity)) { + if (!(getBean() instanceof ReferentialDto)) { ObserveTreeHelper treeHelper = getTreeHelper(ui); ObserveNode node = treeHelper.getSelectedNode(); @@ -616,22 +617,21 @@ public abstract class ContentUIHandler<E extends AbstractObserveDto> { } } - //FIXME -// public void gotoChild(TopiaEntity entity) { -// if (entity == null) { -// -// // rien a faire -// return; -// } -// ObserveTreeHelper treeHelper = getTreeHelper(ui); -// ObserveNode parentNode = treeHelper.getSelectedNode(); -// String id = entity.getTopiaId(); -// ObserveNode node = treeHelper.findNode(parentNode, id); -// if (log.isInfoEnabled()) { -// log.info("will go to node " + node + " for " + id); -// } -// treeHelper.selectNode(node); -// } + public void gotoChild(IdDto entity) { + if (entity == null) { + + // rien a faire + return; + } + ObserveTreeHelper treeHelper = getTreeHelper(ui); + ObserveNode parentNode = treeHelper.getSelectedNode(); + String id = entity.getId(); + ObserveNode node = treeHelper.findNode(parentNode, id); + if (log.isInfoEnabled()) { + log.info("will go to node " + node + " for " + id); + } + treeHelper.selectNode(node); + } public void addChild(Class<?> type) { ObserveTreeHelper treeHelper = getTreeHelper(ui); 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 d7f6968..6ff5652 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 @@ -25,6 +25,41 @@ import fr.ird.observe.services.dto.constants.*; import fr.ird.observe.services.dto.longline.*; import fr.ird.observe.services.dto.referential.*; import fr.ird.observe.services.dto.seine.*; +import fr.ird.observe.ui.ObserveMainUI; +import fr.ird.observe.ui.content.impl.longline.LonglineDetailCompositionUI; +import fr.ird.observe.ui.content.impl.longline.LonglineGlobalCompositionUI; +import fr.ird.observe.ui.content.impl.longline.SetLonglineUI; +import fr.ird.observe.ui.content.impl.seine.ActivitySeineObservedSystemUI; +import fr.ird.observe.ui.content.impl.seine.FloatingObjectTransmittingBuoyOperationUI; +import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; +import fr.ird.observe.ui.content.impl.seine.SetSeineUI; +import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; +import fr.ird.observe.ui.content.list.impl.longline.TripLonglinesUI; +import fr.ird.observe.ui.content.list.impl.seine.ActivitySeinesUI; +import fr.ird.observe.ui.content.list.impl.seine.RoutesUI; +import fr.ird.observe.ui.content.list.impl.seine.TripSeinesUI; +import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; +import fr.ird.observe.ui.content.open.impl.longline.TripLonglineUI; +import fr.ird.observe.ui.content.open.impl.seine.ActivitySeineUI; +import fr.ird.observe.ui.content.open.impl.seine.RouteUI; +import fr.ird.observe.ui.content.open.impl.seine.TripSeineUI; +import fr.ird.observe.ui.content.ref.ContentReferenceUI; +import fr.ird.observe.ui.content.ref.ReferenceHomeUI; +import fr.ird.observe.ui.content.table.impl.longline.CatchLonglineUI; +import fr.ird.observe.ui.content.table.impl.longline.EncounterUI; +import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUI; +import fr.ird.observe.ui.content.table.impl.longline.SensorUsedUI; +import fr.ird.observe.ui.content.table.impl.longline.TdrUI; +import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; +import fr.ird.observe.ui.content.table.impl.seine.NonTargetCatchUI; +import fr.ird.observe.ui.content.table.impl.seine.NonTargetSampleUI; +import fr.ird.observe.ui.content.table.impl.seine.ObjectObservedSpeciesUI; +import fr.ird.observe.ui.content.table.impl.seine.ObjectSchoolEstimateUI; +import fr.ird.observe.ui.content.table.impl.seine.SchoolEstimateUI; +import fr.ird.observe.ui.content.table.impl.seine.TargetCatchUI; +import fr.ird.observe.ui.content.table.impl.seine.TargetDiscardCatchUI; +import fr.ird.observe.ui.content.table.impl.seine.TargetSampleCaptureUI; +import fr.ird.observe.ui.content.table.impl.seine.TargetSampleRejeteUI; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css index e9746f0..42f8916 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css @@ -33,7 +33,7 @@ } #comment2 { - _tablePropertyName: {Branchline.PROPERTY_COMMENT}; + _tablePropertyName: {BranchlineDto.PROPERTY_COMMENT}; text:{getStringValue(bean.getComment())}; } @@ -49,7 +49,7 @@ #depthRecorder { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.depthRecorder"; - _propertyName:{Branchline.PROPERTY_DEPTH_RECORDER}; + _propertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; selected:{BooleanUtils.isTrue(bean.getDepthRecorder())}; _validatorLabel:{t("observe.branchline.depthRecorder")}; } @@ -57,7 +57,7 @@ #hookLost { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.hookLost"; - _propertyName:{Branchline.PROPERTY_HOOK_LOST}; + _propertyName:{BranchlineDto.PROPERTY_HOOK_LOST}; selected:{BooleanUtils.isTrue(bean.getHookLost())}; _validatorLabel:{t("observe.branchline.hookLost")}; } @@ -65,7 +65,7 @@ #traceCutOff { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.traceCutOff"; - _propertyName:{Branchline.PROPERTY_TRACE_CUT_OFF}; + _propertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF}; selected:{BooleanUtils.isTrue(bean.getTraceCutOff())}; _validatorLabel:{t("observe.branchline.traceCutOff")}; } @@ -73,7 +73,7 @@ #timer { text:"observe.branchline.timer"; horizontalTextPosition:{JCheckBox.LEFT}; - _propertyName:{Branchline.PROPERTY_TIMER}; + _propertyName:{BranchlineDto.PROPERTY_TIMER}; selected:{BooleanUtils.isTrue(bean.getTimer())}; _validatorLabel:{t("observe.branchline.timer")}; } @@ -85,7 +85,7 @@ #timeSinceContact { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - property:{Branchline.PROPERTY_TIME_SINCE_CONTACT}; + property:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; model:{bean.getTimeSinceContact()}; numberPattern:{fr.ird.observe.ui.UIHelper.LONG_10_DIGITS_PATTERN}; _validatorLabel:{t("observe.branchline.timeSinceContact")}; @@ -100,9 +100,11 @@ enabled:{BooleanUtils.isTrue(bean.getTimer())}; label:{t("observe.branchline.timerTimeOnBoard")}; date:{bean.getTimerTimeOnBoard()}; - propertyDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD}; - propertyDayDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; - propertyTimeDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; + propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; + //FIXME + //propertyDayDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; + //FIXME + //propertyTimeDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; _validatorLabel:{t("observe.branchline.timerTimeOnBoard")}; } @@ -112,7 +114,7 @@ } #topType { - property:{Branchline.PROPERTY_TOP_TYPE}; + property:{BranchlineDto.PROPERTY_TOP_TYPE}; selectedItem:{bean.getTopType()}; _validatorLabel:{t("observe.branchline.topType")}; } @@ -123,7 +125,7 @@ } #tracelineType { - property:{Branchline.PROPERTY_TRACELINE_TYPE}; + property:{BranchlineDto.PROPERTY_TRACELINE_TYPE}; selectedItem:{bean.getTracelineType()}; _validatorLabel:{t("observe.branchline.tracelineType")}; } @@ -131,7 +133,7 @@ #weightedSwivel { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.weightedSwivel"; - _propertyName:{Branchline.PROPERTY_WEIGHTED_SWIVEL}; + _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SWIVEL}; selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; _validatorLabel:{t("observe.branchline.weightedSwivel")}; } @@ -143,7 +145,7 @@ #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{Branchline.PROPERTY_SWIVEL_WEIGHT}; + property:{BranchlineDto.PROPERTY_SWIVEL_WEIGHT}; model:{bean.getSwivelWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.branchline.swivelWeight")}; @@ -152,7 +154,7 @@ #weightedSnap { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.weightedSnap"; - _propertyName:{Branchline.PROPERTY_WEIGHTED_SNAP}; + _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SNAP}; selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; _validatorLabel:{t("observe.branchline.weightedSnap")}; } @@ -164,7 +166,7 @@ #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{Branchline.PROPERTY_SNAP_WEIGHT}; + property:{BranchlineDto.PROPERTY_SNAP_WEIGHT}; model:{bean.getSnapWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.branchline.snapWeight")}; @@ -196,7 +198,7 @@ } #hookSize { - property:{Branchline.PROPERTY_HOOK_SIZE}; + property:{BranchlineDto.PROPERTY_HOOK_SIZE}; selectedItem:{bean.getHookSize()}; _validatorLabel:{t("observe.branchline.hookSize")}; } @@ -207,7 +209,7 @@ } #hookOffset { - property:{Branchline.PROPERTY_HOOK_OFFSET}; + property:{BranchlineDto.PROPERTY_HOOK_OFFSET}; model:{bean.getHookOffset()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.branchline.hookOffset")}; @@ -219,7 +221,7 @@ } #baitSettingStatus { - property:{Branchline.PROPERTY_BAIT_SETTING_STATUS}; + property:{BranchlineDto.PROPERTY_BAIT_SETTING_STATUS}; selectedItem:{bean.getBaitSettingStatus()}; _validatorLabel:{t("observe.branchline.baitSettingStatus")}; } @@ -230,7 +232,7 @@ } #baitHaulingStatus { - property:{Branchline.PROPERTY_BAIT_HAULING_STATUS}; + property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS}; selectedItem:{bean.getBaitHaulingStatus()}; _validatorLabel:{t("observe.branchline.baitHaulingStatus")}; } @@ -241,7 +243,7 @@ } #baitType { - property:{Branchline.PROPERTY_BAIT_TYPE}; + property:{BranchlineDto.PROPERTY_BAIT_TYPE}; selectedItem:{bean.getBaitType()}; _validatorLabel:{t("observe.branchline.baitType")}; } 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 e9b0abe..cd024cf 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 @@ -203,8 +203,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { BranchlineUI.BINDING_BAIT_SETTING_STATUS_SELECTED_ITEM, BranchlineUI.BINDING_BAIT_HAULING_STATUS_SELECTED_ITEM, - BranchlineUI.BINDING_HOOK_TYPE_SELECTED_ITEM, - BranchlineUI.BINDING_HOOK_SIZE_SELECTED_ITEM, + //FIXME +// BranchlineUI.BINDING_HOOK_TYPE_SELECTED_ITEM, +// BranchlineUI.BINDING_HOOK_SIZE_SELECTED_ITEM, BranchlineUI.BINDING_HOOK_OFFSET_MODEL, BranchlineUI.BINDING_TIMER_SELECTED, 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 3253d6e..c4fd323 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 @@ -94,7 +94,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void tableChanged(TableModelEvent e) { SectionsTableModel source = (SectionsTableModel) e.getSource(); - onSectionsTableModelChanged(source.getData()); + //FIXME +// onSectionsTableModelChanged(source.getData()); } }; @@ -237,8 +238,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong basketAdjusting = true; try { - BasketDto previousValue = (Basket) evt.getOldValue(); - BasketDto newValue = (Basket) evt.getNewValue(); + BasketDto previousValue = (BasketDto) evt.getOldValue(); + BasketDto newValue = (BasketDto) evt.getNewValue(); onSelectedBasketChanged(previousValue, newValue); } finally { @@ -418,7 +419,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong // getModel().setCanGenerate(bean.isSectionEmpty()); // TODO Use a cache of templates on setLongline (session scope) - getSectionTemplatesTableModel().setData(Collections.<SectionTemplate>emptyList()); + //FIXME +// getSectionTemplatesTableModel().setData(Collections.<SectionTemplate>emptyList()); BranchlineUI branchlineDetailUI = getUi().getBranchlineDetailUI(); branchlineDetailUI.edit(null); @@ -826,11 +828,12 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong if (!selectionEmpty) { - SectionTemplate data = getSectionTemplatesTableModel().getSelectedRow(); - - if (log.isInfoEnabled()) { - log.info("Delete: " + data); - } + //FIXME +// SectionTemplate data = getSectionTemplatesTableModel().getSelectedRow(); +// +// if (log.isInfoEnabled()) { +// log.info("Delete: " + data); +// } ObserveMainUI mainUI = ObserveContext.get().getObserveMainUI(); int response = UIHelper.askUser(mainUI, @@ -961,7 +964,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - boolean accept = UIHelper.confirmForEntityDelete(ui, Basket.class, selectedBasket); + boolean accept = UIHelper.confirmForEntityDelete(ui, BasketDto.class, selectedBasket); ObserveMainUI mainUI = ObserveContext.get().getObserveMainUI(); mainUI.setBusy(false); @@ -978,7 +981,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong try { - getSectionsTableModel().getSelectedRow().removeBasket(selectedBasket); + //FIXME +// getSectionsTableModel().getSelectedRow().removeBasket(selectedBasket); tableModel.removeSelectedRow(); } finally { @@ -1037,7 +1041,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong // if (selectedSection.isBasketEmpty()) { // selectedSection.setBasket(new ArrayList<Basket>()); // } - getSectionsTableModel().getSelectedRow().getBasket().add(selectedRowIndex, newBasket); +// getSectionsTableModel().getSelectedRow().getBasket().add(selectedRowIndex, newBasket); } finally { @@ -1068,7 +1072,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - boolean accept = UIHelper.confirmForEntityDelete(ui, Branchline.class, selectedBranchline); + boolean accept = UIHelper.confirmForEntityDelete(ui, BranchlineDto.class, selectedBranchline); ObserveMainUI mainUI = ObserveContext.get().getObserveMainUI(); mainUI.setBusy(false); if (!accept) { @@ -1114,7 +1118,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong if (selectedBasket.isBranchlineEmpty()) { selectedBasket.setBranchline(new LinkedHashSet<BranchlineDto>()); } - selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); + //FIXME +// selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); } finally { @@ -1140,7 +1145,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong if (selectedBasket.isBranchlineEmpty()) { selectedBasket.setBranchline(new LinkedHashSet<BranchlineDto>()); } - selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); + //FIXME +// selectedBasket.getBranchline().add(selectedRowIndex, newBranchline); } finally { @@ -1213,11 +1219,12 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - List<BasketDto> baskets = newSection == null ? null : newSection.getBasket(); - if (baskets == null) { - baskets = Collections.emptyList(); - } - getBasketsTableModel().setData(baskets); + //FIXME +// List<BasketDto> baskets = newSection == null ? null : newSection.getBasket(); +// if (baskets == null) { +// baskets = Collections.emptyList(); +// } +// getBasketsTableModel().setData(baskets); } finally { @@ -1287,7 +1294,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } List<BranchlineDto> branchlines = new ArrayList<>(); - if (newBasket =! null && newBasket.getBranchline() != null) { + if (newBasket != null && newBasket.getBranchline() != null) { branchlines.addAll(newBasket.getBranchline()); } getBranchlinesTableModel().setData(branchlines); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java index 3d6bf7e..600924d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java @@ -102,15 +102,15 @@ public class LonglineDetailCompositionUIValidationHelper { if (log.isInfoEnabled()) { log.info("Rebuild messages, section model changes."); } - - List<SectionWithTemplate> notEmptyData = model.getSectionsTableModel().getNotEmptyData(); - List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); - - removeOldMessages(); - - errorTableModel.addMessages(messages); - - model.setCompositionTabValid(messages.isEmpty()); +//FIXME +// List<SectionWithTemplate> notEmptyData = model.getSectionsTableModel().getNotEmptyData(); +// List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); +// +// removeOldMessages(); +// +// errorTableModel.addMessages(messages); +// +// model.setCompositionTabValid(messages.isEmpty()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css index 4897832..20825f8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css @@ -53,8 +53,10 @@ #mitigationType { bean:{bean}; - property: {SetLongline.PROPERTY_MITIGATION_TYPE}; - selected:{bean.getMitigationType()}; + //FIXME + //property: {SetLonglineDto.PROPERTY_MITIGATION_TYPE}; + //FIXME + //selected:{bean.getMitigationType()}; _validatorLabel: {t("observe.longlineGlobalComposition.mitigationType")}; showListLabel: true; universeLabel:{t("observe.longlineGlobalComposition.availableMitigationType")}; 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 d57d350..ff2e4c1 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 @@ -29,6 +29,10 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; +import fr.ird.observe.ui.content.table.impl.longline.BaitsCompositionUI; +import fr.ird.observe.ui.content.table.impl.longline.BranchlinesCompositionUI; +import fr.ird.observe.ui.content.table.impl.longline.FloatlinesCompositionUI; +import fr.ird.observe.ui.content.table.impl.longline.HooksCompositionUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java index fe69c21..6a91680 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java @@ -22,9 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SectionTemplateDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.util.table.EditableTableModelSupport; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +37,7 @@ import java.util.Set; * @since 3.10 */ //FIXME -public class SectionTemplatesTableModel extends EditableTableModelSupport<SectionTemplate> { +public class SectionTemplatesTableModel extends EditableTableModelSupport<IdDto> {//FIXME <SectionTemplate> { private static final long serialVersionUID = 1L; @@ -50,20 +49,24 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio } @Override - public boolean isRowNotEmpty(SectionTemplate row) { - return !(StringUtils.isBlank(row.getId()) && StringUtils.isBlank(row.getFloatlineLengths())); + public boolean isRowNotEmpty(IdDto row) { + //FIXME +// return !(StringUtils.isBlank(row.getId()) && StringUtils.isBlank(row.getFloatlineLengths())); + return false; } @Override - public boolean isRowValid(SectionTemplate row) { - return StringUtils.isNotBlank(row.getId()) && - StringUtils.isNotBlank(row.getFloatlineLengths()) && - row.isFloatlineLengthsValid(); + public boolean isRowValid(IdDto row) { + //FIXME +// return StringUtils.isNotBlank(row.getId()) && +// StringUtils.isNotBlank(row.getFloatlineLengths()) && +// row.isFloatlineLengthsValid(); + return false; } @Override - protected SectionTemplate createNewRow() { - return new SectionTemplate(); + protected IdDto createNewRow() { + return null; } @Override @@ -74,48 +77,51 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio @Override public Object getValueAt(int rowIndex, int columnIndex) { - SectionTemplate measure = data.get(rowIndex); - Object result; - - switch (columnIndex) { - case 0: - - result = measure.getId(); - break; - - case 1: - - result = measure.getFloatlineLengths(); - break; - - default: - throw new IllegalStateException("Can't come here"); - } - - return result; - + //FIXME +// SectionTemplate measure = data.get(rowIndex); +// Object result; +// +// switch (columnIndex) { +// case 0: +// +// result = measure.getId(); +// break; +// +// case 1: +// +// result = measure.getFloatlineLengths(); +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } +// +// return result; + + return null; } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - SectionTemplate measure = data.get(rowIndex); - - switch (columnIndex) { - case 0: - - measure.setId((String) aValue); - break; - - case 1: - - measure.setFloatlineLengths((String) aValue); - break; - - default: - throw new IllegalStateException("Can't come here"); - } - + //FIXME +// SectionTemplate measure = data.get(rowIndex); +// +// switch (columnIndex) { +// case 0: +// +// measure.setId((String) aValue); +// break; +// +// case 1: +// +// measure.setFloatlineLengths((String) aValue); +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } +// setModified(true); } @@ -128,19 +134,20 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio // check that we are using unique ids Set<String> ids = new HashSet<String>(); - for (SectionTemplate sectionTemplate : data) { - - boolean add = ids.add(sectionTemplate.getId()); - if (!add) { - - if (log.isWarnEnabled()) { - log.warn("Template identifiants (" + sectionTemplate.getId() + ") are not unique."); - } - newValidState = false; - break; - } - - } + //FIXME +// for (SectionTemplate sectionTemplate : data) { +// +// boolean add = ids.add(sectionTemplate.getId()); +// if (!add) { +// +// if (log.isWarnEnabled()) { +// log.warn("Template identifiants (" + sectionTemplate.getId() + ") are not unique."); +// } +// newValidState = false; +// break; +// } +// +// } } return newValidState; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java index c0164cd..f9c9600 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ +import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,7 +33,7 @@ import org.apache.commons.logging.LogFactory; * @since 3.10 */ //FIXME -public class SectionsTableModel extends LonglineCompositionTableModelSupport<SectionWithTemplate> { +public class SectionsTableModel extends LonglineCompositionTableModelSupport<IdDto> {//FIXME <SectionWithTemplate> { public static final String TEMPLATE_PROPERTY = "template"; @@ -46,8 +47,12 @@ public class SectionsTableModel extends LonglineCompositionTableModelSupport<Sec } @Override - protected SectionWithTemplate createNewRow() { - return new SectionWithTemplateImpl(); + //FIXME +// protected SectionWithTemplate createNewRow() { +// return new SectionWithTemplateImpl(); +// } + protected IdDto createNewRow() { + return null; } @Override @@ -92,91 +97,91 @@ public class SectionsTableModel extends LonglineCompositionTableModelSupport<Sec @Override public Object getValueAt(int rowIndex, int columnIndex) { - SectionWithTemplate row = data.get(rowIndex); - Object result; - - switch (columnIndex) { - case 0: - - result = row.getSettingIdentifier(); - break; - - case 1: - - result = row.getHaulingIdentifier(); - break; - - case 2: - - result = row.getSectionTemplate(); - break; - - default: - throw new IllegalStateException("Can't come here"); - } - - return result; - + //FIXME +// SectionWithTemplate row = data.get(rowIndex); +// Object result; +// +// switch (columnIndex) { +// case 0: +// +// result = row.getSettingIdentifier(); +// break; +// +// case 1: +// +// result = row.getHaulingIdentifier(); +// break; +// +// case 2: +// +// result = row.getSectionTemplate(); +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } +// +// return result; +return null; } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - - SectionWithTemplate row = data.get(rowIndex); - - switch (columnIndex) { - case 0: - - row.setSettingIdentifier((Integer) aValue); - setModified(true); - break; - - case 1: - - row.setHaulingIdentifier((Integer) aValue); - setModified(true); - break; - - case 2: - - SectionTemplate sectionTemplate = (SectionTemplate) aValue; - - boolean changeTemplate = true; - - if (sectionTemplate != null) { - - // check if can use this template - int basketsCount = row.sizeBasket(); - boolean compiliantWithBasketCount = sectionTemplate.isCompiliantWithBasketCount(basketsCount); - - if (!compiliantWithBasketCount) { - - // We can't use this value - if (log.isWarnEnabled()) { - log.warn("sectionTemplate " + sectionTemplate + " is not compliant with basketCount: " + basketsCount); - } - //TODO Send user a message - - changeTemplate = false; - - } - - } - - if (changeTemplate) { - - SectionTemplate previousSectionTemplate = row.getSectionTemplate(); - row.setSectionTemplate(sectionTemplate); - firePropertyChange(TEMPLATE_PROPERTY, previousSectionTemplate, sectionTemplate); - - } - - break; - - default: - throw new IllegalStateException("Can't come here"); - } - +//FIXME +// SectionWithTemplate row = data.get(rowIndex); +// +// switch (columnIndex) { +// case 0: +// +// row.setSettingIdentifier((Integer) aValue); +// setModified(true); +// break; +// +// case 1: +// +// row.setHaulingIdentifier((Integer) aValue); +// setModified(true); +// break; +// +// case 2: +// +// SectionTemplate sectionTemplate = (SectionTemplate) aValue; +// +// boolean changeTemplate = true; +// +// if (sectionTemplate != null) { +// +// // check if can use this template +// int basketsCount = row.sizeBasket(); +// boolean compiliantWithBasketCount = sectionTemplate.isCompiliantWithBasketCount(basketsCount); +// +// if (!compiliantWithBasketCount) { +// +// // We can't use this value +// if (log.isWarnEnabled()) { +// log.warn("sectionTemplate " + sectionTemplate + " is not compliant with basketCount: " + basketsCount); +// } +// //TODO Send user a message +// +// changeTemplate = false; +// +// } +// +// } +// +// if (changeTemplate) { +// +// SectionTemplate previousSectionTemplate = row.getSectionTemplate(); +// row.setSectionTemplate(sectionTemplate); +// firePropertyChange(TEMPLATE_PROPERTY, previousSectionTemplate, sectionTemplate); +// +// } +// +// break; +// +// default: +// throw new IllegalStateException("Can't come here"); +// } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css index 79ffc52..fb9033f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css @@ -43,12 +43,12 @@ #homeId { text: {getStringValue(bean.getHomeId())}; - _propertyName: {SetLongline.PROPERTY_HOME_ID}; + _propertyName: {SetLonglineDto.PROPERTY_HOME_ID}; _validatorLabel:{t("observe.setLongline.homeId")}; } #resetHomeId { - _resetPropertyName: {SetLongline.PROPERTY_HOME_ID}; + _resetPropertyName: {SetLonglineDto.PROPERTY_HOME_ID}; toolTipText:"observe.setLongline.action.reset.homeId.tip"; } @@ -58,7 +58,7 @@ } #number { - property: {SetLongline.PROPERTY_NUMBER}; + property: {SetLonglineDto.PROPERTY_NUMBER}; model:{bean.getNumber()}; useFloat:false; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; @@ -68,9 +68,9 @@ #settingStartTimeStamp { label:{t("observe.setLongline.settingStartTimeStamp")}; date:{bean.getSettingStartTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_SETTING_START_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_SETTING_START_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_SETTING_START_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_START_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME}; _validatorLabel:{t("observe.setLongline.settingStartTimeStamp")}; } @@ -79,21 +79,21 @@ } #settingStartCoordinates { - propertyLatitude:{SetLongline.PROPERTY_SETTING_START_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_SETTING_START_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_SETTING_START_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_SETTING_START_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_SETTING_START_QUADRANT};*/ latitude:{bean.getSettingStartLatitude()}; longitude:{bean.getSettingStartLongitude()}; - quadrant:{bean.getSettingStartQuadrant()}; + //quadrant:{bean.getSettingStartQuadrant()}; _validatorLabel:{t("observe.setLongline.settingStartCoordinates")}; } #settingEndTimeStamp { label:{t("observe.setLongline.settingEndTimeStamp")}; date:{bean.getSettingEndTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_SETTING_END_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_SETTING_END_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_SETTING_END_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_END_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME}; _validatorLabel:{t("observe.setLongline.settingEndTimeStamp")}; } @@ -102,12 +102,12 @@ } #settingEndCoordinates { - propertyLatitude:{SetLongline.PROPERTY_SETTING_END_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_SETTING_END_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_SETTING_END_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_SETTING_END_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_SETTING_END_QUADRANT};*/ latitude:{bean.getSettingEndLatitude()}; longitude:{bean.getSettingEndLongitude()}; - quadrant:{bean.getSettingEndQuadrant()}; + //quadrant:{bean.getSettingEndQuadrant()}; _validatorLabel:{t("observe.setLongline.settingEndCoordinates")}; } @@ -126,7 +126,7 @@ } #settingVesselSpeed { - property:{SetLongline.PROPERTY_SETTING_VESSEL_SPEED}; + property:{SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED}; model:{bean.getSettingVesselSpeed()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.settingVesselSpeed")}; @@ -135,7 +135,7 @@ #shooterUsed { text:"observe.setLongline.shooterUsed"; horizontalTextPosition:{JCheckBox.LEFT}; - _propertyName:{SetLongline.PROPERTY_SHOOTER_USED}; + _propertyName:{SetLonglineDto.PROPERTY_SHOOTER_USED}; selected:{BooleanUtils.isTrue(bean.getShooterUsed())}; } @@ -146,7 +146,7 @@ #shooterSpeed { enabled:{BooleanUtils.isTrue(bean.getShooterUsed())}; - property:{SetLongline.PROPERTY_SHOOTER_SPEED}; + property:{SetLonglineDto.PROPERTY_SHOOTER_SPEED}; model:{bean.getShooterSpeed()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.shooterSpeed")}; @@ -158,7 +158,7 @@ } #settingShape { - property:{SetLongline.PROPERTY_SETTING_SHAPE}; + property:{SetLonglineDto.PROPERTY_SETTING_SHAPE}; selectedItem:{bean.getSettingShape()}; _validatorLabel:{t("observe.setLongline.settingShape")}; } @@ -166,7 +166,7 @@ #weightedSwivel { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.setLongline.weightedSwivel"; - _propertyName:{SetLongline.PROPERTY_WEIGHTED_SWIVEL}; + _propertyName:{SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL}; selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; _validatorLabel:{t("observe.setLongline.weightedSwivel")}; } @@ -178,7 +178,7 @@ #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{SetLongline.PROPERTY_SWIVEL_WEIGHT}; + property:{SetLonglineDto.PROPERTY_SWIVEL_WEIGHT}; model:{bean.getSwivelWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.swivelWeight")}; @@ -187,7 +187,7 @@ #weightedSnap { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.setLongline.weightedSnap"; - _propertyName:{SetLongline.PROPERTY_WEIGHTED_SNAP}; + _propertyName:{SetLonglineDto.PROPERTY_WEIGHTED_SNAP}; selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; _validatorLabel:{t("observe.setLongline.weightedSnap")}; } @@ -199,7 +199,7 @@ #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{SetLongline.PROPERTY_SNAP_WEIGHT}; + property:{SetLonglineDto.PROPERTY_SNAP_WEIGHT}; model:{bean.getSnapWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.setLongline.snapWeight")}; @@ -211,7 +211,7 @@ } #lineType { - property:{SetLongline.PROPERTY_LINE_TYPE}; + property:{SetLonglineDto.PROPERTY_LINE_TYPE}; selectedItem:{bean.getLineType()}; _validatorLabel:{t("observe.setLongline.lineType")}; } @@ -222,7 +222,7 @@ } #maxDepthTargeted { - property:{SetLongline.PROPERTY_MAX_DEPTH_TARGETED}; + property:{SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED}; model:{bean.getMaxDepthTargeted()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.maxDepthTargeted")}; @@ -231,7 +231,7 @@ #monitored { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.setLongline.monitored"; - _propertyName:{SetLongline.PROPERTY_MONITORED}; + _propertyName:{SetLonglineDto.PROPERTY_MONITORED}; selected:{BooleanUtils.isTrue(bean.getMonitored())}; _validatorLabel:{t("observe.setLongline.monitored")}; } @@ -242,7 +242,7 @@ } #lightsticksType { - property:{SetLongline.PROPERTY_LIGHTSTICKS_TYPE}; + property:{SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE}; selectedItem:{bean.getLightsticksType()}; _validatorLabel:{t("observe.setLongline.lightsticksType")}; } @@ -253,7 +253,7 @@ } #lightsticksColor { - property:{SetLongline.PROPERTY_LIGHTSTICKS_COLOR}; + property:{SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR}; selectedItem:{bean.getLightsticksColor()}; _validatorLabel:{t("observe.setLongline.lightsticksColor")}; } @@ -264,7 +264,7 @@ } #timeBetweenHooks { - property:{SetLongline.PROPERTY_TIME_BETWEEN_HOOKS}; + property:{SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS}; model:{bean.getTimeBetweenHooks()}; modelType:{Long.class}; numberPattern:{fr.ird.observe.ui.UIHelper.LONG_10_DIGITS_PATTERN}; @@ -277,7 +277,7 @@ } #lightsticksPerBasketCount { - property:{SetLongline.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; + property:{SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; model:{bean.getLightsticksPerBasketCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.lightsticksPerBasketCount")}; @@ -289,7 +289,7 @@ } #basketsPerSectionCount { - property:{SetLongline.PROPERTY_BASKETS_PER_SECTION_COUNT}; + property:{SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT}; model:{bean.getBasketsPerSectionCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.basketsPerSectionCount")}; @@ -301,7 +301,7 @@ } #totalBasketsCount { - property:{SetLongline.PROPERTY_TOTAL_BASKETS_COUNT}; + property:{SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT}; model:{bean.getTotalBasketsCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.totalBasketsCount")}; @@ -313,7 +313,7 @@ } #branchlinesPerBasketCount { - property:{SetLongline.PROPERTY_BRANCHLINES_PER_BASKET_COUNT}; + property:{SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT}; model:{bean.getBranchlinesPerBasketCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.branchlinesPerBasketCount")}; @@ -325,7 +325,7 @@ } #totalSectionsCount { - property:{SetLongline.PROPERTY_TOTAL_SECTIONS_COUNT}; + property:{SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT}; model:{bean.getTotalSectionsCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.totalSectionsCount")}; @@ -337,7 +337,7 @@ } #totalHooksCount { - property:{SetLongline.PROPERTY_TOTAL_HOOKS_COUNT}; + property:{SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT}; model:{bean.getTotalHooksCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.totalHooksCount")}; @@ -359,45 +359,45 @@ #haulingDirectionSameAsSetting { booleanValue:{bean.getHaulingDirectionSameAsSetting()}; - _propertyName: {SetLongline.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING}; + _propertyName: {SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING}; _validatorLabel:{t("observe.setLongline.haulingDirectionSameAsSetting")}; } #haulingStartTimeStamp { label:{t("observe.setLongline.haulingStartTimeStamp")}; date:{bean.getHaulingStartTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_HAULING_START_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_HAULING_START_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_HAULING_START_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_START_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME}; _validatorLabel:{t("observe.setLongline.haulingStartTimeStamp")}; } #haulingStartCoordinates { - propertyLatitude:{SetLongline.PROPERTY_HAULING_START_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_HAULING_START_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_HAULING_START_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_HAULING_START_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_HAULING_START_QUADRANT};*/ latitude:{bean.getHaulingStartLatitude()}; longitude:{bean.getHaulingStartLongitude()}; - quadrant:{bean.getHaulingStartQuadrant()}; + //quadrant:{bean.getHaulingStartQuadrant()}; _validatorLabel:{t("observe.setLongline.haulingStartCoordinates")}; } #haulingEndTimeStamp { label:{t("observe.setLongline.haulingEndTimeStamp")}; date:{bean.getHaulingEndTimeStamp()}; - propertyDate: {SetLongline.PROPERTY_HAULING_END_TIME_STAMP}; - propertyDayDate: {SetLongline.PROPERTY_HAULING_END_DATE}; - propertyTimeDate: {SetLongline.PROPERTY_HAULING_END_TIME}; + propertyDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP}; + //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_END_DATE}; + //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME}; _validatorLabel:{t("observe.setLongline.haulingEndTimeStamp")}; } #haulingEndCoordinates { - propertyLatitude:{SetLongline.PROPERTY_HAULING_END_LATITUDE}; - propertyLongitude:{SetLongline.PROPERTY_HAULING_END_LONGITUDE}; - /*propertyQuadrant:{SetLongline.PROPERTY_HAULING_END_QUADRANT};*/ + propertyLatitude:{SetLonglineDto.PROPERTY_HAULING_END_LATITUDE}; + propertyLongitude:{SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE}; + /*propertyQuadrant:{SetLonglineDto.PROPERTY_HAULING_END_QUADRANT};*/ latitude:{bean.getHaulingEndLatitude()}; longitude:{bean.getHaulingEndLongitude()}; - quadrant:{bean.getHaulingEndQuadrant()}; + //quadrant:{bean.getHaulingEndQuadrant()}; _validatorLabel:{t("observe.setLongline.haulingEndCoordinates")}; } @@ -407,7 +407,7 @@ } #haulingBreaks { - property:{SetLongline.PROPERTY_HAULING_BREAKS}; + property:{SetLonglineDto.PROPERTY_HAULING_BREAKS}; model:{bean.getHaulingBreaks()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setLongline.haulingBreaks")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx index 99d5aa9..3a9ce2f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx @@ -69,21 +69,22 @@ beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> + <!--FIXME--> <field name='settingStartLongitude' component='settingStartCoordinates'/> <field name='settingStartLatitude' component='settingStartCoordinates'/> - <field name='settingStartQuadrant' component='settingStartCoordinates'/> + <!--<field name='settingStartQuadrant' component='settingStartCoordinates'/>--> <field name='settingEndLongitude' component='settingEndCoordinates'/> <field name='settingEndLatitude' component='settingEndCoordinates'/> - <field name='settingEndQuadrant' component='settingEndCoordinates'/> + <!--<field name='settingEndQuadrant' component='settingEndCoordinates'/>--> <field name='haulingStartLongitude' component='haulingStartCoordinates'/> <field name='haulingStartLatitude' component='haulingStartCoordinates'/> - <field name='haulingStartQuadrant' component='haulingStartCoordinates'/> + <!--<field name='haulingStartQuadrant' component='haulingStartCoordinates'/>--> <field name='haulingEndLongitude' component='haulingEndCoordinates'/> <field name='haulingEndLatitude' component='haulingEndCoordinates'/> - <field name='haulingEndQuadrant' component='haulingEndCoordinates'/> + <!--<field name='haulingEndQuadrant' component='haulingEndCoordinates'/>--> </BeanValidator> 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 0a95fb0..b67e6a7 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 @@ -341,12 +341,12 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { SetLonglineUI.BINDING_SETTING_START_TIME_STAMP_DATE, SetLonglineUI.BINDING_SETTING_START_COORDINATES_LATITUDE, SetLonglineUI.BINDING_SETTING_START_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_SETTING_START_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_SETTING_START_COORDINATES_QUADRANT, SetLonglineUI.BINDING_SETTING_END_TIME_STAMP_DATE, SetLonglineUI.BINDING_SETTING_END_COORDINATES_LATITUDE, SetLonglineUI.BINDING_SETTING_END_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_SETTING_END_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_SETTING_END_COORDINATES_QUADRANT, // setting caracteristics tab SetLonglineUI.BINDING_SETTING_VESSEL_SPEED_MODEL, @@ -376,12 +376,12 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { SetLonglineUI.BINDING_HAULING_START_TIME_STAMP_DATE, SetLonglineUI.BINDING_HAULING_START_COORDINATES_LATITUDE, SetLonglineUI.BINDING_HAULING_START_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_HAULING_START_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_HAULING_START_COORDINATES_QUADRANT, SetLonglineUI.BINDING_HAULING_END_TIME_STAMP_DATE, SetLonglineUI.BINDING_HAULING_END_COORDINATES_LATITUDE, SetLonglineUI.BINDING_HAULING_END_COORDINATES_LONGITUDE, - SetLonglineUI.BINDING_HAULING_END_COORDINATES_QUADRANT, +// SetLonglineUI.BINDING_HAULING_END_COORDINATES_QUADRANT, SetLonglineUI.BINDING_HAULING_BREAKS_MODEL); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css index a3a2d87..19dcf6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css @@ -34,8 +34,10 @@ #observedSystem { bean:{bean}; - property: {ActivitySeine.PROPERTY_OBSERVED_SYSTEM}; - selected:{bean.getObservedSystem()}; + //FIXME + //property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM}; + //FIXME + //selected:{bean.getObservedSystem()}; _validatorLabel: {t("observe.common.observedSystem")}; showListLabel: true; universeLabel:{t("observe.activityObservedSystem.availableObservedSystem")}; @@ -49,7 +51,7 @@ #observedSystemDistance { bean:{bean}; - property: {ActivitySeine.PROPERTY_OBSERVED_SYSTEM_DISTANCE}; + property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE}; model:{bean.getObservedSystemDistance()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx index 04f4596..249e37c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx @@ -20,10 +20,10 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeineDto' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeineObservedSystemDto' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> <import> - fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction @@ -50,15 +50,16 @@ <ActivitySeineObservedSystemUIModel id='model'/> <!-- edit bean --> - <ActivitySeineDto id='bean'/> + <ActivitySeineObservedSystemDto id='bean'/> <!-- validator --> <BeanValidator id='validator' - beanClass='fr.ird.observe.services.dto.seine.ActivitySeineDto' + beanClass='fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto' errorTableModel='{getErrorTableModel()}' context='n1-update-observedSystem'> - <field name='observedSystem' component='observedSystemPane'/> - <field name='observedSystemDistance'/> + <!--FIXME--> + <!--<field name='observedSystem' component='observedSystemPane'/>--> + <!--<field name='observedSystemDistance'/>--> <field name='comment'/> </BeanValidator> 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 f66e1da..fa39ae2 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 @@ -24,7 +24,7 @@ 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.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import org.apache.commons.logging.Log; @@ -36,7 +36,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<ActivitySeineDto> { +public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<ActivitySeineObservedSystemDto> { /** Logger */ static private Log log = LogFactory.getLog(ActivitySeineObservedSystemUIHandler.class); @@ -58,7 +58,7 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ @Override protected ContentMode getContentMode(DataContext dataContext) { - if (dataContext.isSelectedOpen(ActivitySeineDto.class)) { + if (dataContext.isSelectedOpen(ActivitySeineObservedSystemDto.class)) { // l'activity courante est ouverte, on peut modifier return ContentMode.UPDATE; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java index 8309f5e..a14ad1e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.seine; */ import fr.ird.observe.business.BinderService; -import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -33,25 +33,24 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeineDto> { +public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeineObservedSystemDto> { private static final long serialVersionUID = 1L; public ActivitySeineObservedSystemUIModel() { - super(ActivitySeineDto.class); + super(ActivitySeineObservedSystemDto.class); } @Override - protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( - ActivitySeineDto.class, + BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> builder = binderService.newBinderBuilder( + ActivitySeineObservedSystemDto.class, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, //FIXME -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, -// ActivitySeineDto.PROPERTY_SET_SEINE, - ActivitySeineDto.PROPERTY_COMMENT - //FIXME -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE +// ActivitySeineObservedSystemDto.PROPERTY_SET_SEINE, + ActivitySeineObservedSystemDto.PROPERTY_COMMENT, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE ); return builder; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css index eb9d468..d45c93f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css @@ -31,9 +31,10 @@ labelFor:{typeOperation}; } -#typeOperation { - selectedItem:{bean.getTypeTransmittingBuoyOperation()}; -} + //FIXME +//#typeOperation { +// selectedItem:{bean.getTypeTransmittingBuoyOperation()}; +//} #transmittingBuoys { visible:{typeOperation.getSelectedItem() != null}; @@ -59,11 +60,13 @@ } #transmittingBuoyOperation1 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + //FIXME + //property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; bean:{transmittingBuoy1}; enabled:false; showReset:true; - selectedItem:{transmittingBuoy1.getTransmittingBuoyOperation()}; + //FIXME + //selectedItem:{transmittingBuoy1.getTransmittingBuoyOperation()}; } #transmittingBuoyType1Label { @@ -72,7 +75,7 @@ } #transmittingBuoyType1 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_TYPE}; + property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; bean:{transmittingBuoy1}; showReset:true; selectedItem:{transmittingBuoy1.getTransmittingBuoyType()}; @@ -85,7 +88,8 @@ #ownership1 { selectedItem:{transmittingBuoy1.getOwnership()}; - enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} + //FIXME + //enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } #country1Label { @@ -94,10 +98,10 @@ } #country1 { - property:{TransmittingBuoy.PROPERTY_COUNTRY}; + //property:{TransmittingBuoyDto.PROPERTY_COUNTRY}; bean:{transmittingBuoy1}; showReset:true; - selectedItem:{transmittingBuoy1.getCountry()}; + //selectedItem:{transmittingBuoy1.getCountry()}; } #code1Label { @@ -124,11 +128,13 @@ } #transmittingBuoyOperation2 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + //FIXME + //property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; bean:{transmittingBuoy2}; showReset:true; enabled:false; - selectedItem:{transmittingBuoy2.getTransmittingBuoyOperation()}; + //FIXME + //selectedItem:{transmittingBuoy2.getTransmittingBuoyOperation()}; } #transmittingBuoyType2Label { @@ -137,7 +143,7 @@ } #transmittingBuoyType2 { - property:{TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_TYPE}; + property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; bean:{transmittingBuoy2}; showReset:true; selectedItem:{transmittingBuoy2.getTransmittingBuoyType()}; @@ -150,7 +156,8 @@ #ownership2 { selectedItem:{transmittingBuoy2.getOwnership()}; - enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} + //FIXME + //enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} } #country2Label { @@ -159,10 +166,10 @@ } #country2 { - property:{TransmittingBuoy.PROPERTY_COUNTRY}; + //property:{TransmittingBuoyDto.PROPERTY_COUNTRY}; bean:{transmittingBuoy2}; showReset:true; - selectedItem:{transmittingBuoy2.getCountry()}; + //selectedItem:{transmittingBuoy2.getCountry()}; } #code2Label { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index 0ab8489..3d1b063 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -26,9 +26,8 @@ <import> fr.ird.observe.services.dto.seine.FloatingObjectDto fr.ird.observe.services.dto.seine.TransmittingBuoyDto - fr.ird.observe.services.dto.seine.TransmittingBuoyImplDto - fr.ird.observe.services.dto.constants.seine.OwnershipDto - fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationDto + fr.ird.observe.services.dto.constants.seine.Ownership + fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto @@ -75,7 +74,8 @@ <field name="transmittingBuoyOperation" component="transmittingBuoyOperation1"/> <field name="ownership" component="ownership1"/> <field name="code" component="code1"/> - <field name="country" component="country1"/> + <!--FIXME--> + <!--<field name="country" component="country1"/>--> </BeanValidator> <BeanValidator id='validatorBalise2' @@ -87,7 +87,8 @@ <field name="transmittingBuoyOperation" component="transmittingBuoyOperation2"/> <field name="ownership" component="ownership2"/> <field name="code" component="code2"/> - <field name="country" component="country2"/> + <!--FIXME--> + <!--<field name="country" component="country2"/>--> </BeanValidator> @@ -102,7 +103,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='typeOperation' - genericType='TypeTransmittingBuoyOperationDto' + genericType='TypeTransmittingBuoyOperation' constructorParams='TypeTransmittingBuoyOperation.class' onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedItem(), true); model.setModified(true); }'/> </cell> @@ -217,7 +218,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='ownership2' - constructorParams='OwnershipDto.class' + constructorParams='Ownership.class' onItemStateChanged='transmittingBuoy2.setOwnership((Ownership) ownership2.getSelectedItem())'/> </cell> </row> 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 e030d08..2e250d9 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 @@ -104,7 +104,8 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectDto bean = getBean(); - bean.clearTransmittingBuoy(); + //FIXME +// bean.clearTransmittingBuoy(); //FIXME: What should I do now ? bean.clearOperation(); // pour etre sur que rien ne va changer pendant le chargement de l'objet. @@ -114,8 +115,9 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH //FIXME // getDataService().loadEditEntity(getDataSource(), dcpId, getLoadExecutor()); - getUi().processDataBinding( - FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); + //FIXME +// getUi().processDataBinding( +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); TypeTransmittingBuoyOperation typeOperation = getUi().getTypeOperation().getSelectedItem(); @@ -181,8 +183,9 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH @Override public void startEditUI(String... binding) { super.startEditUI( - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE1_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP1_SELECTED_ITEM, @@ -190,36 +193,41 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND1_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); + FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM + ); FloatingObjectTransmittingBuoyOperationUI ui = getUi(); addInfoMessage(t("observe.message.updating.floatingObject")); - List<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); - if (balises != null && !balises.isEmpty()) { - TransmittingBuoyDto transmittingBuoy1 = ui.getTransmittingBuoy1(); - ui.getValidatorBalise1().setBean(transmittingBuoy1); - - if (balises.size() == 2) { - TransmittingBuoyDto transmittingBuoy2 = ui.getTransmittingBuoy2(); - ui.getValidatorBalise2().setBean(transmittingBuoy2); - } - } + //FIXME +// List<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); +// if (balises != null && !balises.isEmpty()) { +// TransmittingBuoyDto transmittingBuoy1 = ui.getTransmittingBuoy1(); +// ui.getValidatorBalise1().setBean(transmittingBuoy1); +// +// if (balises.size() == 2) { +// TransmittingBuoyDto transmittingBuoy2 = ui.getTransmittingBuoy2(); +// ui.getValidatorBalise2().setBean(transmittingBuoy2); +// } +// } UIHelper.processDataBinding( ui, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_OPERATION2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE1_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_CODE2_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_OWNERSHIP2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND1_TEXT, FloatingObjectTransmittingBuoyOperationUI.BINDING_BRAND2_TEXT, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, - FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, + //FIXME +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY1_SELECTED_ITEM, +// FloatingObjectTransmittingBuoyOperationUI.BINDING_COUNTRY2_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE1_SELECTED_ITEM, FloatingObjectTransmittingBuoyOperationUI.BINDING_TRANSMITTING_BUOY_TYPE2_SELECTED_ITEM); getModel().setModified(false); @@ -392,7 +400,8 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH if (transmittingBuoy == null) { - editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); + //FIXME +// editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); if (log.isDebugEnabled()) { log.debug("Reuse an empty balise lue for objectOperation " + diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css index 0f00e65..0cc0294 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css @@ -38,7 +38,7 @@ BeanComboBox { } #objectOperation { - property:{FloatingObject.PROPERTY_OBJECT_OPERATION}; + property:{FloatingObjectDto.PROPERTY_OBJECT_OPERATION}; selectedItem:{bean.getObjectOperation()}; } @@ -48,7 +48,7 @@ BeanComboBox { } #objectType { - property:{FloatingObject.PROPERTY_OBJECT_TYPE}; + property:{FloatingObjectDto.PROPERTY_OBJECT_TYPE}; selectedItem:{bean.getObjectType()}; } @@ -58,7 +58,7 @@ BeanComboBox { } #objectFate { - property:{FloatingObject.PROPERTY_OBJECT_FATE}; + property:{FloatingObjectDto.PROPERTY_OBJECT_FATE}; selectedItem:{bean.getObjectFate()}; } @@ -69,7 +69,7 @@ BeanComboBox { #daysAtSeaCount { bean:{bean}; - property:{FloatingObject.PROPERTY_DAYS_AT_SEA_COUNT}; + property:{FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT}; model:{bean.getDaysAtSeaCount()}; autoPopup:{config.isAutoPopupNumberEditor()}; showPopupButton:{config.isShowNumberEditorButton()}; @@ -83,14 +83,14 @@ BeanComboBox { } #supportVesselName { - _propertyName:{FloatingObject.PROPERTY_SUPPORT_VESSEL_NAME}; + _propertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; text:{getStringValue(bean.getSupportVesselName())}; _validatorLabel:{"observe.common.supportVesselName"}; } #resetSupportVesselName{ toolTipText:"observe.action.reset.supportVesselName.tip"; - _resetPropertyName:{FloatingObject.PROPERTY_SUPPORT_VESSEL_NAME}; + _resetPropertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; } #comment { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css index 7e4d4ee..2cb0a0a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css @@ -38,7 +38,7 @@ } #startTime { - propertyDate:{SetSeine.PROPERTY_START_TIME}; + propertyDate:{SetSeineDto.PROPERTY_START_TIME}; label:{t("observe.setSeine.startTime")}; date:{bean.getStartTime()}; dateEditable:false; @@ -46,18 +46,18 @@ } #endPursingTimeStamp { - propertyDate: {SetSeine.PROPERTY_END_PURSING_TIME_STAMP}; - propertyDayDate: {SetSeine.PROPERTY_END_PURSING_DATE}; - propertyTimeDate: {SetSeine.PROPERTY_END_PURSING_TIME}; + propertyDate: {SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP}; + propertyDayDate: {SetSeineDto.PROPERTY_END_PURSING_DATE}; + propertyTimeDate: {SetSeineDto.PROPERTY_END_PURSING_TIME}; label:{t("observe.setSeine.endPursingTimeStamp")}; date:{bean.getEndPursingTimeStamp()}; _validatorLabel:{t("observe.setSeine.endPursingTimeStamp")}; } #endSetTimeStamp { - propertyDate: {SetSeine.PROPERTY_END_SET_TIME_STAMP}; - propertyDayDate: {SetSeine.PROPERTY_END_SET_DATE}; - propertyTimeDate: {SetSeine.PROPERTY_END_SET_TIME}; + propertyDate: {SetSeineDto.PROPERTY_END_SET_TIME_STAMP}; + propertyDayDate: {SetSeineDto.PROPERTY_END_SET_DATE}; + propertyTimeDate: {SetSeineDto.PROPERTY_END_SET_TIME}; label:{t("observe.setSeine.endSetTimeStamp")}; date:{bean.getEndSetTimeStamp()}; _validatorLabel:{t("observe.setSeine.endSetTimeStamp")}; @@ -69,7 +69,7 @@ } #reasonForNullSet { - property:{SetSeine.PROPERTY_REASON_FOR_NULL_SET}; + property:{SetSeineDto.PROPERTY_REASON_FOR_NULL_SET}; selectedItem:{bean.getReasonForNullSet()}; _validatorLabel:{t("observe.setSeine.reasonForNullSet")}; } @@ -80,14 +80,14 @@ } #supportVesselName { - _propertyName:{SetSeine.PROPERTY_SUPPORT_VESSEL_NAME}; + _propertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; text:{getStringValue(bean.getSupportVesselName())}; _validatorLabel:{t("observe.setSeine.supportVesselName")}; } #resetSupportVesselName{ toolTipText:"observe.action.reset.supportVesselName.tip"; - _resetPropertyName:{SetSeine.PROPERTY_SUPPORT_VESSEL_NAME}; + _resetPropertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; } #targetDiscardedLabel { @@ -96,7 +96,7 @@ } #targetDiscarded { - _propertyName:{SetSeine.PROPERTY_TARGET_DISCARDED}; + _propertyName:{SetSeineDto.PROPERTY_TARGET_DISCARDED}; booleanValue:{bean.getTargetDiscarded()}; _validatorLabel:{t("observe.setSeine.targetDiscarded")}; } @@ -107,7 +107,7 @@ } #nonTargetDiscarded { - _propertyName:{SetSeine.PROPERTY_NON_TARGET_DISCARDED}; + _propertyName:{SetSeineDto.PROPERTY_NON_TARGET_DISCARDED}; booleanValue:{bean.getNonTargetDiscarded()}; _validatorLabel:{t("observe.setSeine.nonTargetDiscarded")}; } @@ -135,7 +135,7 @@ } #schoolThickness { - property:{SetSeine.PROPERTY_SCHOOL_THICKNESS}; + property:{SetSeineDto.PROPERTY_SCHOOL_THICKNESS}; model:{bean.getSchoolThickness()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.schoolThickness")}; @@ -147,7 +147,7 @@ } #schoolMeanDepth { - property:{SetSeine.PROPERTY_SCHOOL_MEAN_DEPTH}; + property:{SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH}; model:{bean.getSchoolMeanDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.schoolMeanDepth")}; @@ -159,7 +159,7 @@ } #schoolTopDepth { - property:{SetSeine.PROPERTY_SCHOOL_TOP_DEPTH}; + property:{SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH}; model:{bean.getSchoolTopDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.schoolTopDepth")}; @@ -171,7 +171,7 @@ } #currentMeasureDepth { - property:{SetSeine.PROPERTY_CURRENT_MEASURE_DEPTH}; + property:{SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH}; model:{bean.getCurrentMeasureDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.currentMeasureDepth")}; @@ -183,7 +183,7 @@ } #currentSpeed { - property:{SetSeine.PROPERTY_CURRENT_SPEED}; + property:{SetSeineDto.PROPERTY_CURRENT_SPEED}; model:{bean.getCurrentSpeed()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL1_PATTERN}; @@ -196,7 +196,7 @@ } #currentDirection { - property:{SetSeine.PROPERTY_CURRENT_DIRECTION}; + property:{SetSeineDto.PROPERTY_CURRENT_DIRECTION}; model:{bean.getCurrentDirection()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_3_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.currentDirection")}; @@ -208,14 +208,14 @@ } #maxGearDepth { - property:{SetSeine.PROPERTY_MAX_GEAR_DEPTH}; + property:{SetSeineDto.PROPERTY_MAX_GEAR_DEPTH}; model:{bean.getMaxGearDepth()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.setSeine.maxGearDepth")}; } #sonarUsed { - _propertyName:{SetSeine.PROPERTY_SONAR_USED}; + _propertyName:{SetSeineDto.PROPERTY_SONAR_USED}; text:"observe.setSeine.sonarUsed"; selected:{bean.isSonarUsed()}; _validatorLabel:{t("observe.setSeine.sonarUsed")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx index f30eb5f..78df990 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx @@ -92,7 +92,7 @@ <JLabel id='reasonForNullSetLabel'/> </cell> <cell anchor='east' fill='both'> - <BeanComboBox id='reasonForNullSet' genericType='ReasonForNullSet' constructorParams='this'/> + <BeanComboBox id='reasonForNullSet' genericType='ReasonForNullSetDto' constructorParams='this'/> </cell> </row> <row> 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 e999bfd..df0aff6 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 @@ -21,15 +21,11 @@ */ package fr.ird.observe.ui.content.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveDAOHelper; 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.business.util.TopiaExecutor2; import fr.ird.observe.services.dto.constants.seine.SchoolType; -import fr.ird.observe.services.dto.constants.seine.SchoolTypeDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -45,10 +41,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx index 2417ea9..6d78cdd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx @@ -23,13 +23,13 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends AbstractObserveDto, C extends AbstractObserveDto'> + genericType='E extends IdDto, C extends IdDto'> <import> fr.ird.observe.ui.actions.shared.ReOpenUIAction fr.ird.observe.ui.actions.shared.SelectNodeUIAction - fr.ird.observe.services.dto.AbstractObserveDto + fr.ird.observe.services.dto.IdDto jaxx.runtime.swing.editor.bean.BeanListHeader 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 b568778..b5f7dfb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.list; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -33,7 +35,6 @@ import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.DefaultListCellRenderer; import javax.swing.Icon; @@ -52,7 +53,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public abstract class ContentListUIHandler<E extends TopiaEntity, C extends TopiaEntity> extends ContentUIHandler<E> { +public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> extends ContentUIHandler<E> { /** Logger */ static private Log log = LogFactory.getLog(ContentListUIHandler.class); @@ -135,7 +136,8 @@ public abstract class ContentListUIHandler<E extends TopiaEntity, C extends Topi model.setCanReopen(canReopen); E bean = getBean(); - getDataService().loadEditEntity(getDataSource(), selectedId, getLoadExecutor()); + //FIXME +// getDataService().loadEditEntity(getDataSource(), selectedId, getLoadExecutor()); List<C> data = getChilds(bean); @@ -171,7 +173,7 @@ public abstract class ContentListUIHandler<E extends TopiaEntity, C extends Topi if (selectedData != null) { // obtain the node corresponding to the selected data - String id = selectedData.getTopiaId(); + String id = selectedData.getId(); ObserveTreeHelper helper = getTreeHelper(getUi()); ObserveNode selectedNode = helper.getSelectedNode(); node = helper.findNode(selectedNode, id); @@ -241,18 +243,18 @@ public abstract class ContentListUIHandler<E extends TopiaEntity, C extends Topi ); if (value == null || - !(value instanceof TopiaEntity) || + !(value instanceof IdDto) || containerNode == null) { // rien de plus a faire return comp; } - TopiaEntity e = (TopiaEntity) value; + IdDto e = (IdDto) value; // recuperation du noeud correspondant dans l'arbre ObserveNode node = - treeHelper.findNode(containerNode, e.getTopiaId()); + treeHelper.findNode(containerNode, e.getId()); if (node == null) { 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 661d644..d3cb3c4 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 @@ -22,11 +22,12 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.DataService; 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.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLongline, ActivityLongline> { +public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglineDto, ActivityLonglineDto> { /** Logger */ static private Log log = LogFactory.getLog(ActivityLonglinesUIHandler.class); @@ -69,7 +70,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin boolean openActivity = dataContext.isOpenActivity(); - if (dataContext.isSelectedOpen(TripLongline.class)) { + if (dataContext.isSelectedOpen(TripLonglineDto.class)) { // // la marée courante est ouverte @@ -107,18 +108,20 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin } @Override - protected List<ActivityLongline> getChilds(TripLongline bean) throws DataSourceException { + protected List<ActivityLonglineDto> getChilds(TripLonglineDto bean) throws DataSourceException { DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " activities."); - } - - return list; + //FIXME +// DataService dataService = getDataService(); +// +// List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " activities."); +// } +// +// return list; + return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css index 84d599b..517aed0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css @@ -27,7 +27,7 @@ .gotoOpenTrip { visible:{model.isUpdatingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripLongline.class}; + _type:{TripLonglineDto.class}; _text:{t("observe.action.goto.open.maree")}; _toolTipText:{t("observe.action.goto.open.trip.tip")}; } @@ -35,7 +35,7 @@ .gotoOpenTrip2 { visible:{model.isReadingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripLongline.class}; + _type:{TripLonglineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.maree")}; _toolTipText:{t("observe.action.goto.open.other.maree.tip")}; @@ -44,7 +44,7 @@ .gotoOpenActivity { visible:{model.isUpdatingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivityLongline.class}; + _type:{ActivityLonglineDto.class}; _text:{t("observe.action.goto.open.activity")}; _toolTipText:{t("observe.action.goto.open.activity.tip")}; } @@ -52,7 +52,7 @@ .gotoOpenActivity2 { visible:{model.isReadingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivityLongline.class}; + _type:{ActivityLonglineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.activity")}; _toolTipText:{t("observe.action.goto.open.other.activity.tip")}; 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 b0599d1..1d641fc 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 @@ -22,11 +22,12 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.DataService; 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.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLongline> { +public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, TripLonglineDto> { /** Logger */ static private final Log log = LogFactory.getLog(TripLonglinesUIHandler.class); @@ -68,7 +69,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLo // il existe un maree ouverte // - if (dataContext.isSelectedOpen(Program.class)) { + if (dataContext.isSelectedOpen(ProgramDto.class)) { // le programme courant a une maree ouverte addInfoMessage(n("observe.tripLongline.message.active.found")); @@ -90,19 +91,21 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLo } @Override - protected List<TripLongline> getChilds(Program bean) throws DataSourceException { + protected List<TripLonglineDto> getChilds(ProgramDto bean) throws DataSourceException { DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " trips."); - } - - return list; - + //FIXME +// DataService dataService = getDataService(); +// +// List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " trips."); +// } +// +// return list; + + return null; } } 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 7616c14..8ad0360 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 @@ -21,11 +21,12 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.DataService; 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.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -39,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, ActivitySeine> { +public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, ActivitySeineDto> { /** Logger */ static private Log log = LogFactory.getLog(ActivitySeinesUIHandler.class); @@ -67,7 +68,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, Activit boolean openActivity = dataContext.isOpenActivity(); - if (dataContext.isSelectedOpen(Route.class)) { + if (dataContext.isSelectedOpen(RouteDto.class)) { // // la route courante est ouverte @@ -105,19 +106,20 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, Activit } @Override - protected List<ActivitySeine> getChilds(Route bean) throws DataSourceException { + protected List<ActivitySeineDto> getChilds(RouteDto bean) throws DataSourceException { DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " activities."); - } - - return list; - + //FIXME +// DataService dataService = getDataService(); +// +// List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " activities."); +// } +// +// return list; + return null; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css index 5a99934..8633b3b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css @@ -27,7 +27,7 @@ .gotoOpenTrip { visible:{model.isUpdatingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripSeine.class}; + _type:{TripSeineDto.class}; _text:{t("observe.action.goto.open.maree")}; _toolTipText:{t("observe.action.goto.open.trip.tip")}; } @@ -35,7 +35,7 @@ .gotoOpenTrip2 { visible:{model.isReadingMode() && dataContext.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{TripSeine.class}; + _type:{TripSeineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.maree")}; _toolTipText:{t("observe.action.goto.open.other.maree.tip")}; @@ -44,7 +44,7 @@ .gotoOpenRoute { visible:{model.isUpdatingMode() && dataContext.isOpenRoute()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{Route.class}; + _type:{RouteDto.class}; _text:{t("observe.action.goto.open.route")}; _toolTipText:{t("observe.action.goto.open.route.tip")}; } @@ -52,7 +52,7 @@ .gotoOpenRoute2 { visible:{model.isReadingMode() && dataContext.isOpenRoute()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{Route.class}; + _type:{RouteDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.route")}; _toolTipText:{t("observe.action.goto.open.other.route.tip")}; @@ -61,7 +61,7 @@ .gotoOpenActivity { visible:{model.isUpdatingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivitySeine.class}; + _type:{ActivitySeineDto.class}; _text:{t("observe.action.goto.open.activity")}; _toolTipText:{t("observe.action.goto.open.activity.tip")}; } @@ -69,7 +69,7 @@ .gotoOpenActivity2 { visible:{model.isReadingMode() && dataContext.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; - _type:{ActivitySeine.class}; + _type:{ActivitySeineDto.class}; _actionIcon:{"go-jump"}; _text:{t("observe.action.goto.open.other.activity")}; _toolTipText:{t("observe.action.goto.open.other.activity.tip")}; 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 5f1ff0b..5ecef54 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 @@ -21,11 +21,12 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.DataService; 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.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -39,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { +public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto> { /** Logger */ static private Log log = LogFactory.getLog(RoutesUIHandler.class); @@ -68,7 +69,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { boolean openRoute = dataContext.isOpenRoute(); - if (dataContext.isSelectedOpen(TripSeine.class)) { + if (dataContext.isSelectedOpen(TripSeineDto.class)) { // la marée courante est ouverte @@ -102,18 +103,20 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { } @Override - protected List<Route> getChilds(TripSeine bean) throws DataSourceException { - - DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " routes."); - } - - return list; + protected List<RouteDto> getChilds(TripSeineDto bean) throws DataSourceException { + + //FIXME +// DataSource source = getDataSource(); +// DataService dataService = getDataService(); +// +// List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " routes."); +// } +// +// return list; + return 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 fa75ef0..5d83840 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 @@ -21,11 +21,12 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.DataService; 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.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -39,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine> { +public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSeineDto> { /** Logger */ static private final Log log = LogFactory.getLog(TripSeinesUIHandler.class); @@ -65,7 +66,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine // il existe un maree ouverte // - if (dataContext.isSelectedOpen(Program.class)) { + if (dataContext.isSelectedOpen(ProgramDto.class)) { // le program courant a une maree ouverte addInfoMessage(n("observe.tripSeine.message.active.found")); @@ -87,18 +88,21 @@ public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine } @Override - protected List<TripSeine> getChilds(Program bean) throws DataSourceException { - - DataSource source = getDataSource(); - DataService dataService = getDataService(); - - List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); - - if (log.isDebugEnabled()) { - log.debug("Will use " + list.size() + " trips."); - } - - return list; + protected List<TripSeineDto> getChilds(ProgramDto bean) throws DataSourceException { + + //FIXME +// DataSource source = getDataSource(); +// DataService dataService = getDataService(); +// +// List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); +// +// if (log.isDebugEnabled()) { +// log.debug("Will use " + list.size() + " trips."); +// } +// +// return list; + + return null; } } 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 caa3af1..12cbfa9 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,7 +23,7 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends AbstractObserveDto & OpenableDto' + genericType='E extends OpenableDto'
<import> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 40ec502..3bb8489 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -27,17 +27,20 @@ } #timeStamp { - propertyDate:{ActivityLongline.PROPERTY_TIME_STAMP}; - propertyDayDate:{ActivityLongline.PROPERTY_DATE}; - propertyTimeDate:{ActivityLongline.PROPERTY_TIME}; + propertyDate:{ActivityLonglineDto.PROPERTY_TIME_STAMP}; + //FIXME + //propertyDayDate:{ActivityLonglineDto.PROPERTY_DATE}; + //FIXME + //propertyTimeDate:{ActivityLonglineDto.PROPERTY_TIME}; label:{t("observe.activityLongline.timeStamp")}; date:{bean.getTimeStamp()}; } #coordinatesEditor { - propertyLatitude:{ActivityLongline.PROPERTY_LATITUDE}; - propertyLongitude:{ActivityLongline.PROPERTY_LONGITUDE}; - propertyQuadrant:{ActivityLongline.PROPERTY_QUADRANT}; + propertyLatitude:{ActivityLonglineDto.PROPERTY_LATITUDE}; + propertyLongitude:{ActivityLonglineDto.PROPERTY_LONGITUDE}; + //FIXME + //propertyQuadrant:{ActivityLonglineDto.PROPERTY_QUADRANT}; } #vesselActivityLonglineLabel { @@ -46,7 +49,7 @@ } #vesselActivityLongline { - property:{ActivityLongline.PROPERTY_VESSEL_ACTIVITY_LONGLINE}; + property:{ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE}; selectedItem:{bean.getVesselActivityLongline()}; enabled:{!model.isUpdatingMode()}; } @@ -57,7 +60,7 @@ } #fpaZone { - property:{ActivityLongline.PROPERTY_FPA_ZONE}; + property:{ActivityLonglineDto.PROPERTY_FPA_ZONE}; selectedItem:{bean.getFpaZone()}; } @@ -67,7 +70,7 @@ } #seaSurfaceTemperature { - property:{ActivityLongline.PROPERTY_SEA_SURFACE_TEMPERATURE}; + property:{ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE}; model:{bean.getSeaSurfaceTemperature()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; @@ -96,5 +99,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid() && bean.isSetOperation() && bean.getSetLongline() == null}; + enabled:{model.isValid()}; // FIXME && bean.isSetOperation() && bean.getSetLongline() == null}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx index ecbd9a1..c74688f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx @@ -65,7 +65,8 @@ <field name='longitude' component='coordinatesEditor'/> <field name='latitude' component='coordinatesEditor'/> - <field name='quadrant' component='coordinatesEditor'/> + <!--FIXME--> + <!--<field name='quadrant' component='coordinatesEditor'/>--> </BeanValidator> @@ -112,7 +113,7 @@ <JLabel id='seaSurfaceTemperatureLabel'/> </cell> <cell anchor='east' fill="both"> - <NumberEditor id='seaSurfaceTemperatureLabel' constructorParams='this'/> + <NumberEditor id='seaSurfaceTemperature' constructorParams='this'/> </cell> </row> @@ -138,7 +139,7 @@ <row> <cell weightx="0.5" fill="both"> <JButton id='addSet' - onActionPerformed='getHandler().addChild(SetLongline.class)'/> + onActionPerformed='getHandler().addChild(SetLonglineDto.class)'/> </cell> </row> </Table> 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 6e39265..4af6b58 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 @@ -185,9 +185,10 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity getUi().getCoordinatesEditor().setLatitudeAndLongitude(bean.getLatitude(), bean.getLongitude()); if (create) { - Integer quadrant = bean.getQuadrant(); + //FIXME +// Integer quadrant = bean.getQuadrant(); getUi().getCoordinatesEditor().setQuadrant(null); - getUi().getCoordinatesEditor().setQuadrant(quadrant); +// getUi().getCoordinatesEditor().setQuadrant(quadrant); } // on annule la modification engendree par ce binding diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css index 7282179..ec27bed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css @@ -46,9 +46,10 @@ NumberEditor { } #observer { - property:{TripLongline.PROPERTY_OBSERVER}; + property:{TripLonglineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - _listPredicate:{Persons.newObserverPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newObserverPredicate()}; } #captainLabel { @@ -57,9 +58,10 @@ NumberEditor { } #captain { - property:{TripLongline.PROPERTY_CAPTAIN}; + property:{TripLonglineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - _listPredicate:{Persons.newCaptainPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newCaptainPredicate()}; } #dataEntryOperatorLabel { @@ -68,9 +70,10 @@ NumberEditor { } #dataEntryOperator { - property:{TripLongline.PROPERTY_DATA_ENTRY_OPERATOR}; + property:{TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - _listPredicate:{Persons.newDataEntryOperatorPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; } #tripTypeLabel{ @@ -79,7 +82,7 @@ NumberEditor { } #tripType { - property:{TripLongline.PROPERTY_TRIP_TYPE}; + property:{TripLonglineDto.PROPERTY_TRIP_TYPE}; selectedItem:{bean.getTripType()}; } @@ -89,9 +92,10 @@ NumberEditor { } #vessel { - property:{TripLongline.PROPERTY_VESSEL}; + property:{TripLonglineDto.PROPERTY_VESSEL}; selectedItem:{bean.getVessel()}; - _listPredicate:{Vessels.newVesselByVesselTypeIdPredicate(getConfig().getLonglineVesselTypeIds())}; + //FIXME + //_listPredicate:{VesselDtos.newVesselByVesselTypeIdPredicate(getConfig().getLonglineVesselTypeIds())}; } #oceanLabel{ @@ -100,9 +104,9 @@ NumberEditor { } #ocean { - property:{TripLongline.PROPERTY_OCEAN}; + property:{TripLonglineDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; - enabled:{canEditOcean(bean.getActivityLongline())}; + //enabled:{canEditOcean(bean.getActivityLongline())}; } #departureHarbourLabel { @@ -111,7 +115,7 @@ NumberEditor { } #departureHarbour { - property:{TripLongline.PROPERTY_DEPARTURE_HARBOUR}; + property:{TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR}; selectedItem:{bean.getDepartureHarbour()}; } @@ -121,7 +125,7 @@ NumberEditor { } #landingHarbour { - property:{TripLongline.PROPERTY_LANDING_HARBOUR}; + property:{TripLonglineDto.PROPERTY_LANDING_HARBOUR}; selectedItem:{bean.getLandingHarbour()}; } @@ -131,7 +135,7 @@ NumberEditor { } #totalFishingOperationsNumber { - property:{TripLongline.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER}; + property:{TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER}; model:{bean.getTotalFishingOperationsNumber()}; useFloat:false; } @@ -143,12 +147,12 @@ NumberEditor { #resetHomeId { toolTipText:"observe.action.reset.homeId.tip"; - _resetPropertyName: {TripLongline.PROPERTY_HOME_ID}; + _resetPropertyName: {TripLonglineDto.PROPERTY_HOME_ID}; } #homeId { text:{getStringValue(bean.getHomeId())}; - _propertyName: {TripLongline.PROPERTY_HOME_ID}; + _propertyName: {TripLonglineDto.PROPERTY_HOME_ID}; } #startDateLabel { @@ -158,7 +162,7 @@ NumberEditor { #startDate { date:{bean.getStartDate()}; - _propertyName: {TripLongline.PROPERTY_START_DATE}; + _propertyName: {TripLonglineDto.PROPERTY_START_DATE}; } #endDateLabel { @@ -168,7 +172,7 @@ NumberEditor { #endDate { date:{bean.getEndDate()}; - _propertyName: {TripLongline.PROPERTY_END_DATE}; + _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; } #comment { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx index c5f1ea5..988ca9d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -30,9 +30,9 @@ fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.referential.HarbourDto - fr.ird.observe.services.dto.referential.PersonDtosDto + fr.ird.observe.services.dto.referential.PersonDtos fr.ird.observe.services.dto.referential.VesselDto - fr.ird.observe.services.dto.referential.VesselDtosDto + fr.ird.observe.services.dto.referential.VesselDtos fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.referential.longline.TripTypeDto @@ -68,7 +68,8 @@ errorTableModel='{getErrorTableModel()}' autoField='true' context='n1-update'> - <field name='activityLongline' component='{actionDown}'/> + <!--FIXME--> + <!--<field name='activityLongline' component='{actionDown}'/>--> </BeanValidator> <script><![CDATA[ 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 dcda386..fb08b00 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 @@ -118,7 +118,8 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline TripLonglineUI ui = getUi(); TripMapUI tripMap = ui.getTripMap(); - tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + //FIXME +// tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); } }); buildTripMap = false; @@ -173,12 +174,12 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline //FIXME // dataService.loadEditEntity(source, tripId, getLoadExecutor()); - if (!bean.isActivityLonglineEmpty()) { + //FIXME +// if (!bean.isActivityLonglineEmpty()) { - // on force le trie des routes - //FIXME + // on force le trie des routes // ActivityLonglineDtos.sort(bean.getActivityLongline()); - } +// } } getUi().getTripLonglineTabPane().setSelectedIndex(0); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css index 681e622..e0b3214 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css @@ -27,7 +27,7 @@ } #time { - propertyTime:{ActivitySeine.PROPERTY_TIME}; + propertyTime:{ActivitySeineDto.PROPERTY_TIME}; bean:{bean}; label:{t("observe.common.heureobservation")}; time:{bean.getTime()}; @@ -40,9 +40,10 @@ } #coordinatesEditor { - propertyLatitude:{ActivitySeine.PROPERTY_LATITUDE}; - propertyLongitude:{ActivitySeine.PROPERTY_LONGITUDE}; - propertyQuadrant:{ActivitySeine.PROPERTY_QUADRANT}; + propertyLatitude:{ActivitySeineDto.PROPERTY_LATITUDE}; + propertyLongitude:{ActivitySeineDto.PROPERTY_LONGITUDE}; + //FIXME + //propertyQuadrant:{ActivitySeineDto.PROPERTY_QUADRANT}; } #generalTab { @@ -66,7 +67,7 @@ } #vesselActivitySeine { - property:{ActivitySeine.PROPERTY_VESSEL_ACTIVITY_SEINE}; + property:{ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE}; selectedItem:{bean.getVesselActivitySeine()}; enabled:{!model.isUpdatingMode()}; } @@ -77,7 +78,7 @@ } #surroundingActivity { - property:{ActivitySeine.PROPERTY_SURROUNDING_ACTIVITY}; + property:{ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY}; selectedItem:{bean.getSurroundingActivity()}; } @@ -87,9 +88,10 @@ } #previousFpaZone { - property:{ActivitySeine.PROPERTY_PREVIOUS_FPA_ZONE}; + property:{ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE}; selectedItem:{bean.getPreviousFpaZone()}; - enabled:{bean.isChangedZoneOperation()}; + //FIXME + //enabled:{bean.isChangedZoneOperation()}; } #currentFpaZoneLabel { @@ -98,9 +100,10 @@ } #currentFpaZone { - property:{ActivitySeine.PROPERTY_CURRENT_FPA_ZONE}; + property:{ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE}; selectedItem:{bean.getCurrentFpaZone()}; - enabled:{!bean.isChangedZoneOperation()}; + //FIXME + //enabled:{!bean.isChangedZoneOperation()}; } #nextFpaZoneLabel { @@ -109,9 +112,10 @@ } #nextFpaZone { - property:{ActivitySeine.PROPERTY_NEXT_FPA_ZONE}; + property:{ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE}; selectedItem:{bean.getNextFpaZone()}; - enabled:{bean.isChangedZoneOperation()}; + //FIXME + //enabled:{bean.isChangedZoneOperation()}; } #vesselSpeedLabel { @@ -120,7 +124,7 @@ } #vesselSpeed { - property:{ActivitySeine.PROPERTY_VESSEL_SPEED}; + property:{ActivitySeineDto.PROPERTY_VESSEL_SPEED}; model:{bean.getVesselSpeed()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; @@ -133,11 +137,11 @@ #resetErsId{ toolTipText:"observe.action.reset.ersId.tip"; - _resetPropertyName:{ActivitySeine.PROPERTY_ERS_ID}; + _resetPropertyName:{ActivitySeineDto.PROPERTY_ERS_ID}; } #ersId { - _propertyName:{ActivitySeine.PROPERTY_ERS_ID}; + _propertyName:{ActivitySeineDto.PROPERTY_ERS_ID}; text:{getStringValue(bean.getErsId())}; } @@ -147,7 +151,7 @@ } #seaSurfaceTemperature { - property:{ActivitySeine.PROPERTY_SEA_SURFACE_TEMPERATURE}; + property:{ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE}; model:{bean.getSeaSurfaceTemperature()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; @@ -159,7 +163,7 @@ } #wind { - property:{ActivitySeine.PROPERTY_WIND}; + property:{ActivitySeineDto.PROPERTY_WIND}; selectedItem:{bean.getWind()}; } @@ -169,7 +173,7 @@ } #detectionMode { - property:{ActivitySeine.PROPERTY_DETECTION_MODE}; + property:{ActivitySeineDto.PROPERTY_DETECTION_MODE}; selectedItem:{bean.getDetectionMode()}; } @@ -179,7 +183,7 @@ } #reasonForNoFishing { - property:{ActivitySeine.PROPERTY_REASON_FOR_NO_FISHING}; + property:{ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING}; selectedItem:{bean.getReasonForNoFishing()}; } @@ -212,7 +216,7 @@ } #addSet { - enabled:{model.isValid() && bean.isSetOperation() && bean.getSetSeine() == null}; + enabled:{model.isValid()};//FIXME && bean.isSetOperation() && bean.getSetSeine() == null}; text:"observe.action.add.set"; toolTipText:"observe.action.add.set.tip"; actionIcon:"add"; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx index 58b3e55..88e96cd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -70,12 +70,12 @@ errorTableModel='{getErrorTableModel()}' context='n1-create'> - <field name='observedSystem' component='{actionDown}'/> + <!--<field name='observedSystem' component='{actionDown}'/>--> <field name='longitude' component='coordinatesEditor'/> <field name='latitude' component='coordinatesEditor'/> - <field name='quadrant' component='coordinatesEditor'/> - <field name='floatingObject' component='addDCP'/> + <!--<field name='quadrant' component='coordinatesEditor'/>--> + <!--<field name='floatingObject' component='addDCP'/>--> </BeanValidator> 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 6a11a9e..60ff366 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,9 +211,10 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei getUi().getCoordinatesEditor().setLatitudeAndLongitude(bean.getLatitude(), bean.getLongitude()); if (create) { - Integer quadrant = bean.getQuadrant(); + //FIXME +// Integer quadrant = bean.getQuadrant(); getUi().getCoordinatesEditor().setQuadrant(null); - getUi().getCoordinatesEditor().setQuadrant(quadrant); +// getUi().getCoordinatesEditor().setQuadrant(quadrant); } // on annule la modification engendree par ce binding diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css index ccb9fd3..a7ef119 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css @@ -40,7 +40,7 @@ NumberEditor { #date { date:{bean.getDate()}; formats:{"dd/MM/yyyy"}; - _propertyName:{Route.PROPERTY_DATE}; + _propertyName:{RouteDto.PROPERTY_DATE}; } #startLogValueLabel { @@ -49,7 +49,7 @@ NumberEditor { } #startLogValue { - property:{Route.PROPERTY_START_LOG_VALUE}; + property:{RouteDto.PROPERTY_START_LOG_VALUE}; model:{bean.getStartLogValue()}; } @@ -59,7 +59,7 @@ NumberEditor { } #endLogValue { - property:{Route.PROPERTY_END_LOG_VALUE}; + property:{RouteDto.PROPERTY_END_LOG_VALUE}; model:{bean.getEndLogValue()}; enabled:{!model.isCreatingMode()}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx index f7cca18..3031ea9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx @@ -50,7 +50,8 @@ beanClass='fr.ird.observe.services.dto.seine.RouteDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> - <field name='activitySeine' component='{actionDown}'/> + <!--FIXME--> + <!--<field name='activitySeine' component='{actionDown}'/>--> </BeanValidator> <!-- formulaire --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index f320700..d121325 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -275,7 +275,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { repaintTripNode(); } - @Override + //FIXME +// @Override // protected Route onCreate(TopiaContext tx, Object parent, Route editBean) throws TopiaException { // // TripSeine parentBean = (TripSeine) parent; @@ -296,6 +297,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { boolean dateHasChanged; + //FIXME // @Override // protected Route onUpdate(TopiaContext tx, Object parent, Route beanToSave) throws TopiaException { // @@ -313,6 +315,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // return beanToSave; // } + //FIXME // @Override // protected boolean doDelete(Route bean, // DataService dataService, @@ -464,7 +467,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { VesselActivitySeineDto vesselActivitySeine = null; for (Object o : selectedUI.getVesselActivitySeine().getData()) { - VesselActivitySeineDto a = (VesselActivitySeine) o; + VesselActivitySeineDto a = (VesselActivitySeineDto) o; // if (ActivitySeineImpl.ACTIVITY_FIN_DE_VEILLE.equals(a.getCode())) { // vesselActivitySeine = a; // break; @@ -472,7 +475,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } // on la positionne sur le bean d'édition - selectedUI.getBean().setVesselActivitySeine(vesselActivitySeine); + // FIXME +// selectedUI.getBean().setVesselActivitySeine(vesselActivitySeine); if (close) { // on sauvegarde l'activity diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index 7d1fa16..f6f99a1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -50,9 +50,10 @@ NumberEditor { } #observer { - property:{TripSeine.PROPERTY_OBSERVER}; + property:{TripSeineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - _listPredicate:{Persons.newObserverPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newObserverPredicate()}; } #captainLabel { @@ -61,9 +62,10 @@ NumberEditor { } #captain { - property:{TripSeine.PROPERTY_CAPTAIN}; + property:{TripSeineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - _listPredicate:{Persons.newCaptainPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newCaptainPredicate()}; } #dataEntryOperatorLabel { @@ -72,9 +74,10 @@ NumberEditor { } #dataEntryOperator { - property:{TripSeine.PROPERTY_DATA_ENTRY_OPERATOR}; + property:{TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - _listPredicate:{Persons.newDataEntryOperatorPredicate()}; + //FIXME + //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; } #vesselLabel { @@ -83,9 +86,10 @@ NumberEditor { } #vessel { - property:{TripSeine.PROPERTY_VESSEL}; + property:{TripSeineDto.PROPERTY_VESSEL}; selectedItem:{bean.getVessel()}; - _listPredicate:{Vessels.newVesselByVesselTypeIdPredicate(getConfig().getSeineVesselTypeIds())}; + //FIXME + //_listPredicate:{VesselDtos.newVesselByVesselTypeIdPredicate(getConfig().getSeineVesselTypeIds())}; } #oceanLabel { @@ -94,9 +98,10 @@ NumberEditor { } #ocean { - property:{TripSeine.PROPERTY_OCEAN}; + property:{TripSeineDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; - enabled:{canEditOcean(bean.getRoute())}; + //FIXME + //enabled:{canEditOcean(bean.getRoute())}; } #departureHarbourLabel { @@ -105,7 +110,7 @@ NumberEditor { } #departureHarbour { - property:{TripSeine.PROPERTY_DEPARTURE_HARBOUR}; + property:{TripSeineDto.PROPERTY_DEPARTURE_HARBOUR}; selectedItem:{bean.getDepartureHarbour()}; } @@ -115,7 +120,7 @@ NumberEditor { } #landingHarbour { - property:{TripSeine.PROPERTY_LANDING_HARBOUR}; + property:{TripSeineDto.PROPERTY_LANDING_HARBOUR}; selectedItem:{bean.getLandingHarbour()}; } @@ -126,11 +131,11 @@ NumberEditor { #resetErsId{ toolTipText:"observe.action.reset.ersId.tip"; - _resetPropertyName:{TripSeine.PROPERTY_ERS_ID}; + _resetPropertyName:{TripSeineDto.PROPERTY_ERS_ID}; } #ersId { - _propertyName:{TripSeine.PROPERTY_ERS_ID}; + _propertyName:{TripSeineDto.PROPERTY_ERS_ID}; text:{getStringValue(bean.getErsId())}; } @@ -140,7 +145,7 @@ NumberEditor { } #startDate { - _propertyName:{TripSeine.PROPERTY_START_DATE}; + _propertyName:{TripSeineDto.PROPERTY_START_DATE}; date:{bean.getStartDate()}; } @@ -150,7 +155,7 @@ NumberEditor { } #endDate { - _propertyName:{TripSeine.PROPERTY_END_DATE}; + _propertyName:{TripSeineDto.PROPERTY_END_DATE}; date:{bean.getEndDate()}; } @@ -160,12 +165,12 @@ NumberEditor { } #resetFormsUrl { - _resetPropertyName:{TripSeine.PROPERTY_FORMS_URL}; + _resetPropertyName:{TripSeineDto.PROPERTY_FORMS_URL}; toolTipText:"observe.action.reset.formsUrl.tip"; } #formsUrl { - _propertyName:{TripSeine.PROPERTY_FORMS_URL}; + _propertyName:{TripSeineDto.PROPERTY_FORMS_URL}; text:{getStringValue(bean.getFormsUrl())}; } @@ -183,12 +188,12 @@ NumberEditor { } #resetReportsUrl { - _resetPropertyName:{TripSeine.PROPERTY_REPORTS_URL}; + _resetPropertyName:{TripSeineDto.PROPERTY_REPORTS_URL}; toolTipText:"observe.action.reset.reportsUrl.tip"; } #reportsUrl { - _propertyName:{TripSeine.PROPERTY_REPORTS_URL}; + _propertyName:{TripSeineDto.PROPERTY_REPORTS_URL}; text:{getStringValue(bean.getReportsUrl())}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx index 8804f52..b7c7522 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -27,9 +27,9 @@ fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.seine.RouteDto fr.ird.observe.services.dto.referential.HarbourDto - fr.ird.observe.services.dto.referential.PersonDtosDto + fr.ird.observe.services.dto.referential.PersonDtos fr.ird.observe.services.dto.referential.VesselDto - fr.ird.observe.services.dto.referential.VesselDtosDto + fr.ird.observe.services.dto.referential.VesselDtos fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.ui.util.tripMap.TripMapUI @@ -63,7 +63,8 @@ errorTableModel='{getErrorTableModel()}' autoField='true' context='n1-update'> - <field name='route' component='{actionDown}'/> + <!--FIXME--> + <!--<field name='route' component='{actionDown}'/>--> </BeanValidator> <script><![CDATA[ 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 09e0311..7c964ae 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 @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; +import fr.ird.observe.ui.util.tripMap.TripMapUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -116,7 +117,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { TripSeineUI ui = getUi(); TripMapUI tripMap = ui.getTripMap(); - tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + //FIXME +// tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); } }); buildTripMap = false; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css index 0b70f35..8e94336 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css @@ -33,7 +33,7 @@ } #viewLayout { - /*useOnlyVisibleComponentDimensi/on:true;*/ + /*useOnlyVisibleComponentDimension:true;*/ selected:{getHandler().updateView(model.isEditing())}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx index 20a1b10..6bf5ce3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx @@ -22,10 +22,10 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends ReferenceDto'> + genericType='E extends ReferentialDto'> <import> - fr.ird.observe.services.dto.ReferenceDto + fr.ird.observe.services.dto.referential.ReferentialDto fr.ird.observe.ui.UIHelper fr.ird.observe.ui.actions.shared.DeleteReferenceUIAction 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 5f83a08..e3c78ff 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 @@ -21,48 +21,36 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.business.ObserveServiceHelper; 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.validation.ValidationContext; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.ui.usage.UsagesUI; import fr.ird.observe.ui.util.SpringUtilities; -import fr.ird.observe.business.validation.ValidationContext; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.CardLayout2Ext; -import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorUtil; 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.RowSorter; -import javax.swing.SortOrder; -import javax.swing.SpringLayout; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableCellRenderer; 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; @@ -110,10 +98,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content super(ui, null, null); } - public static <E extends TopiaEntity> void showUsagesForDelete( + public static <E extends IdDto> void showUsagesForDelete( JAXXContext tx, E entity, - Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> usages) { + Map<Class<? extends IdDto>, List<? extends IdDto>> usages) { DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); @@ -126,7 +114,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content String message2 = t("observe.message.show.usage.for.delete2"); UsagesUI usagesUI = new UsagesUI(tx); - usagesUI.init(message, message2, null, usages); + //FIXME + usagesUI.init(message, message2, null, null); UIHelper.askUser(null, t("observe.title.can.not.delete.referentiel"), @@ -137,10 +126,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content 0); } - public static <E extends TopiaEntity> boolean showUsagesForDesactivated( + public static <E extends IdDto> boolean showUsagesForDesactivated( JAXXContext tx, E entity, - Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> usages) { + Map<Class<? extends IdDto>, List<? extends IdDto>> usages) { DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); @@ -151,7 +140,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content String message3 = t("observe.message.show.usage.for.desactivated3"); UsagesUI usagesUI = new UsagesUI(tx); - usagesUI.init(message, message2, message3, usages); + + //FIXME + usagesUI.init(message, message2, message3, null); int reponse = UIHelper.askUser(null, t("observe.title.need.confirm.to.desactivate.referentiel"), @@ -180,7 +171,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // copy right now the selected bean to the model bean to respect contract // of parent handler (for delation or save objectOperation...) - getLoadBinder().load(selectedBean, getBean(), true); + //FIXME +// getLoadBinder().load(selectedBean, getBean(), true); } @@ -217,16 +209,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content Class<E> beanType = getBeanType(); - try { - entities = getDataService().loadDecoratedEntities(getDataSource(), - beanType); - - } catch (DataSourceException e) { - ErrorDialogUI.showError(e); - return; - } - - List<Object[]> datas = new ArrayList<Object[]>(entities.size()); + //FIXME +// try { +// entities = getDataService().loadDecoratedEntities(getDataSource(), +// beanType); +// +// } catch (DataSourceException e) { +// ErrorDialogUI.showError(e); +// return; +// } +// +// List<Object[]> datas = new ArrayList<Object[]>(entities.size()); String[] naturalIds = getModel().getNaturalIds(); int nbColumns = naturalIds.length + 1; @@ -236,74 +229,75 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content columns[0] = Introspector.decapitalize(beanType.getSimpleName()); DecoratorService dService = getDecoratorService(); - Loador<E> binder = getLoadBinder(); - - Decorator<E> decorator = dService.getDecoratorByType(beanType); - for (E e : entities) { - Map<String, Object> values = binder.obtainProperties(e, naturalIds); - Object[] data = new Object[nbColumns]; - int index = 0; - data[0] = decorator.toString(e); - for (String property : naturalIds) { - Object o = values.get(property); - if (ContentReferenceUIModel.DEFAULT_PROPERTIES[0].equals(property) && o == null) { - // cas special du code à 0, le loador ne retourne pas - // de valeur car c'est la valeur par defaut d'un type - // primitif, on force donc l'utilisation du zero. - o = 0; - } - if ("code".equals(property) && o == null) { - // cas special du code à 0, le loador ne retourne pas - // de valeur car c'est la valeur par defaut d'un type - // primitif, on force donc l'utilisation du zero. - o = 0; - } - if ("gender".equals(property) && o == null) { - // cas special du code à 0, le loador ne retourne pas - // de valeur car c'est la valeur par defaut d'un type - // primitif, on force donc l'utilisation du zero. - o = 0; - } - Object value; - if (o instanceof ReferenceEntity) { - // on doit decoree la valeur - Decorator<?> d = dService.getDecoratorByType(o.getClass()); - value = d.toString(o); - } else { - value = o; - } - data[++index] = value; - } - datas.add(data); - } - - JTable table = new JTable(new UniqueKeyTableModel(columns, datas)); - - table.setAutoCreateRowSorter(true); - table.getRowSorter().setSortKeys(Arrays.asList( - new RowSorter.SortKey(0, SortOrder.ASCENDING))); - table.setFillsViewportHeight(true); - JScrollPane pane = new JScrollPane(); - - getUi().decorateUniqueKeyTable(table, new DefaultTableCellRenderer(), pane); - - pane.setViewportView(table); - pane.setVerticalScrollBarPolicy( - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - - String title = t("observe.title.unique.key", - t(DecoratorService.getEntityLabel(beanType))); - - pane.setBorder(new TitledBorder(title)); - - JPopupMenu popup = new JPopupMenu(); - popup.setBorder(null); - popup.add(pane); - popup.pack(); - Dimension dim = popup.getPreferredSize(); - int x = (int) (button.getPreferredSize().getWidth() - dim.getWidth()); - int y = button.getHeight(); - popup.show(button, x, y); + //FIXME +// Loador<E> binder = getLoadBinder(); +// +// Decorator<E> decorator = dService.getDecoratorByType(beanType); +// for (E e : entities) { +// Map<String, Object> values = binder.obtainProperties(e, naturalIds); +// Object[] data = new Object[nbColumns]; +// int index = 0; +// data[0] = decorator.toString(e); +// for (String property : naturalIds) { +// Object o = values.get(property); +// if (ContentReferenceUIModel.DEFAULT_PROPERTIES[0].equals(property) && o == null) { +// // cas special du code à 0, le loador ne retourne pas +// // de valeur car c'est la valeur par defaut d'un type +// // primitif, on force donc l'utilisation du zero. +// o = 0; +// } +// if ("code".equals(property) && o == null) { +// // cas special du code à 0, le loador ne retourne pas +// // de valeur car c'est la valeur par defaut d'un type +// // primitif, on force donc l'utilisation du zero. +// o = 0; +// } +// if ("gender".equals(property) && o == null) { +// // cas special du code à 0, le loador ne retourne pas +// // de valeur car c'est la valeur par defaut d'un type +// // primitif, on force donc l'utilisation du zero. +// o = 0; +// } +// Object value; +// if (o instanceof ReferenceEntity) { +// // on doit decoree la valeur +// Decorator<?> d = dService.getDecoratorByType(o.getClass()); +// value = d.toString(o); +// } else { +// value = o; +// } +// data[++index] = value; +// } +// datas.add(data); +// } +// +// JTable table = new JTable(new UniqueKeyTableModel(columns, datas)); +// +// table.setAutoCreateRowSorter(true); +// table.getRowSorter().setSortKeys(Arrays.asList( +// new RowSorter.SortKey(0, SortOrder.ASCENDING))); +// table.setFillsViewportHeight(true); +// JScrollPane pane = new JScrollPane(); +// +// getUi().decorateUniqueKeyTable(table, new DefaultTableCellRenderer(), pane); +// +// pane.setViewportView(table); +// pane.setVerticalScrollBarPolicy( +// JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); +// +// String title = t("observe.title.unique.key", +// t(DecoratorService.getEntityLabel(beanType))); +// +// pane.setBorder(new TitledBorder(title)); +// +// JPopupMenu popup = new JPopupMenu(); +// popup.setBorder(null); +// popup.add(pane); +// popup.pack(); +// Dimension dim = popup.getPreferredSize(); +// int x = (int) (button.getPreferredSize().getWidth() - dim.getWidth()); +// int y = button.getHeight(); +// popup.show(button, x, y); } public void showUsages() { @@ -317,16 +311,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } // recherche des utilisation du bean dans la base - EntityMap usages; - try { - usages = getDataService().findAllUsages(getDataSource(), bean); - } catch (DataSourceException e) { - ErrorDialogUI.showError(e); - if (log.isErrorEnabled()) { - log.error(e); - } - return; - } + //FIXME +// EntityMap usages; +// try { +// usages = getDataService().findAllUsages(getDataSource(), bean); +// } catch (DataSourceException e) { +// ErrorDialogUI.showError(e); +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// return; +// } DecoratorService dService = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = dService.getDecoratorByType(bean.getClass()); String type = DecoratorService.getEntityLabel(bean.getClass()); @@ -337,7 +332,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ContentReferenceUI<E> ui = getUi(); UsagesUI usagesUI = new UsagesUI(ui); - usagesUI.init(message, null, null, usages); + //FIXME + usagesUI.init(message, null, null, null); UIHelper.askUser(ui, t("observe.title.show.usage"), @@ -355,18 +351,19 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content */ public void showTechnicalInformations(JButton button) { - ReferenceEntity bean = getModel().isEditing() ? getBean() : getModel().getSelectedBean(); + ReferentialDto bean = getModel().isEditing() ? getBean() : getModel().getSelectedBean(); JPanel content = new JPanel(new SpringLayout()); content.add(new JLabel(t("observe.common.topiaId"))); - content.add(new JLabel(bean.getTopiaId())); + content.add(new JLabel(bean.getId())); - content.add(new JLabel(t("observe.common.topiaCreateDate"))); - content.add(new JLabel(bean.getTopiaCreateDate().toString())); - - content.add(new JLabel(t("observe.common.topiaVersion"))); - content.add(new JLabel(bean.getTopiaVersion() + "")); + //FIXME +// content.add(new JLabel(t("observe.common.topiaCreateDate"))); +// content.add(new JLabel(bean.getTopiaCreateDate().toString())); +// +// content.add(new JLabel(t("observe.common.topiaVersion"))); +// content.add(new JLabel(bean.getTopiaVersion() + "")); SpringUtilities.makeCompactGrid(content, 3, 2, 5, 5, 5, 5); @@ -412,15 +409,15 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content public void openUI() throws Exception { super.openUI(); - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); ContentReferenceUI<E> ui = getUi(); - if (I18nReferenceEntity.class.isAssignableFrom(model.getBeanType())) { + if (I18nReferentialDto.class.isAssignableFrom(model.getBeanType())) { // on met en gras le libelle selectionne en base - ReferenceLocale localeEnum; - localeEnum = ReferenceLocale.valueOf( + ReferentialLocale localeEnum; + localeEnum = ReferentialLocale.valueOf( ui.getConfig().getDbLocale()); String libelleName = localeEnum.getLibelle() + "Label"; for (int i = 1; i <= 8; i++) { @@ -473,7 +470,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); E bean = model.getBean(); ContentMode mode = model.getMode(); @@ -490,16 +487,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content addInfoMessage(t("observe.message.creating.referentiel")); // creation mode - try { - getDataService().preCreate(getDataSource(), - null, - bean, - getLoadBinder(), - getPreCreateExecutor() - ); - } catch (DataSourceException e) { - ErrorDialogUI.showError(e); - } + //FIXME +// try { +// getDataService().preCreate(getDataSource(), +// null, +// bean, +// getLoadBinder(), +// getPreCreateExecutor() +// ); +// } catch (DataSourceException e) { +// ErrorDialogUI.showError(e); +// } } else { addInfoMessage(t("observe.message.updating.referentiel")); @@ -556,7 +554,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content log.debug("Will create new entity [" + getModel().getBeanType() + "]"); } - getLoadBinder().load(null, getBean(), true); + //FIXME +// getLoadBinder().load(null, getBean(), true); // on demarre l'edition ui.startEdit(null); @@ -564,14 +563,15 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content public void modifyUI() { - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); if (model.getMode() != ContentMode.READ) { // force le mode mise a jour model.setMode(ContentMode.UPDATE); } - getLoadBinder().load(model.getSelectedBean(), getBean(), true); + //FIXME +// getLoadBinder().load(model.getSelectedBean(), getBean(), true); getUi().startEdit(null); } @@ -581,7 +581,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content super.stopEditUI(); ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); if (model.getMode() != ContentMode.READ) { @@ -605,199 +605,205 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } public void backToList() { - ContentReferenceUIModel<EDto> model = getModel(); + ContentReferenceUIModel<E> model = getModel(); if (!model.isModified() || checkEdit(getUi())) { getUi().stopEdit(); // then resynch the selected bean to edit bean (used for // example to delete)... // repush selected bean to bean - getLoadBinder().load(model.getSelectedBean(), getBean(), true); - } - } - - @Override - protected boolean doSave(E bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<E> binder) throws Exception { - - ContentReferenceUIModel<EDto> model = getModel(); - - if (bean.getTopiaId() == null) { - - if (log.isInfoEnabled()) { - log.info("Create referentiel " + bean); - } - dataService.create(dataSource, - null, - bean, - binder, - getCreateExecutor() - ); - - if (bean instanceof Program) { - - // add the program in tree - ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.addProgram((Program) bean); - } - - return true; - } - - if (log.isInfoEnabled()) { - log.info("Will update exisintg entity : " + bean.getTopiaId()); - } - // le bean original - E oldBean = model.getSelectedBean(); - - if (oldBean != null && - oldBean.getStatus() == ReferenceStatus.enabled && - bean.getStatus() == ReferenceStatus.disabled) { - - // l'entite a ete desactive - // on recherche les objets utilisant cette entitee - // on indique a l'utilisateur ce changement - if (log.isDebugEnabled()) { - log.debug("entity status was desactivated, looking " + - "for usage"); - } - EntityMap usages = dataService.findAllUsages(dataSource, bean); - - if (usages.isEmpty()) { - if (log.isInfoEnabled()) { - log.info("No usage found, no warning to display"); - } - } else { - // some usages were found - boolean willsave = showUsagesForDesactivated(getUi(), bean, - usages); - if (!willsave) { - if (log.isDebugEnabled()) { - log.debug("User refuses to continue, skip " + - "saving..."); - } - return false; - } - } - } - // sauvegarde du bean d'edition dans le bean de la base - bean = dataService.update(dataSource, - null, // pas de parent a sauvegarder - bean, - getUpdateExecutor() - ); - - if (bean instanceof Program) { - - // update the program in tree - ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.updateProgram((Program) bean); + //FIXME +// getLoadBinder().load(model.getSelectedBean(), getBean(), true); } - - return true; } - @Override - protected E onUpdate(TopiaContext tx, - Object parentBean, - E beanToSave) throws TopiaException { + //FIXME +// @Override +// protected boolean doSave(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<E> binder) throws Exception { +// +// ContentReferenceUIModel<EDto> model = getModel(); +// +// if (bean.getTopiaId() == null) { +// +// if (log.isInfoEnabled()) { +// log.info("Create referentiel " + bean); +// } +// dataService.create(dataSource, +// null, +// bean, +// binder, +// getCreateExecutor() +// ); +// +// if (bean instanceof Program) { +// +// // add the program in tree +// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); +// treeHelper.addProgram((Program) bean); +// } +// +// return true; +// } +// +// if (log.isInfoEnabled()) { +// log.info("Will update exisintg entity : " + bean.getTopiaId()); +// } +// // le bean original +// E oldBean = model.getSelectedBean(); +// +// if (oldBean != null && +// oldBean.getStatus() == ReferenceStatus.enabled && +// bean.getStatus() == ReferenceStatus.disabled) { +// +// // l'entite a ete desactive +// // on recherche les objets utilisant cette entitee +// // on indique a l'utilisateur ce changement +// if (log.isDebugEnabled()) { +// log.debug("entity status was desactivated, looking " + +// "for usage"); +// } +// EntityMap usages = dataService.findAllUsages(dataSource, bean); +// +// if (usages.isEmpty()) { +// if (log.isInfoEnabled()) { +// log.info("No usage found, no warning to display"); +// } +// } else { +// // some usages were found +// boolean willsave = showUsagesForDesactivated(getUi(), bean, +// usages); +// if (!willsave) { +// if (log.isDebugEnabled()) { +// log.debug("User refuses to continue, skip " + +// "saving..."); +// } +// return false; +// } +// } +// } +// // sauvegarde du bean d'edition dans le bean de la base +// bean = dataService.update(dataSource, +// null, // pas de parent a sauvegarder +// bean, +// getUpdateExecutor() +// ); +// +// if (bean instanceof Program) { +// +// // update the program in tree +// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); +// treeHelper.updateProgram((Program) bean); +// } +// +// return true; +// } - getLoadBinder().copy(getBean(), beanToSave); - return beanToSave; - } + //FIXME +// @Override +// protected E onUpdate(TopiaContext tx, +// Object parentBean, +// E beanToSave) throws TopiaException { +// +// getLoadBinder().copy(getBean(), beanToSave); +// return beanToSave; +// } + //FIXME @Override - protected boolean doDelete(E bean, - DataService dataService, - DataSource dataSource, - TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { - - ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<EDto> model = getModel(); - - if (log.isInfoEnabled()) { - log.info("entity to be deleted, looking for usage"); - } - - // recherche des utilisation du bean dans la base - EntityMap usages = dataService.findAllUsages(getDataSource(), bean); - - if (usages.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("No usage found, no warning to display"); - } - } else { - - // some usages were found - if (log.isDebugEnabled()) { - log.debug("can not delete referentiel entity (found usages)"); - } - showUsagesForDelete(ui, bean, usages); - return false; - } - - if (!UIHelper.confirmForEntityDelete(ui, model.getBeanType(), bean)) { - return false; - } - - String beanId = bean.getTopiaId(); - dataService.delete(dataSource, null, bean, deletor); - - if (bean instanceof Program) { - - // remove the program in tree - ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.removeProgram(beanId); - } - return true; - } +// protected boolean doDelete(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { +// +// ContentReferenceUI<E> ui = getUi(); +// ContentReferenceUIModel<EDto> model = getModel(); +// +// if (log.isInfoEnabled()) { +// log.info("entity to be deleted, looking for usage"); +// } +// +// // recherche des utilisation du bean dans la base +// EntityMap usages = dataService.findAllUsages(getDataSource(), bean); +// +// if (usages.isEmpty()) { +// if (log.isDebugEnabled()) { +// log.debug("No usage found, no warning to display"); +// } +// } else { +// +// // some usages were found +// if (log.isDebugEnabled()) { +// log.debug("can not delete referentiel entity (found usages)"); +// } +// showUsagesForDelete(ui, bean, usages); +// return false; +// } +// +// if (!UIHelper.confirmForEntityDelete(ui, model.getBeanType(), bean)) { +// return false; +// } +// +// String beanId = bean.getTopiaId(); +// dataService.delete(dataSource, null, bean, deletor); +// +// if (bean instanceof Program) { +// +// // remove the program in tree +// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); +// treeHelper.removeProgram(beanId); +// } +// return true; +// } - @Override - protected void onDelete(TopiaContext tx, - Object parentBean, - E beanToDelete) throws TopiaException { - TopiaDAO<E> dao = getDataSource().getDAO(tx, beanToDelete); - dao.delete(beanToDelete); - } + //FIXME +// @Override +// protected void onDelete(TopiaContext tx, +// Object parentBean, +// E beanToDelete) throws TopiaException { +// TopiaDAO<E> dao = getDataSource().getDAO(tx, beanToDelete); +// dao.delete(beanToDelete); +// } - @Override protected void afterSave(boolean refresh) { super.afterSave(refresh); getUi().stopEdit(); } - @Override - protected E onPreCreate(TopiaContext tx, - Object parent, - E bean) throws TopiaException { - - // par defaut, les objets en creation sont activés - bean.setTopiaId(null); - bean.setTopiaCreateDate(null); - bean.setTopiaVersion(0); - bean.setStatus(ReferenceStatus.enabled); - return bean; - } - - @Override - protected final E onCreate(TopiaContext tx, - Object parent, - E editBean) throws TopiaException { - - // obtention du dictionnaire de la clef metier - Map<String, Object> properties = - getLoadBinder().obtainProperties(editBean, getModel().getNaturalIds()); - - // creation de l'entite - TopiaDAO<E> dao = getDataSource().getDAO(tx, getModel().getBeanType()); - E beanToSave = dao.create(properties); + //FIXME +// @Override +// protected E onPreCreate(TopiaContext tx, +// Object parent, +// E bean) throws TopiaException { +// +// // par defaut, les objets en creation sont activés +// bean.setTopiaId(null); +// bean.setTopiaCreateDate(null); +// bean.setTopiaVersion(0); +// bean.setStatus(ReferenceStatus.enabled); +// return bean; +// } - // application du topiaId sur le bean d'édition - editBean.setTopiaId(beanToSave.getTopiaId()); - return beanToSave; - } + //FIXME +// @Override +// protected final E onCreate(TopiaContext tx, +// Object parent, +// E editBean) throws TopiaException { +// +// // obtention du dictionnaire de la clef metier +// Map<String, Object> properties = +// getLoadBinder().obtainProperties(editBean, getModel().getNaturalIds()); +// +// // creation de l'entite +// TopiaDAO<E> dao = getDataSource().getDAO(tx, getModel().getBeanType()); +// E beanToSave = dao.create(properties); +// +// // application du topiaId sur le bean d'édition +// editBean.setTopiaId(beanToSave.getTopiaId()); +// return beanToSave; +// } public <I> int[] updateIndices(JList jlist, Collection<I> list) { if (log.isDebugEnabled()) { @@ -826,8 +832,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } public boolean canSeeI18nTable(E bean) { - return bean instanceof I18nReferenceEntity || - bean instanceof VesselSizeCategory; + return bean instanceof I18nReferentialDto || + bean instanceof VesselSizeCategoryDto; } public void decorateUniqueKeyTable(JTable table, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx index 6bde997..39417f4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ContentUI - superGenericType='Program' + superGenericType='ProgramDto'
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 897877d..381f935 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 @@ -24,6 +24,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.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -33,7 +34,7 @@ import fr.ird.observe.ui.content.ContentUIHandler; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReferenceHomeUIHandler extends ContentUIHandler<Program> { +public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto> { public ReferenceHomeUIHandler(ReferenceHomeUI ui) { super(ui, null, null); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index a8d8bad..3d2430b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -27,6 +27,8 @@ import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.ObserveContentUI; @@ -36,8 +38,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import javax.swing.JList; import javax.swing.ListCellRenderer; @@ -71,10 +71,13 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend * des entités * @since 1.5 */ - public static <E extends TopiaEntity> void prepareEntityList(DataSource storageService, + public static <E extends AbstractObserveDto> void prepareEntityList(DataSource storageService, Class<E> entityClass, BeanListHeader<E> list, - TopiaEntityBinder<E> loador) throws DataSourceException { + Object loador + //FIXME +// TopiaEntityBinder<E> loador + ) throws DataSourceException { ObserveContext tx = ObserveContext.get(); @@ -133,7 +136,7 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend if ("listHeader".equals(beanList.getName())) { // use the binder for loading - prepareEntityList(service, beanList.getBeanType(), beanList, ui.getModel().getLoadBinder()); + prepareEntityList(service, beanList.getBeanType(), beanList, null);//FIXME ui.getModel().getLoadBinder()); } else { @@ -145,12 +148,12 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend Object init = jlist.getClientProperty("addDecorator"); if (init != null) { - Class<TopiaEntity> klass = (Class<TopiaEntity>) init; + Class<AbstractObserveDto> klass = (Class<AbstractObserveDto>) init; if (log.isDebugEnabled()) { log.debug("addDecorator to list " + jlist.getName()); } - Decorator<TopiaEntity> decorator; + Decorator<AbstractObserveDto> decorator; decorator = decoratorService.getDecoratorByType(klass); jlist.putClientProperty("decorator", decorator); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css index 9d50757..f31f265 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css @@ -26,7 +26,7 @@ } #gearCaracteristicType { - property:{GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE}; + property:{GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE}; bean:{bean}; selectedItem:{bean.getGearCaracteristicType()}; showReset:{true}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css index 731fe9d..72620c4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css @@ -40,8 +40,10 @@ } #gearCaracteristic { - property:{Gear.PROPERTY_GEAR_CARACTERISTIC}; - selected:{bean.getGearCaracteristic()}; + //FIXME + //property:{GearDto.PROPERTY_GEAR_CARACTERISTIC}; + //FIXME + //selected:{bean.getGearCaracteristic()}; _validatorLabel: {t("observe.gear.gearCaracteristic")}; showListLabel: true; universeLabel:{t("observe.gear.availableGearCaracteristic")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java index 3a3a664..1f3c332 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUIHandler extends ContentReferenceUIHandler<Gear> { +public class GearUIHandler extends ContentReferenceUIHandler<GearDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class GearUIHandler extends ContentReferenceUIHandler<Gear> { } }; - public GearUIHandler(ContentReferenceUI<Gear> ui) { + public GearUIHandler(ContentReferenceUI<GearDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class GearUIHandler extends ContentReferenceUIHandler<Gear> { } @Override - public void selectBean(Gear selectedBean) { + public void selectBean(GearDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css index 6be56fe..e653e81 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css @@ -55,9 +55,9 @@ } #coordinates { - propertyLatitude:{Harbour.PROPERTY_LATITUDE}; - propertyLongitude:{Harbour.PROPERTY_LONGITUDE}; - propertyQuadrant:{Harbour.PROPERTY_QUADRANT}; + propertyLatitude:{HarbourDto.PROPERTY_LATITUDE}; + propertyLongitude:{HarbourDto.PROPERTY_LONGITUDE}; + propertyQuadrant:{HarbourDto.PROPERTY_QUADRANT}; latitude:{bean.getLatitude()}; longitude:{bean.getLongitude()}; quadrant:{bean.getQuadrant()}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java index a127bc5..b387c93 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java @@ -36,7 +36,7 @@ public class HarbourUIModel extends ContentReferenceUIModel<HarbourDto> { private static final long serialVersionUID = 1L; public HarbourUIModel() { - super(Harbour.class, + super(HarbourDto.class, new String[]{HarbourDto.PROPERTY_NAME, HarbourDto.PROPERTY_COUNTRY, HarbourDto.PROPERTY_LOCODE, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java index 9f320e7..0e3a1d9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameter> { +public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameterDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le } }; - public LengthWeightParameterUIHandler(ContentReferenceUI<LengthWeightParameter> ui) { + public LengthWeightParameterUIHandler(ContentReferenceUI<LengthWeightParameterDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le } @Override - public void selectBean(LengthWeightParameter selectedBean) { + public void selectBean(LengthWeightParameterDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css index 603c2b5..e1e7fbf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css @@ -68,7 +68,7 @@ } #country { - property:{Person.PROPERTY_COUNTRY}; + property:{PersonDto.PROPERTY_COUNTRY}; bean:{bean}; selectedItem:{bean.getCountry()}; showReset:{true}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java index 2274dda..84aac6b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class ProgramUIHandler extends ContentReferenceUIHandler<Program> { +public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<Program> { } }; - public ProgramUIHandler(ContentReferenceUI<Program> ui) { + public ProgramUIHandler(ContentReferenceUI<ProgramDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<Program> { } @Override - public void selectBean(Program selectedBean) { + public void selectBean(ProgramDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx index ebca2fa..83e1c2e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Sex' + superGenericType='SexDto' contentTitle='{n("observe.title.content.sexx")}' listText='{n("observe.list.sex")}' createToolTip='{n("observe.action.sex.create.tip")}' diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css index 1915ed9..0f670ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css @@ -40,8 +40,10 @@ } #species { - property: species; - selected:{bean.getSpecies()}; + //FIXME + //property: species; + //FIXME + //selected:{bean.getSpecies()}; _validatorLabel: {t("observe.common.species")}; showListLabel: true; universeLabel:{t("observe.speciesList.availableSpecies")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java index 87a4b59..7969a5f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesList> { +public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesList> } }; - public SpeciesListUIHandler(ContentReferenceUI<SpeciesList> ui) { + public SpeciesListUIHandler(ContentReferenceUI<SpeciesListDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesList> } @Override - public void selectBean(SpeciesList selectedBean) { + public void selectBean(SpeciesListDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css index 96c6334..452a8e4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css @@ -70,7 +70,8 @@ #ocean { property: ocean; - selected:{bean.getOcean()}; + //FIXME + //selected:{bean.getOcean()}; _validatorLabel: {t("observe.common.ocean")}; showListLabel: true; universeLabel:{t("observe.species.availableOcean")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java index ca42586..f85adb8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SpeciesUIHandler extends ContentReferenceUIHandler<Species> { +public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<Species> { } }; - public SpeciesUIHandler(ContentReferenceUI<Species> ui) { + public SpeciesUIHandler(ContentReferenceUI<SpeciesDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<Species> { } @Override - public void selectBean(Species selectedBean) { + public void selectBean(SpeciesDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java index 057579b..90dec36 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java @@ -40,7 +40,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class VesselUIHandler extends ContentReferenceUIHandler<Vessel> { +public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { @@ -53,7 +53,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<Vessel> { } }; - public VesselUIHandler(ContentReferenceUI<Vessel> ui) { + public VesselUIHandler(ContentReferenceUI<VesselDto> ui) { super(ui); } @@ -70,7 +70,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<Vessel> { } @Override - public void selectBean(Vessel selectedBean) { + public void selectBean(VesselDto selectedBean) { super.selectBean(selectedBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx index af24152..1a43b66 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.seine.ObservedSystem' + beanClass='fr.ird.observe.services.dto.referential.seine.ObservedSystemDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx index f28325e..1861114 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='TransmittingBuoyType' + superGenericType='TransmittingBuoyTypeDto' contentTitle='{n("observe.title.content.transmittingBuoyTypes")}' listText='{n("observe.list.transmittingBuoyType")}' createToolTip='{n("observe.action.transmittingBuoyType.create.tip")}' @@ -37,7 +37,7 @@ <import> fr.ird.observe.services.dto.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.seine.TransmittingBuoyType + fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.seine.TransmittingBuoyType' + beanClass='fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <TransmittingBuoyTypeUIModel id='model'/> <!-- edit bean --> - <TransmittingBuoyType id='bean'/> + <TransmittingBuoyTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx index 046db82..cbf8ba3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx @@ -87,7 +87,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='species' constructorParams='this' - genericType='Species'/> + genericType='SpeciesDto'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css index c157180..8901b79 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css @@ -47,6 +47,6 @@ BeanComboBox { } #comment2 { - _propertyName: {CommentableEntity.PROPERTY_COMMENT}; + _propertyName: {CommentableDto.PROPERTY_COMMENT}; text:{getStringValue(bean.getComment())}; } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java index a114d48..cd256c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.UIHelper; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.validator.swing.SwingValidator; @@ -30,12 +31,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import javax.swing.JOptionPane; +import javax.swing.*; import javax.swing.table.AbstractTableModel; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -69,7 +69,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractObserveDto> extends AbstractTableModel { +public class ContentTableModel<P extends AbstractObserveDto, B extends IdDto> extends AbstractTableModel { /** Le nom de la propriété de la ligne en cours d'édition */ public static final String SELECTED_ROW_PROPERTY = "selectedRow"; @@ -397,7 +397,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO beanToBind = getValueAt(row); // on charge le bean d'edition - getChildLoador().load(beanToBind, getRowBean(), true); + //FIXME +// getChildLoador().load(beanToBind, getRowBean(), true); // on modifie la ligne d'edition setSelectedRow(row); @@ -419,7 +420,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO // mettre a jour la ligne B bean = getValueAt(editingRow); - getChildLoador().load(getRowBean(), bean, true); + //FIXME +// getChildLoador().load(getRowBean(), bean, true); fireTableRowsUpdated(editingRow, editingRow); if (create) { @@ -443,7 +445,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO public void resetEditBean() { B bean = getValueAt(getSelectedRow()); - getChildLoador().load(bean, getRowBean(), true); + //FIXME +// getChildLoador().load(bean, getRowBean(), true); // plus de modification sur le bean d'edition getValidator().setChanged(false); } @@ -454,15 +457,17 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO return handler; } - protected Loador<B> getChildLoador() { - ContentTableUIModel<P, B> model = getModel(); - return model.getChildLoador(); - } + //FIXME +// protected Loador<B> getChildLoador() { +// ContentTableUIModel<P, B> model = getModel(); +// return model.getChildLoador(); +// } - protected EntityListUpdator<P, B> getChildsUpdator() { - ContentTableUIModel<P, B> model = getModel(); - return model.getChildsUpdator(); - } + //FIXME +// protected EntityListUpdator<P, B> getChildsUpdator() { +// ContentTableUIModel<P, B> model = getModel(); +// return model.getChildsUpdator(); +// } protected P getBean() { ContentTableUIModel<P, B> model = getModel(); @@ -537,12 +542,13 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO // on recupere donc la liste a partir du bean principal P bean = getBean(); - Collection<B> childs = getChildsUpdator().getChilds(bean); - if (childs == null || childs.isEmpty()) { - data = new ArrayList<B>(); - } else { - data = new ArrayList<B>(childs); - } + //FIXME +// Collection<B> childs = getChildsUpdator().getChilds(bean); +// if (childs == null || childs.isEmpty()) { +// data = new ArrayList<B>(); +// } else { +// data = new ArrayList<B>(childs); +// } } else { // le modèle n'est pas encore initialisé // on retourne donc une liste vide @@ -730,7 +736,8 @@ public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractO // on repositionne la liste sur le bean principal // pour avoir la validation en temps reel sur le bean principal - getChildsUpdator().setChilds(getBean(), data); + //FIXME +// getChildsUpdator().setChilds(getBean(), data); parentValidator.doValidate(); if (!shouldChanged && !wasChanged) { // on repositionne le drapeau changed a faux diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx index 565bbaf..acf9cb9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx @@ -23,7 +23,7 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' implements="fr.ird.observe.ui.content.table.ObserveContentTableUI<E,D>" - genericType='E extends AbstractObserveDto, D extends AbstractObserveDto'> + genericType='E extends IdDto, D extends IdDto'> <import> fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -33,6 +33,7 @@ jaxx.runtime.validator.swing.SwingValidator fr.ird.observe.services.dto.AbstractObserveDto + fr.ird.observe.services.dto.IdDto java.awt.Dimension @@ -72,7 +73,7 @@ <!-- le bloqueur de l'editeur d'une entrée du tableau --> <BlockingLayerUI id='editorBlockLayerUI'/> - <AbstractObserveDto id='tableEditBean' initializer='getModel().getTableEditBean()'/> + <IdDto id='tableEditBean' initializer='getModel().getTableEditBean()'/> <!-- icone des donnees observees --> <Icon id='iconDataObserve' initializer='SwingUtil.getUIManagerActionIcon("data-observe")'/> 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 3463f60..031cef8 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 @@ -21,15 +21,13 @@ */ package fr.ird.observe.ui.content.table; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; 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.AbstractObserveDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -39,12 +37,6 @@ import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.Loador; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -69,7 +61,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ContentUIHandler<E> { +public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D extends IdDto> extends ContentUIHandler<E> { /** Logger */ private static Log log = LogFactory.getLog(ContentTableUIHandler.class); @@ -192,66 +184,70 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte protected abstract void initTableUI(DefaultTableCellRenderer renderer); - protected abstract String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException; - - protected E loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); - - if (id == null) { - throw new IllegalStateException("Could not find id form " + this); - } - - E editBean = getBean(); - - // preparation du bean d'édition - dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - - getModel().setMode(mode); - - // initialisation du modèle du tableau - getUi().getTableModel().attachModel(); - - return editBean; - } - - @Override - protected final void onLoad(TopiaContext tx, E bean) throws TopiaException { - super.onLoad(tx, bean); - - // on duplique la liste des fils traites dans le tableau - // sinon on reste sur les references d'origine et on aura pas - // la possibilité d'annuler l'edition ensuite car on aura modifie - // les entrées d'origine... - E editBean = getBean(); - Collection<D> data = loadChilds(tx, editBean); - getModel().getChildsUpdator().setChilds(editBean, data); - } - - protected Collection<D> loadChilds(TopiaContext tx, E bean) throws TopiaException { - Collection<D> childs = getModel().getChildsUpdator().getChilds(bean); - Collection<D> data = new ArrayList<D>(); - if (CollectionUtils.isNotEmpty(childs)) { - Loador<D> loader = getModel().getChildLoador(); - TopiaDAO<D> dao = getDataSource().getDAO(tx, getTableEditBean()); - for (D c : childs) { - try { - D cUp = dao.findByTopiaId(c.getTopiaId()); - D c2 = getModel().newTableEditBean(); - loader.load(cUp, c2, true); - data.add(c2); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return data; - } + //FIXME +// protected abstract String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException; + + //FIXME +// protected E loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); +// +// if (id == null) { +// throw new IllegalStateException("Could not find id form " + this); +// } +// +// E editBean = getBean(); +// +// // preparation du bean d'édition +// dataService.loadEditEntity(dataSource, id, getLoadExecutor()); +// +// getModel().setMode(mode); +// +// // initialisation du modèle du tableau +// getUi().getTableModel().attachModel(); +// +// return editBean; +// } + + //FIXME +// @Override +// protected final void onLoad(TopiaContext tx, E bean) throws TopiaException { +// super.onLoad(tx, bean); +// +// // on duplique la liste des fils traites dans le tableau +// // sinon on reste sur les references d'origine et on aura pas +// // la possibilité d'annuler l'edition ensuite car on aura modifie +// // les entrées d'origine... +// E editBean = getBean(); +// Collection<D> data = loadChilds(tx, editBean); +// getModel().getChildsUpdator().setChilds(editBean, data); +// } + + //FIXME +// protected Collection<D> loadChilds(TopiaContext tx, E bean) throws TopiaException { +// Collection<D> childs = getModel().getChildsUpdator().getChilds(bean); +// Collection<D> data = new ArrayList<D>(); +// if (CollectionUtils.isNotEmpty(childs)) { +// Loador<D> loader = getModel().getChildLoador(); +// TopiaDAO<D> dao = getDataSource().getDAO(tx, getTableEditBean()); +// for (D c : childs) { +// try { +// D cUp = dao.findByTopiaId(c.getTopiaId()); +// D c2 = getModel().newTableEditBean(); +// loader.load(cUp, c2, true); +// data.add(c2); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// return data; +// } @Override public void initUI() throws Exception { @@ -264,16 +260,19 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte public Set<String> loadSpeciesList(String speciesListId, String errorMessage) { - Set<String> speciesIds; - try { - speciesIds = getDataService().getSpeciesListSpeciesIds(getDataSource(), speciesListId); - } catch (Exception e) { - - UIHelper.displayWarning(t("observe.title.speciesList.not.found"), t(errorMessage)); - speciesIds = Collections.emptySet(); + //FIXME +// Set<String> speciesIds; +// try { +// speciesIds = getDataService().getSpeciesListSpeciesIds(getDataSource(), speciesListId); +// } catch (Exception e) { +// +// UIHelper.displayWarning(t("observe.title.speciesList.not.found"), t(errorMessage)); +// speciesIds = Collections.emptySet(); +// +// } +// return speciesIds; - } - return speciesIds; + return null; } @@ -281,9 +280,10 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte protected void prepareSpeciesList(String speciesListId, JComponent speciesComponent, String errorMessage) throws DataSourceException { Set<String> speciesIds = loadSpeciesList(speciesListId, errorMessage); - speciesComponent.putClientProperty( - ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE, - Species2.newSpeciesByIdPredicate(speciesIds)); + //FIXME +// speciesComponent.putClientProperty( +// ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE, +// Species2.newSpeciesByIdPredicate(speciesIds)); } @Override @@ -301,7 +301,8 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte ui.getTableModel().dettachModel(); // chargement du bean d'édition - loadEditBean(mode, getDataContext(), getDataService(), getDataSource()); + //FIXME +// loadEditBean(mode, getDataContext(), getDataService(), getDataSource()); boolean canEdit = mode == ContentMode.UPDATE; @@ -359,97 +360,100 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte } } - @Override - protected boolean doSave(E bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<E> binder) throws Exception { - - ObserveContentTableUI<E, D> ui = getUi(); - - List<D> objets = ui.getTableModel().getData(); - - boolean canContinue; - try { - canContinue = prepareSave(bean, objets); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error(e); - } - ErrorDialogUI.showError(e); - canContinue = false; - } - if (!canContinue) { - - // l'utilisateur a choisi de ne pas sauvegarder - return false; - } - doPersist(bean, dataService, dataSource); - - - return true; - } - - protected void doPersist(E bean, DataService dataService, DataSource dataSource) throws DataSourceException { - // sauvegarde du bean en base - dataService.update(dataSource, null, bean, getUpdateExecutor()); - } - - @Override - protected E onUpdate(TopiaContext tx, Object parentBean, E beanToSave) throws TopiaException { - - List<D> childs = getUi().getTableModel().getData(); - - E editBean = getBean(); - - TopiaEntityBinder<E> binder = getLoadBinder(); - - Loador<D> childBinder = getModel().getChildLoador(); - - EntityListUpdator<E, D> childUpdator = getModel().getChildsUpdator(); - - // recopie des propriétés du bean en excluant toujours la liste des fils - binder.copyExcluding(editBean, beanToSave, childUpdator.getPropertyName()); - - // on conserve l'ancienne liste des fils (pour traitement ultérieure) - Collection<D> oldChilds = - new ArrayList<D>(childUpdator.getChilds(beanToSave)); - - // suppression des fils dans le bean a sauver - childUpdator.removeAll(beanToSave); - - TopiaDAO<D> dao = ObserveDAOHelper.getDAO(tx, getModel().getChildType()); - - for (D child : childs) { - - D childToSave; - - if (child.getTopiaId() == null) { - - // creation du fils - Map<String, Object> map = childBinder.obtainProperties(child); - - childToSave = dao.create(map); - - } else { - - // mise a jour du fils - - childToSave = dao.findByTopiaId(child.getTopiaId()); - - childBinder.load(child, childToSave, false); - } - - // ajout du fils au bean à sauver - childUpdator.addToList(beanToSave, childToSave); - } - - // on donne la main aux implantations pour faire des traitements - // supplémentaires - onUpdateFinalize(tx, beanToSave, oldChilds); - - return beanToSave; - } + //FIXME +// @Override +// protected boolean doSave(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<E> binder) throws Exception { +// +// ObserveContentTableUI<E, D> ui = getUi(); +// +// List<D> objets = ui.getTableModel().getData(); +// +// boolean canContinue; +// try { +// canContinue = prepareSave(bean, objets); +// } catch (Exception e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// ErrorDialogUI.showError(e); +// canContinue = false; +// } +// if (!canContinue) { +// +// // l'utilisateur a choisi de ne pas sauvegarder +// return false; +// } +// doPersist(bean, dataService, dataSource); +// +// +// return true; +// } + + //FIXME +// protected void doPersist(E bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// // sauvegarde du bean en base +// dataService.update(dataSource, null, bean, getUpdateExecutor()); +// } + + //FIXME +// @Override +// protected E onUpdate(TopiaContext tx, Object parentBean, E beanToSave) throws TopiaException { +// +// List<D> childs = getUi().getTableModel().getData(); +// +// E editBean = getBean(); +// +// TopiaEntityBinder<E> binder = getLoadBinder(); +// +// Loador<D> childBinder = getModel().getChildLoador(); +// +// EntityListUpdator<E, D> childUpdator = getModel().getChildsUpdator(); +// +// // recopie des propriétés du bean en excluant toujours la liste des fils +// binder.copyExcluding(editBean, beanToSave, childUpdator.getPropertyName()); +// +// // on conserve l'ancienne liste des fils (pour traitement ultérieure) +// Collection<D> oldChilds = +// new ArrayList<D>(childUpdator.getChilds(beanToSave)); +// +// // suppression des fils dans le bean a sauver +// childUpdator.removeAll(beanToSave); +// +// TopiaDAO<D> dao = ObserveDAOHelper.getDAO(tx, getModel().getChildType()); +// +// for (D child : childs) { +// +// D childToSave; +// +// if (child.getTopiaId() == null) { +// +// // creation du fils +// Map<String, Object> map = childBinder.obtainProperties(child); +// +// childToSave = dao.create(map); +// +// } else { +// +// // mise a jour du fils +// +// childToSave = dao.findByTopiaId(child.getTopiaId()); +// +// childBinder.load(child, childToSave, false); +// } +// +// // ajout du fils au bean à sauver +// childUpdator.addToList(beanToSave, childToSave); +// } +// +// // on donne la main aux implantations pour faire des traitements +// // supplémentaires +// onUpdateFinalize(tx, beanToSave, oldChilds); +// +// return beanToSave; +// } @Override protected void afterSave(boolean refresh) { @@ -464,9 +468,10 @@ public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D exte return true; } - protected void onUpdateFinalize(TopiaContext tx, E bean, Collection<D> oldChilds) throws TopiaException { - // par défaut, rien à faire - } + //FIXME +// protected void onUpdateFinalize(TopiaContext tx, E bean, Collection<D> oldChilds) throws TopiaException { +// // par défaut, rien à faire +// } protected ContentTableModel<E, D> getTableModel() { return getUi().getTableModel(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java index 5a77e5b..74c8484 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java @@ -24,23 +24,18 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.util.BooleanEditor; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityAbstract; - -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JTextArea; -import javax.swing.JTextField; + +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.BorderLayout; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -58,7 +53,7 @@ import java.beans.PropertyChangeListener; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ContentTableUIInitializer<E extends TopiaEntity, D extends TopiaEntity, UI extends ObserveContentTableUI<E, D>> extends ContentUIInitializer<E, UI> { +public class ContentTableUIInitializer<E extends AbstractObserveDto, D extends IdDto, UI extends ObserveContentTableUI<E, D>> extends ContentUIInitializer<E, UI> { public static final String CLIENT_PROPERTY_TABLE_PROPERTY_NAME = "tablePropertyName"; @@ -86,7 +81,8 @@ public class ContentTableUIInitializer<E extends TopiaEntity, D extends TopiaEnt @Override public void initUI(DataSource dataSource) throws Exception { - attachTopiaContext(dataSource, (TopiaEntityAbstract) getTableEditBean()); + //FIXME +// attachTopiaContext(dataSource, (TopiaEntityAbstract) getTableEditBean()); super.initUI(dataSource); @@ -124,10 +120,10 @@ public class ContentTableUIInitializer<E extends TopiaEntity, D extends TopiaEnt ContentTableModel<E, D> model; model = (ContentTableModel<E, D>) evt.getSource(); D bean = model.getRowBean(); - boolean create = bean.getTopiaId() == null; + boolean create = bean.getId() == null; Integer selectedRow = (Integer) evt.getNewValue(); if (log.isDebugEnabled()) { - log.debug("callback new selectedRow : " + selectedRow + " : " + bean.getTopiaId()); + log.debug("callback new selectedRow : " + selectedRow + " : " + bean.getId()); } getHandler().onSelectedRowChanged(selectedRow, bean, create); getModel().setRowSaved(!create); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java index d658465..d950547 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; @@ -41,7 +42,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ContentUIModel<E> { +public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extends IdDto> extends ContentUIModel<E> { public static final String PROPERTY_CAN_SAVE_ROW = "canSaveRow"; @@ -101,7 +102,7 @@ public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extend this.selectionModel = new ContentTableListSelectionModel(); } - public static <E extends AbstractObserveDto, D extends AbstractObserveDto> ContentTableUIModel<E, D> newModel(ObserveContentTableUI<E, D> ui) { + public static <E extends AbstractObserveDto, D extends IdDto> ContentTableUIModel<E, D> newModel(ObserveContentTableUI<E, D> ui) { String uiName = ui.getClass().getName(); String modelName = uiName + "Model"; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java index 390c638..b291679 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.content.table; */ import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ObserveContentUI; import jaxx.runtime.swing.BlockingLayerUI; import jaxx.runtime.validator.swing.SwingValidator; @@ -37,7 +38,7 @@ import javax.swing.ListSelectionModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public interface ObserveContentTableUI<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ObserveContentUI<E> { +public interface ObserveContentTableUI<E extends AbstractObserveDto, D extends IdDto> extends ObserveContentUI<E> { ContentTableUIHandler<E, D> getHandler(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css index 6236539..a1e437f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css @@ -26,7 +26,7 @@ } #baitType { - property:{BaitsComposition.PROPERTY_BAIT_TYPE}; + property:{BaitsCompositionDto.PROPERTY_BAIT_TYPE}; selectedItem:{tableEditBean.getBaitType()}; _validatorLabel:{t("observe.baitsComposition.baitType")}; } @@ -37,7 +37,7 @@ } #baitSettingStatus { - property:{BaitsComposition.PROPERTY_BAIT_SETTING_STATUS}; + property:{BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS}; selectedItem:{tableEditBean.getBaitSettingStatus()}; _validatorLabel:{t("observe.baitsComposition.baitSettingStatus")}; } @@ -48,7 +48,7 @@ } #individualSize { - property:{BaitsComposition.PROPERTY_INDIVIDUAL_SIZE}; + property:{BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE}; model:{tableEditBean.getIndividualSize()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.baitsComposition.individualSize")}; @@ -60,7 +60,7 @@ } #individualWeight { - property:{BaitsComposition.PROPERTY_INDIVIDUAL_WEIGHT}; + property:{BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT}; model:{tableEditBean.getIndividualWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.baitsComposition.individualWeight")}; @@ -72,7 +72,7 @@ } #proportion { - property:{BaitsComposition.PROPERTY_PROPORTION}; + property:{BaitsCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.baitsComposition.proportion")}; @@ -84,7 +84,8 @@ } #baitsCompositionProportionSum { - text:{getStringValue(bean.getBaitsCompositionProportionSum())}; + //FIXME + //text:{getStringValue(bean.getBaitsCompositionProportionSum())}; _validatorLabel:{t("observe.baitsComposition.proportionSum")}; font-weight:bold; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx index 249bfdf..8e16430 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx @@ -63,7 +63,8 @@ <BeanValidator id='validator' autoField='true' context='n1-update-baitsComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="baitsComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="baitsComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index a491312..465fc27 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -22,16 +22,15 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; -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.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; +import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +45,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline, BaitsComposition> { +public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BaitsCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BaitsCompositionUIHandler.class); @@ -61,7 +60,7 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - protected void onSelectedRowChanged(int editingRow, BaitsComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, BaitsCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -90,8 +89,8 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline n("observe.baitsComposition.table.proportion"), n("observe.baitsComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, BaitType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, BaitSettingStatus.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, BaitTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, BaitSettingStatusDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -100,22 +99,25 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline table.getModel().addTableModelListener(new TableModelListener() { @Override public void tableChanged(TableModelEvent e) { - int proportionSum = getBean().getBaitsCompositionProportionSum(); - getBean().setBaitsCompositionProportionSum(proportionSum); + //FIXME +// int proportionSum = getBean().getBaitsCompositionProportionSum(); +// getBean().setBaitsCompositionProportionSum(proportionSum); } }); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java index 677e0c4..038587a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -44,7 +45,10 @@ public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, public BaitsCompositionUIModel(BaitsCompositionUI ui) { super(SetLonglineDto.class, BaitsCompositionDto.class, - new String[]{SetLonglineDto.PROPERTY_BAITS_COMPOSITION}, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_BAITS_COMPOSITION + }, new String[]{BaitsCompositionDto.PROPERTY_BAIT_TYPE, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css index bc32c71..9be1155 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css @@ -26,7 +26,7 @@ } #topType { - property:{BranchlinesComposition.PROPERTY_TOP_TYPE}; + property:{BranchlinesCompositionDto.PROPERTY_TOP_TYPE}; selectedItem:{tableEditBean.getTopType()}; _validatorLabel:{t("observe.branchlinesComposition.topType")}; } @@ -37,7 +37,7 @@ } #tracelineType { - property:{BranchlinesComposition.PROPERTY_TRACELINE_TYPE}; + property:{BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE}; selectedItem:{tableEditBean.getTracelineType()}; _validatorLabel:{t("observe.branchlinesComposition.tracelineType")}; } @@ -48,7 +48,7 @@ } #length { - property:{BranchlinesComposition.PROPERTY_LENGTH}; + property:{BranchlinesCompositionDto.PROPERTY_LENGTH}; model:{tableEditBean.getLength()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.branchlinesComposition.length")}; @@ -60,7 +60,7 @@ } #proportion { - property:{BranchlinesComposition.PROPERTY_PROPORTION}; + property:{BranchlinesCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.branchlinesComposition.proportion")}; @@ -72,7 +72,8 @@ } #branchlinesCompositionProportionSum { - text:{getStringValue(bean.getBranchlinesCompositionProportionSum())}; + //FIXME + //text:{getStringValue(bean.getBranchlinesCompositionProportionSum())}; _validatorLabel:{t("observe.branchlinesComposition.proportionSum")}; font-weight:bold; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx index 1ef846a..9e4cc79 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx @@ -62,7 +62,8 @@ <BeanValidator id='validator' autoField='true' context='n1-update-branchlinesComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="branchlinesComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="branchlinesComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index a23f23c..b7948c4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -22,16 +22,17 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; 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.longline.BranchlinesCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLongline, BranchlinesComposition> { +public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BranchlinesCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BranchlinesCompositionUIHandler.class); @@ -61,7 +62,7 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo } @Override - protected void onSelectedRowChanged(int editingRow, BranchlinesComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, BranchlinesCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -88,31 +89,34 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo n("observe.branchlinesComposition.table.proportion"), n("observe.branchlinesComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSize.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSizeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum - table.getModel().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - int proportionSum = getBean().getBranchlinesCompositionProportionSum(); - getBean().setBranchlinesCompositionProportionSum(proportionSum); - } - }); - - } + //FIXME +// table.getModel().addTableModelListener(new TableModelListener() { +// @Override +// public void tableChanged(TableModelEvent e) { +// int proportionSum = getBean().getBranchlinesCompositionProportionSum(); +// getBean().setBranchlinesCompositionProportionSum(proportionSum); +// } +// }); - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); } - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { 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 579f6aa..16d1519 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 @@ -23,6 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +40,7 @@ import java.awt.event.ItemListener; * @author Tony Chemit - chemit@codelutin.com * @since 3.15 */ -public class CatchLonglineContentTableUIInitializer extends ContentTableUIInitializer<SetLongline, CatchLongline, CatchLonglineUI> { +public class CatchLonglineContentTableUIInitializer extends ContentTableUIInitializer<SetLonglineDto, CatchLonglineDto, CatchLonglineUI> { /** Logger. */ private static final Log log = LogFactory.getLog(CatchLonglineContentTableUIInitializer.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css index e73822c..9fb70f4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css @@ -71,7 +71,7 @@ } #section { - property:{CatchLongline.PROPERTY_SECTION}; + property:{CatchLonglineDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; _listNoLoad:{true}; } @@ -82,7 +82,7 @@ } #basket { - property:{CatchLongline.PROPERTY_BASKET}; + property:{CatchLonglineDto.PROPERTY_BASKET}; selectedItem:{tableEditBean.getBasket()}; _listNoLoad:{true}; } @@ -93,7 +93,7 @@ } #branchline { - property:{CatchLongline.PROPERTY_BRANCHLINE}; + property:{CatchLonglineDto.PROPERTY_BRANCHLINE}; selectedItem:{tableEditBean.getBranchline()}; _listNoLoad:{true}; } @@ -104,8 +104,10 @@ } #speciesCatch { - property:{CatchLongline.PROPERTY_SPECIES_CATCH}; - selectedItem:{tableEditBean.getSpeciesCatch()}; + //FIXME + //property:{CatchLonglineDto.PROPERTY_SPECIES_CATCH}; + //FIXME + //selectedItem:{tableEditBean.getSpeciesCatch()}; _validatorLabel:{t("observe.catchLongline.speciesCatch")}; } @@ -116,12 +118,12 @@ #resetPhotoReferences{ toolTipText:"observe.catchLongline.action.reset.photoReferences.tip"; - _resetTablePropertyName:{CatchLongline.PROPERTY_PHOTO_REFERENCES}; + _resetTablePropertyName:{CatchLonglineDto.PROPERTY_PHOTO_REFERENCES}; } #photoReferences { text:{getStringValue(tableEditBean.getPhotoReferences())}; - _tablePropertyName:{CatchLongline.PROPERTY_PHOTO_REFERENCES}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_PHOTO_REFERENCES}; } #countLabel { @@ -130,7 +132,7 @@ } #count { - property:{CatchLongline.PROPERTY_COUNT}; + property:{CatchLonglineDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel: {t("observe.catchLongline.count")}; @@ -142,7 +144,7 @@ } #totalWeight { - property:{CatchLongline.PROPERTY_TOTAL_WEIGHT}; + property:{CatchLonglineDto.PROPERTY_TOTAL_WEIGHT}; model:{tableEditBean.getTotalWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.catchLongline.totalWeight")}; @@ -151,7 +153,7 @@ #hookWhenDiscarded { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.catchLongline.hookWhenDiscarded"; - _tablePropertyName:{CatchLongline.PROPERTY_HOOK_WHEN_DISCARDED}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; selected:{BooleanUtils.isTrue(tableEditBean.getHookWhenDiscarded())}; } @@ -161,7 +163,7 @@ } #catchFateLongline { - property:{CatchLongline.PROPERTY_CATCH_FATE_LONGLINE}; + property:{CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE}; selectedItem:{tableEditBean.getCatchFateLongline()}; _validatorLabel: {t("observe.catchLongline.catchFateLongline")}; } @@ -172,7 +174,7 @@ } #catchHealthness { - property:{CatchLongline.PROPERTY_CATCH_HEALTHNESS}; + property:{CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS}; selectedItem:{tableEditBean.getCatchHealthness()}; _validatorLabel: {t("observe.catchLongline.catchHealthness")}; } @@ -183,7 +185,7 @@ } #discardHealthness { - property:{CatchLongline.PROPERTY_DISCARD_HEALTHNESS}; + property:{CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS}; selectedItem:{tableEditBean.getDiscardHealthness()}; _validatorLabel: {t("observe.catchLongline.discardHealthness")}; } @@ -194,7 +196,7 @@ } #catchFateLongline { - property:{CatchLongline.PROPERTY_CATCH_FATE_LONGLINE}; + property:{CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE}; selectedItem:{tableEditBean.getCatchFateLongline()}; _validatorLabel: {t("observe.catchLongline.catchFateLongline")}; } @@ -205,7 +207,7 @@ } #hookPosition { - property:{CatchLongline.PROPERTY_HOOK_POSITION}; + property:{CatchLonglineDto.PROPERTY_HOOK_POSITION}; selectedItem:{tableEditBean.getHookPosition()}; _validatorLabel: {t("observe.catchLongline.hookPosition")}; } @@ -215,7 +217,7 @@ } #comment2 { - _tablePropertyName: {CommentableEntity.PROPERTY_COMMENT}; + _tablePropertyName: {CommentableDto.PROPERTY_COMMENT}; text:{getStringValue(tableEditBean.getComment())}; } @@ -234,7 +236,7 @@ } #beatDiameter { - property:{CatchLongline.PROPERTY_BEAT_DIAMETER}; + property:{CatchLonglineDto.PROPERTY_BEAT_DIAMETER}; model:{tableEditBean.getBeatDiameter()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.catchLongline.beatDiameter")}; @@ -243,7 +245,7 @@ #depredated { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.catchLongline.depredated"; - _tablePropertyName:{CatchLongline.PROPERTY_DEPREDATED}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_DEPREDATED}; selected:{BooleanUtils.isTrue(tableEditBean.getDepredated())}; } @@ -252,8 +254,10 @@ } #predator { - property: predator; - selected:{tableEditBean.getPredator()}; + //FIXME + //property: predator; + //FIXME + //selected:{tableEditBean.getPredator()}; _validatorLabel: {t("observe.catchLongline.predator")}; showListLabel: true; universeLabel:{t("observe.catchLongline.availablePredator")}; @@ -279,7 +283,7 @@ } #sex { - property:{CatchLongline.PROPERTY_SEX}; + property:{CatchLonglineDto.PROPERTY_SEX}; selectedItem:{tableEditBean.getSex()}; _validatorLabel:{t("observe.catchLongline.sex")}; } @@ -290,7 +294,7 @@ } #stomacFullness { - property:{CatchLongline.PROPERTY_STOMAC_FULLNESS}; + property:{CatchLonglineDto.PROPERTY_STOMAC_FULLNESS}; selectedItem:{tableEditBean.getStomacFullness()}; _validatorLabel:{t("observe.catchLongline.stomacFullness")}; } @@ -301,7 +305,7 @@ } #maturityStatus { - property:{CatchLongline.PROPERTY_MATURITY_STATUS}; + property:{CatchLonglineDto.PROPERTY_MATURITY_STATUS}; selectedItem:{tableEditBean.getMaturityStatus()}; _validatorLabel:{t("observe.catchLongline.maturityStatus")}; } @@ -312,7 +316,7 @@ } #gonadeWeight { - property:{CatchLongline.PROPERTY_GONADE_WEIGHT}; + property:{CatchLonglineDto.PROPERTY_GONADE_WEIGHT}; model:{tableEditBean.getGonadeWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.catchLongline.gonadeWeight")}; @@ -363,7 +367,7 @@ #depthRecorder { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.depthRecorder"; - _branchlineBeanPropertyName:{Branchline.PROPERTY_DEPTH_RECORDER}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; selected:{BooleanUtils.isTrue(branchlineBean.getDepthRecorder())}; _validatorLabel:{t("observe.branchline.depthRecorder")}; } @@ -371,7 +375,7 @@ #hookLost { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.hookLost"; - _branchlineBeanPropertyName:{Branchline.PROPERTY_HOOK_LOST}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_HOOK_LOST}; selected:{BooleanUtils.isTrue(branchlineBean.getHookLost())}; _validatorLabel:{t("observe.branchline.hookLost")}; } @@ -379,7 +383,7 @@ #traceCutOff { horizontalTextPosition:{JCheckBox.LEFT}; text:"observe.branchline.traceCutOff"; - _branchlineBeanPropertyName:{Branchline.PROPERTY_TRACE_CUT_OFF}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF}; selected:{BooleanUtils.isTrue(branchlineBean.getTraceCutOff())}; _validatorLabel:{t("observe.branchline.traceCutOff")}; } @@ -387,7 +391,7 @@ #timer { text:"observe.branchline.timer"; horizontalTextPosition:{JCheckBox.LEFT}; - _branchlineBeanPropertyName:{Branchline.PROPERTY_TIMER}; + _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_TIMER}; selected:{BooleanUtils.isTrue(branchlineBean.getTimer())}; _validatorLabel:{t("observe.branchline.timer")}; } @@ -398,7 +402,7 @@ } #timeSinceContact { - property:{Branchline.PROPERTY_TIME_SINCE_CONTACT}; + property:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; bean:{branchlineBean}; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; model:{branchlineBean.getTimeSinceContact()}; @@ -413,9 +417,9 @@ #timerTimeOnBoard { date:{branchlineBean.getTimerTimeOnBoard()}; - propertyDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD}; - propertyDayDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; - propertyTimeDate: {Branchline.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; + propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; + //propertyDayDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; + //propertyTimeDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; bean:{branchlineBean}; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; label:{t("observe.branchline.timerTimeOnBoard")}; @@ -428,7 +432,7 @@ } #baitHaulingStatus { - property:{Branchline.PROPERTY_BAIT_HAULING_STATUS}; + property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS}; bean:{branchlineBean}; selectedItem:{branchlineBean.getBaitHaulingStatus()}; _validatorLabel:{t("observe.branchline.baitHaulingStatus")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx index 030d883..c5bb70e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -30,10 +30,9 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.BasketDto fr.ird.observe.services.dto.longline.BranchlineDto - fr.ird.observe.services.dto.longline.BranchlineImplDto fr.ird.observe.services.dto.longline.CatchLonglineDto fr.ird.observe.services.dto.longline.SectionDto fr.ird.observe.services.dto.longline.SetLonglineDto @@ -80,7 +79,7 @@ <ContentTableModel id='tableModel'/> <!-- edit branchline --> - <BranchlineDto id='branchlineBean' initializer='new BranchlineImpl()'/> + <BranchlineDto id='branchlineBean' initializer='new BranchlineDto()'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' context='n1-update-catchLongline' @@ -269,7 +268,7 @@ <row> <cell columns="2" fill="both" weighty="0.7"> <JScrollPane id='predatorPane'> - <FilterableDoubleList id='predator' genericType='Species'/> + <FilterableDoubleList id='predator' genericType='SpeciesDto'/> </JScrollPane> </cell> </row> @@ -288,7 +287,7 @@ <JLabel id='stomacFullnessLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='stomacFullness' constructorParams='this' genericType='StomacFullness'/> + <BeanComboBox id='stomacFullness' constructorParams='this' genericType='StomacFullnessDto'/> </cell> </row> @@ -388,7 +387,7 @@ <JLabel id='baitHaulingStatusLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='baitHaulingStatus' constructorParams='this' genericType='BaitHaulingStatus'/> + <BeanComboBox id='baitHaulingStatus' constructorParams='this' genericType='BaitHaulingStatusDto'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index c817dcc..8e74724 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -22,20 +22,27 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; 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.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.business.util.TopiaExecutor; -import fr.ird.observe.business.util.TopiaExecutor2; -import fr.ird.observe.services.dto.longline.SizeMeasureDAODto; -import fr.ird.observe.services.dto.longline.WeightMeasureDAODto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +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.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIInitializer; @@ -49,10 +56,6 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -77,7 +80,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, CatchLongline> { +public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto, CatchLonglineDto> { /** Logger */ static private Log log = LogFactory.getLog(CatchLonglineUIHandler.class); @@ -96,21 +99,21 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C private final PropertyChangeListener catchFateChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onCatchFateChanged((CatchFateLongline) evt.getNewValue(), (CatchLongline) evt.getSource()); + onCatchFateChanged((CatchFateLonglineDto) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); } }; private final PropertyChangeListener branchlineChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onBranchlineChanged((Branchline) evt.getNewValue()); + onBranchlineChanged((BranchlineDto) evt.getNewValue()); } }; private final PropertyChangeListener depredatedChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLongline) evt.getSource()); + onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); } }; @@ -130,12 +133,15 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } }; - JAXXContextEntryDef<LonglinePositionHelper<CatchLongline>> POSITION_HELPER_ENTRY = - UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); + //FIXME +// JAXXContextEntryDef<LonglinePositionHelper<CatchLonglineDto>> POSITION_HELPER_ENTRY = +// UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); - private TopiaExecutor<? extends TopiaEntity> branchlineUpdator; + //FIXME +// private TopiaExecutor<? extends TopiaEntity> branchlineUpdator; - private TopiaExecutor2<TopiaEntity, Branchline> branchlineUpdateExecutor; + //FIXME +// private TopiaExecutor2<TopiaEntity, Branchline> branchlineUpdateExecutor; public CatchLonglineUIHandler(CatchLonglineUI ui) { super(ui, DataContextType.SetLongline); @@ -152,7 +158,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } @Override - protected void onSelectedRowChanged(int editingRow, CatchLongline bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, CatchLonglineDto bean, boolean create) { if (log.isInfoEnabled()) { log.info("Selected row changed: " + editingRow + ", create? " + create); @@ -171,7 +177,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C // load size measures SizeMeasuresTableModel sizeMeasuresTableModel = model.getSizeMeasuresTableModel(); - List<SizeMeasure> sizes = emptySelection ? Collections.<SizeMeasure>emptyList() : sizeMeasuresTableModel.getCacheForRow(editingRow); + List<SizeMeasureDto> sizes = emptySelection ? Collections.<SizeMeasureDto>emptyList() : sizeMeasuresTableModel.getCacheForRow(editingRow); if (sizes == null) { if (log.isInfoEnabled()) { @@ -192,16 +198,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } else { // updating mode: loading from db - try { - - sizes = getDataService().getCatchLonglineSizeMeasures(getDataSource(), bean, sizeMeasuresTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded sizes (" + bean.getTopiaId() + "): " + sizes.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load size measures", e); - } + //FIXME +// try { + +// sizes = getDataService().getCatchLonglineSizeMeasures(getDataSource(), bean, sizeMeasuresTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded sizes (" + bean.getTopiaId() + "): " + sizes.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load size measures", e); +// } } // init size measures @@ -219,7 +226,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C // load weight measures WeightMeasuresTableModel weightMeasuresTableModel = model.getWeightMeasuresTableModel(); - List<WeightMeasure> weights = emptySelection ? Collections.<WeightMeasure>emptyList() : weightMeasuresTableModel.getCacheForRow(editingRow); + List<WeightMeasureDto> weights = emptySelection ? Collections.<WeightMeasureDto>emptyList() : weightMeasuresTableModel.getCacheForRow(editingRow); if (weights == null) { @@ -231,16 +238,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } else { // updating mode: loading from db - try { - - weights = getDataService().getCatchLonglineWeightMeasures(getDataSource(), bean, weightMeasuresTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded weights (" + bean.getTopiaId() + "): " + weights.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load weight measures", e); - } + //FIXME +// try { +// +// weights = getDataService().getCatchLonglineWeightMeasures(getDataSource(), bean, weightMeasuresTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded weights (" + bean.getTopiaId() + "): " + weights.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load weight measures", e); +// } } @@ -301,17 +309,18 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - bean.removePropertyChangeListener(CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); - bean.addPropertyChangeListener(CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); + bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); - bean.removePropertyChangeListener(CatchLongline.PROPERTY_BRANCHLINE, branchlineChanged); - bean.addPropertyChangeListener(CatchLongline.PROPERTY_BRANCHLINE, branchlineChanged); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_BRANCHLINE, branchlineChanged); + bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_BRANCHLINE, branchlineChanged); - bean.removePropertyChangeListener(CatchLongline.PROPERTY_DEPREDATED, depredatedChanged); - bean.addPropertyChangeListener(CatchLongline.PROPERTY_DEPREDATED, depredatedChanged); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_DEPREDATED, depredatedChanged); + bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_DEPREDATED, depredatedChanged); - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); - positionHelper.resetPosition(bean); + //FIXME +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); +// positionHelper.resetPosition(bean); requestFocus.requestFocus(); @@ -351,16 +360,16 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C n("observe.catchlongline.table.comment"), n("observe.catchlongline.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Section.class, DecoratorService.HAULING_IDENTIFIER)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, Basket.class, DecoratorService.HAULING_IDENTIFIER)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, Branchline.class, DecoratorService.HAULING_IDENTIFIER)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SectionDto.class, DecoratorService.HAULING_IDENTIFIER)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, BasketDto.class, DecoratorService.HAULING_IDENTIFIER)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, BranchlineDto.class, DecoratorService.HAULING_IDENTIFIER)); - UIHelper.setTableColumnRenderer(table, 3, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 3, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEnumTableCellRenderer(renderer, CatchAcquisitionModeEnum.class)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 6, UIHelper.newDecorateTableCellRenderer(renderer, Healthness.class)); - UIHelper.setTableColumnRenderer(table, 7, UIHelper.newDecorateTableCellRenderer(renderer, CatchFateLongline.class)); - UIHelper.setTableColumnRenderer(table, 8, UIHelper.newDecorateTableCellRenderer(renderer, Healthness.class)); + UIHelper.setTableColumnRenderer(table, 6, UIHelper.newDecorateTableCellRenderer(renderer, HealthnessDto.class)); + UIHelper.setTableColumnRenderer(table, 7, UIHelper.newDecorateTableCellRenderer(renderer, CatchFateLonglineDto.class)); + UIHelper.setTableColumnRenderer(table, 8, UIHelper.newDecorateTableCellRenderer(renderer, HealthnessDto.class)); UIHelper.setTableColumnRenderer(table, 9, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 10, UIHelper.newStringTableCellRenderer(renderer, 10, true)); @@ -376,18 +385,19 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C n("observe.catchlongline.table.size"), n("observe.catchlongline.table.size.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SizeMeasureType.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - Decorator<SizeMeasureType> decorator = ObserveContext.get().getDecorator(SizeMeasureType.class); + Decorator<SizeMeasureTypeDto> decorator = ObserveContext.get().getDecorator(SizeMeasureTypeDto.class); - List<SizeMeasureType> list; - try { - list = getDataService().getList(getDataSource(), SizeMeasureType.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get size measure types", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<SizeMeasureTypeDto> list; +// try { +// list = getDataService().getList(getDataSource(), SizeMeasureType.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get size measure types", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor(table)); SizeMeasuresTableModel tableModel = getModel().getSizeMeasuresTableModel(); @@ -406,18 +416,19 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C n("observe.catchlongline.table.weight"), n("observe.catchlongline.table.weight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, WeightMeasureType.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, WeightMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - Decorator<WeightMeasureType> decorator = ObserveContext.get().getDecorator(WeightMeasureType.class); + Decorator<WeightMeasureTypeDto> decorator = ObserveContext.get().getDecorator(WeightMeasureTypeDto.class); - List<WeightMeasureType> list; - try { - list = getDataService().getList(getDataSource(), WeightMeasureType.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get size measure types", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<WeightMeasureType> list; +// try { +// list = getDataService().getList(getDataSource(), WeightMeasureType.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get size measure types", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor(table)); WeightMeasuresTableModel tableModel = getModel().getWeightMeasuresTableModel(); @@ -436,10 +447,11 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C }); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } @Override public void initUI() throws Exception { @@ -479,39 +491,41 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C setTableModelEditable(getModel().isEditable()); - LonglinePositionHelper<CatchLongline> positionHelper = new LonglinePositionHelper<CatchLongline>( - getUi().getSection(), - getUi().getBasket(), - getUi().getBranchline(), - getTableEditBean()); - - POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); + //FIXME +// LonglinePositionHelper<CatchLongline> positionHelper = new LonglinePositionHelper<CatchLongline>( +// getUi().getSection(), +// getUi().getBasket(), +// getUi().getBranchline(), +// getTableEditBean()); +// +// POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); } - @Override - protected SetLongline loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // reset size measures - getModel().getSizeMeasuresTableModel().clear(); - - // reset weight measures - getModel().getWeightMeasuresTableModel().clear(); - - // load sections (and baskets and branchlines) - List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); - - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.initSections(sections, getTableModel().getData()); - - return setLongline; - - } + //FIXME +// @Override +// protected SetLongline loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // reset size measures +// getModel().getSizeMeasuresTableModel().clear(); +// +// // reset weight measures +// getModel().getWeightMeasuresTableModel().clear(); +// +// // load sections (and baskets and branchlines) +// List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); +// +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// positionHelper.initSections(sections, getTableModel().getData()); +// +// return setLongline; +// +// } @Override public void openUI() throws Exception { @@ -523,8 +537,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C super.openUI(); // Reset all sections - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - getUi().getSection().setData(positionHelper.getSectionUniverse()); + //FIXME +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// getUi().getSection().setData(positionHelper.getSectionUniverse()); // To be sure always remove listener (could prevent some leaks) getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); @@ -549,102 +564,103 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - @Override - protected void onUpdateFinalize(TopiaContext tx, SetLongline bean, Collection<CatchLongline> oldChilds) throws TopiaException { - - List<CatchLongline> catchLonglines = bean.getCatchLongline(); - - // remove less precise position on longline - LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.savePosition(catchLonglines); - - CatchLonglineUIModel model = getModel(); - { - - // save sizes - - SizeMeasureDAO measureDao = ObserveDAOHelper.getSizeMeasureDAO(tx); - - SizeMeasuresTableModel sizeMeasuresTableModel = model.getSizeMeasuresTableModel(); - Set<Integer> rowsChanged = sizeMeasuresTableModel.getCacheRowsChanged(); - - TopiaEntityBinder<SizeMeasure> loader = sizeMeasuresTableModel.getLoader(); - for (Integer row : rowsChanged) { - - CatchLongline catchLongline = catchLonglines.get(row); - - List<SizeMeasure> measures = sizeMeasuresTableModel.getCacheForRow(row); - List<SizeMeasure> measuresToSave = new ArrayList<SizeMeasure>(measures.size()); - - for (SizeMeasure measure : measures) { - - if (sizeMeasuresTableModel.isRowNotEmpty(measure)) { - - SizeMeasure measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = measureDao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = catchLongline.getSizeMeasureByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - - measuresToSave.add(measureToSave); - - } - - } - - catchLongline.clearSizeMeasure(); - catchLongline.addAllSizeMeasure(measuresToSave); - - } - - } - - { - - // save weights - - WeightMeasureDAO dao = ObserveDAOHelper.getWeightMeasureDAO(tx); - - WeightMeasuresTableModel weightMeasuresTableModel = model.getWeightMeasuresTableModel(); - TopiaEntityBinder<WeightMeasure> loader = weightMeasuresTableModel.getLoader(); - Set<Integer> rowsChanged = weightMeasuresTableModel.getCacheRowsChanged(); - - for (Integer row : rowsChanged) { - - CatchLongline catchLongline = catchLonglines.get(row); - - List<WeightMeasure> measures = weightMeasuresTableModel.getCacheForRow(row); - List<WeightMeasure> measuresToSave = new ArrayList<WeightMeasure>(measures.size()); - for (WeightMeasure measure : measures) { - - if (weightMeasuresTableModel.isRowNotEmpty(measure)) { - - WeightMeasure measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = dao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = catchLongline.getWeightMeasureByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - measuresToSave.add(measureToSave); - - } - - } - - catchLongline.clearWeightMeasure(); - catchLongline.addAllWeightMeasure(measuresToSave); - } - - } - - } + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetLongline bean, Collection<CatchLongline> oldChilds) throws TopiaException { +// +// List<CatchLongline> catchLonglines = bean.getCatchLongline(); +// +// // remove less precise position on longline +// LonglinePositionHelper<CatchLongline> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// positionHelper.savePosition(catchLonglines); +// +// CatchLonglineUIModel model = getModel(); +// { +// +// // save sizes +// +// SizeMeasureDAO measureDao = ObserveDAOHelper.getSizeMeasureDAO(tx); +// +// SizeMeasuresTableModel sizeMeasuresTableModel = model.getSizeMeasuresTableModel(); +// Set<Integer> rowsChanged = sizeMeasuresTableModel.getCacheRowsChanged(); +// +// TopiaEntityBinder<SizeMeasure> loader = sizeMeasuresTableModel.getLoader(); +// for (Integer row : rowsChanged) { +// +// CatchLongline catchLongline = catchLonglines.get(row); +// +// List<SizeMeasure> measures = sizeMeasuresTableModel.getCacheForRow(row); +// List<SizeMeasure> measuresToSave = new ArrayList<SizeMeasure>(measures.size()); +// +// for (SizeMeasure measure : measures) { +// +// if (sizeMeasuresTableModel.isRowNotEmpty(measure)) { +// +// SizeMeasure measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = measureDao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = catchLongline.getSizeMeasureByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// +// measuresToSave.add(measureToSave); +// +// } +// +// } +// +// catchLongline.clearSizeMeasure(); +// catchLongline.addAllSizeMeasure(measuresToSave); +// +// } +// +// } +// +// { +// +// // save weights +// +// WeightMeasureDAO dao = ObserveDAOHelper.getWeightMeasureDAO(tx); +// +// WeightMeasuresTableModel weightMeasuresTableModel = model.getWeightMeasuresTableModel(); +// TopiaEntityBinder<WeightMeasure> loader = weightMeasuresTableModel.getLoader(); +// Set<Integer> rowsChanged = weightMeasuresTableModel.getCacheRowsChanged(); +// +// for (Integer row : rowsChanged) { +// +// CatchLongline catchLongline = catchLonglines.get(row); +// +// List<WeightMeasure> measures = weightMeasuresTableModel.getCacheForRow(row); +// List<WeightMeasure> measuresToSave = new ArrayList<WeightMeasure>(measures.size()); +// for (WeightMeasure measure : measures) { +// +// if (weightMeasuresTableModel.isRowNotEmpty(measure)) { +// +// WeightMeasure measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = dao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = catchLongline.getWeightMeasureByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// measuresToSave.add(measureToSave); +// +// } +// +// } +// +// catchLongline.clearWeightMeasure(); +// catchLongline.addAllWeightMeasure(measuresToSave); +// } +// +// } +// +// } @Override protected void resetEditBean() { @@ -656,14 +672,16 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C super.resetEditBean(); - onBranchlineChanged(getTableEditBean().getBranchline()); + //FIXME +// onBranchlineChanged(getTableEditBean().getBranchline()); } public void resetBranchline() { onBranchlineChanged(null); - onBranchlineChanged(getTableEditBean().getBranchline()); + //FIXME +// onBranchlineChanged(getTableEditBean().getBranchline()); } @@ -673,16 +691,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C log.info("Saved modified branchline"); } - try { +// try { - Branchline branchline = getTableEditBean().getBranchline(); - Branchline beanSaved = getDataService().update(getDataSource(), null, branchline, getBranchlineUpdateExecutor()); - getTableEditBean().setBranchline(beanSaved); + ReferenceDto<BranchlineDto> branchline = getTableEditBean().getBranchline(); + //FIXME +// BranchlineDto beanSaved = getDataService().update(getDataSource(), null, branchline, getBranchlineUpdateExecutor()); +// getTableEditBean().setBranchline(beanSaved); getUi().getBranchlineValidator().setChanged(false); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not save branchline", e); - } +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not save branchline", e); +// } @@ -703,7 +722,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C boolean createMode = ui.getTableModel().isCreate(); - CatchLongline editBean = ui.getTableEditBean(); + CatchLonglineDto editBean = ui.getTableEditBean(); switch (newMode) { @@ -798,11 +817,11 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - protected void onCatchFateChanged(CatchFateLongline newValue, CatchLongline tableEditBean) { + protected void onCatchFateChanged(CatchFateLonglineDto newValue, CatchLonglineDto tableEditBean) { CatchLonglineUI ui = getUi(); - if (newValue == null || !"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3".equals(newValue.getTopiaId())) { + if (newValue == null || !"fr.ird.observe.entities.referentiel.longline.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { // not discarded ui.getDiscardHealthness().setEnabled(false); @@ -821,13 +840,13 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - protected void onBranchlineChanged(Branchline newValue) { + protected void onBranchlineChanged(BranchlineDto newValue) { CatchLonglineUI ui = getUi(); - Branchline branchline = ui.getBranchlineBean(); + BranchlineDto branchline = ui.getBranchlineBean(); - SwingValidator<Branchline> branchlineValidator = ui.getBranchlineValidator(); + SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator(); if (newValue == null) { if (log.isInfoEnabled()) { @@ -844,11 +863,12 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C branchlineValidator.setBean(branchline); - try { - getDataService().loadEditEntity(getDataSource(), newValue.getTopiaId(), getBranchlineUpdator()); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load branchline", e); - } + //FIXME +// try { +// getDataService().loadEditEntity(getDataSource(), newValue.getTopiaId(), getBranchlineUpdator()); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load branchline", e); +// } } @@ -856,7 +876,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C } - protected void onDepretadedChanged(Boolean newValue, CatchLongline tableEditBean) { + protected void onDepretadedChanged(Boolean newValue, CatchLonglineDto tableEditBean) { CatchLonglineUI ui = getUi(); @@ -939,41 +959,43 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C return (CatchLonglineTableModel) super.getTableModel(); } - protected TopiaExecutor<? extends TopiaEntity> getBranchlineUpdator() { - if (branchlineUpdator == null) { - branchlineUpdator = new TopiaExecutor<Branchline>() { - - private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); - - @Override - public void execute(TopiaContext tx, Branchline newValue) throws TopiaException { - - Branchline editBean = getUi().getBranchlineBean(); - branchlineLoador.load(newValue, editBean, false); - - } - }; - } - return branchlineUpdator; - } - - protected TopiaExecutor2<TopiaEntity, Branchline> getBranchlineUpdateExecutor() { - if (branchlineUpdateExecutor == null) { - branchlineUpdateExecutor = new TopiaExecutor2<TopiaEntity, Branchline>() { - - private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); - - @Override - public Branchline execute(TopiaContext tx, TopiaEntity parentBean, Branchline beanToSave) throws TopiaException { - - Branchline editBean = getUi().getBranchlineBean(); - branchlineLoador.load(editBean, beanToSave, false); - return beanToSave; - - } - }; - } - return branchlineUpdateExecutor; - } + //FIXME +// protected TopiaExecutor<? extends TopiaEntity> getBranchlineUpdator() { +// if (branchlineUpdator == null) { +// branchlineUpdator = new TopiaExecutor<Branchline>() { +// +// private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); +// +// @Override +// public void execute(TopiaContext tx, Branchline newValue) throws TopiaException { +// +// Branchline editBean = getUi().getBranchlineBean(); +// branchlineLoador.load(newValue, editBean, false); +// +// } +// }; +// } +// return branchlineUpdator; +// } + + //FIXME +// protected TopiaExecutor2<TopiaEntity, Branchline> getBranchlineUpdateExecutor() { +// if (branchlineUpdateExecutor == null) { +// branchlineUpdateExecutor = new TopiaExecutor2<TopiaEntity, Branchline>() { +// +// private final TopiaEntityBinder<Branchline> branchlineLoador = getModel().getBranchlineLoador(); +// +// @Override +// public Branchline execute(TopiaContext tx, TopiaEntity parentBean, Branchline beanToSave) throws TopiaException { +// +// Branchline editBean = getUi().getBranchlineBean(); +// branchlineLoador.load(editBean, beanToSave, false); +// return beanToSave; +// +// } +// }; +// } +// return branchlineUpdateExecutor; +// } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css index 6066c5b..40f6769 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css @@ -26,7 +26,7 @@ } #encounterType { - property:{Encounter.PROPERTY_ENCOUNTER_TYPE}; + property:{EncounterDto.PROPERTY_ENCOUNTER_TYPE}; selectedItem:{tableEditBean.getEncounterType()}; } @@ -36,7 +36,7 @@ } #species { - property:{Encounter.PROPERTY_SPECIES}; + property:{EncounterDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; } @@ -46,7 +46,7 @@ } #count { - property:{Encounter.PROPERTY_COUNT}; + property:{EncounterDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -57,7 +57,7 @@ } #distance { - property:{Encounter.PROPERTY_DISTANCE}; + property:{EncounterDto.PROPERTY_DISTANCE}; model:{tableEditBean.getDistance()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx index d5c7342..71bf620 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.longline.EncounterDto fr.ird.observe.services.dto.referential.SpeciesDto diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index 502bff4..7dc101d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -22,11 +22,14 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; 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.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; @@ -43,7 +46,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, Encounter> { +public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineDto, EncounterDto> { /** Logger */ static private Log log = LogFactory.getLog(EncounterUIHandler.class); @@ -58,7 +61,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, } @Override - protected void onSelectedRowChanged(int editingRow, Encounter bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, EncounterDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); @@ -81,16 +84,17 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLongline, n("observe.encounter.table.count"), n("observe.encounter.table.count.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, EncounterType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, EncounterTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedActivityId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedActivityId(); +// } @Override public void initUI() throws Exception { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css index 6afb134..b6ac1f6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css @@ -26,7 +26,7 @@ } #lineType { - property:{FloatlinesComposition.PROPERTY_LINE_TYPE}; + property:{FloatlinesCompositionDto.PROPERTY_LINE_TYPE}; selectedItem:{tableEditBean.getLineType()}; _validatorLabel:{t("observe.floatlinesComposition.lineType")}; } @@ -37,7 +37,7 @@ } #length { - property:{FloatlinesComposition.PROPERTY_LENGTH}; + property:{FloatlinesCompositionDto.PROPERTY_LENGTH}; model:{tableEditBean.getLength()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel:{t("observe.floatlinesComposition.length")}; @@ -49,7 +49,7 @@ } #proportion { - property:{FloatlinesComposition.PROPERTY_PROPORTION}; + property:{FloatlinesCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.floatlinesComposition.proportion")}; @@ -61,7 +61,7 @@ } #floatlinesCompositionProportionSum { - text:{getStringValue(bean.getFloatlinesCompositionProportionSum())}; + //text:{getStringValue(bean.getFloatlinesCompositionProportionSum())}; _validatorLabel:{t("observe.floatlinesComposition.proportionSum")}; font-weight:bold; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx index e068151..fd9cb6b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx @@ -62,8 +62,9 @@ <BeanValidator id='validator' context='n1-update-floatlinesComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="floatlinesCompositionProportionSum" component="floatlinesCompositionProportionSum"/> - <field name="floatlinesComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="floatlinesCompositionProportionSum" component="floatlinesCompositionProportionSum"/>--> + <!--<field name="floatlinesComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index 3e6cf7c..30521a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -22,16 +22,16 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; 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.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +46,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLongline, FloatlinesComposition> { +public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, FloatlinesCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(FloatlinesCompositionUIHandler.class); @@ -61,7 +61,7 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon } @Override - protected void onSelectedRowChanged(int editingRow, FloatlinesComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, FloatlinesCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -86,31 +86,34 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon n("observe.floatlinesComposition.table.proportion"), n("observe.floatlinesComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, LineType.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, LineTypeDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum - table.getModel().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - - int proportionSum = getBean().getFloatlinesCompositionProportionSum(); - getBean().setFloatlinesCompositionProportionSum(proportionSum); - } - }); + //FIXME +// table.getModel().addTableModelListener(new TableModelListener() { +// @Override +// public void tableChanged(TableModelEvent e) { +// +// int proportionSum = getBean().getFloatlinesCompositionProportionSum(); +// getBean().setFloatlinesCompositionProportionSum(proportionSum); +// } +// }); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java index 10209bc..01ec2ce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java @@ -22,16 +22,14 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesMeasurementLonglinesTableModel; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUIHandler; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUIModel; import org.apache.commons.collections4.CollectionUtils; import java.util.List; @@ -85,13 +83,13 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon GearUseFeaturesLonglineDto rowBean = getRowBean(); GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements - Gear gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementLongline> measurements = - gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getTopiaId()); + ReferentialReferenceDto<GearDto> gear = rowBean.getGear(); + List<GearUseFeaturesMeasurementLonglineDto> measurements = + gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css index 6b55ed7..52e9d84 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css @@ -41,7 +41,7 @@ } #gear { - property:{GearUseFeaturesLongline.PROPERTY_GEAR}; + property:{GearUseFeaturesLonglineDto.PROPERTY_GEAR}; selectedItem:{tableEditBean.getGear()}; } @@ -51,7 +51,7 @@ } #number { - property:{GearUseFeaturesLongline.PROPERTY_NUMBER}; + property:{GearUseFeaturesLonglineDto.PROPERTY_NUMBER}; model:{tableEditBean.getNumber()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -63,7 +63,7 @@ #usedInTrip { booleanValue:{tableEditBean.getUsedInTrip()}; - _tablePropertyName:{GearUseFeaturesLongline.PROPERTY_USED_IN_TRIP}; + _tablePropertyName:{GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP}; } /* ***************************************************************************** */ @@ -85,10 +85,11 @@ minimumSize:{new Dimension(10,80)}; } -#comment2 { - _tablePropertyName: {GearUseFeaturesLongline.PROPERTY_COMMENT}; - text:{getStringValue(tableEditBean.getComment())}; -} +//#comment2 { + //FIXME + //_tablePropertyName: {GearUseFeaturesLonglineDto.PROPERTY_COMMENT}; + //text:{getStringValue(tableEditBean.getComment())}; +//} #deleteSelectedMeasurement { text: "observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement"; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index d008d6d..1de6a18 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx @@ -29,11 +29,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto - fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineImplDto fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor 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 6b1e490..bf68ba1 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 @@ -22,15 +22,17 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; 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.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDAODto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -46,9 +48,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -81,7 +80,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<TripLongline, GearUseFeaturesLongline> { +public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<TripLonglineDto, GearUseFeaturesLonglineDto> { /** Logger */ static private Log log = LogFactory.getLog(GearUseFeaturesLonglineUIHandler.class); @@ -120,7 +119,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } @Override - protected void onSelectedRowChanged(int editingRow, GearUseFeaturesLongline bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, GearUseFeaturesLonglineDto bean, boolean create) { if (log.isInfoEnabled()) { log.info("Selected row changed: " + editingRow + ", create? " + create); @@ -138,7 +137,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip // load size measures GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - List<GearUseFeaturesMeasurementLongline> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementLongline>emptyList() : measurementsTableModel.getCacheForRow(editingRow); + List<GearUseFeaturesMeasurementLonglineDto> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementLonglineDto>emptyList() : measurementsTableModel.getCacheForRow(editingRow); if (measurements == null) { if (log.isInfoEnabled()) { @@ -159,16 +158,17 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } else { // updating mode: loading from db - try { - - measurements = getDataService().getGearUseFeaturesMeasurementLongline(getDataSource(), bean, measurementsTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load measurements", e); - } + //FIXME +// try { +// +// measurements = getDataService().getGearUseFeaturesMeasurementLongline(getDataSource(), bean, measurementsTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load measurements", e); +// } } // init measurements @@ -225,7 +225,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip n("observe.gearUseFeaturesLongline.table.comment"), n("observe.gearUseFeaturesLongline.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Gear.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); @@ -241,20 +241,21 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip n("observe.gearUseFeaturesLongline.table.value"), n("observe.gearUseFeaturesLongline.table.value.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristic.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristicDto.class)); UIHelper.setTableColumnRenderer(table, 1, new GearUseFeatureMeasurementCellRenderer(0, renderer)); table.getTableHeader().setReorderingAllowed(false); - Decorator<GearCaracteristic> decorator = ObserveContext.get().getDecorator(GearCaracteristic.class); + Decorator<GearCaracteristicDto> decorator = ObserveContext.get().getDecorator(GearCaracteristicDto.class); - List<GearCaracteristic> list; - try { - list = getDataService().getList(getDataSource(), GearCaracteristic.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get gear caracteristics", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<GearCaracteristic> list; +// try { +// list = getDataService().getList(getDataSource(), GearCaracteristic.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get gear caracteristics", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); GearUseFeaturesMeasurementLonglinesTableModel tableModel = getModel().getMeasurementsTableModel(); @@ -279,10 +280,11 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedTripLonglineId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedTripLonglineId(); +// } @Override public void initUI() throws Exception { @@ -303,17 +305,18 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - @Override - protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // reset measurements - getModel().getMeasurementsTableModel().clear(); - - return tripLongline; - - } + //FIXME +// @Override +// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // reset measurements +// getModel().getMeasurementsTableModel().clear(); +// +// return tripLongline; +// +// } @Override public void openUI() throws Exception { @@ -364,7 +367,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip if (!selectionEmpty) { - GearUseFeaturesMeasurementLongline data = tableModel.getSelectedRow(); + GearUseFeaturesMeasurementLonglineDto data = tableModel.getSelectedRow(); if (log.isInfoEnabled()) { log.info("Delete: " + data); @@ -391,62 +394,64 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - @Override - protected TripLongline onCreate(TopiaContext tx, Object parentBean, TripLongline editBean) throws TopiaException { - return super.onCreate(tx, parentBean, editBean); - } - - @Override - protected void onUpdateFinalize(TopiaContext tx, TripLongline bean, Collection<GearUseFeaturesLongline> oldChilds) throws TopiaException { - - List<GearUseFeaturesLongline> gearUseFeatures = bean.getGearUseFeaturesLongline(); - - GearUseFeaturesLonglineUIModel model = getModel(); - { - - // save measurments - - GearUseFeaturesMeasurementLonglineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementLonglineDAO(tx); - - GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); - - TopiaEntityBinder<GearUseFeaturesMeasurementLongline> loader = measurementsTableModel.getLoader(); - for (Integer row : rowsChanged) { - - GearUseFeaturesLongline gearUseFeaturesLongline = gearUseFeatures.get(row); - - List<GearUseFeaturesMeasurementLongline> measurements = measurementsTableModel.getCacheForRow(row); - List<GearUseFeaturesMeasurementLongline> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementLongline>(measurements.size()); - - for (GearUseFeaturesMeasurementLongline measure : measurements) { - - if (measurementsTableModel.isRowNotEmpty(measure)) { - - GearUseFeaturesMeasurementLongline measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = measureDao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = gearUseFeaturesLongline.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - - measurementsToSave.add(measureToSave); - - } - - } - - gearUseFeaturesLongline.clearGearUseFeaturesMeasurement(); - gearUseFeaturesLongline.addAllGearUseFeaturesMeasurement(measurementsToSave); - - } - - } - - } + //FIXME +// @Override +// protected TripLongline onCreate(TopiaContext tx, Object parentBean, TripLongline editBean) throws TopiaException { +// return super.onCreate(tx, parentBean, editBean); +// } + + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, TripLongline bean, Collection<GearUseFeaturesLongline> oldChilds) throws TopiaException { +// +// List<GearUseFeaturesLongline> gearUseFeatures = bean.getGearUseFeaturesLongline(); +// +// GearUseFeaturesLonglineUIModel model = getModel(); +// { +// +// // save measurments +// +// GearUseFeaturesMeasurementLonglineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementLonglineDAO(tx); +// +// GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); +// Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); +// +// TopiaEntityBinder<GearUseFeaturesMeasurementLongline> loader = measurementsTableModel.getLoader(); +// for (Integer row : rowsChanged) { +// +// GearUseFeaturesLongline gearUseFeaturesLongline = gearUseFeatures.get(row); +// +// List<GearUseFeaturesMeasurementLongline> measurements = measurementsTableModel.getCacheForRow(row); +// List<GearUseFeaturesMeasurementLongline> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementLongline>(measurements.size()); +// +// for (GearUseFeaturesMeasurementLongline measure : measurements) { +// +// if (measurementsTableModel.isRowNotEmpty(measure)) { +// +// GearUseFeaturesMeasurementLongline measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = measureDao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = gearUseFeaturesLongline.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// +// measurementsToSave.add(measureToSave); +// +// } +// +// } +// +// gearUseFeaturesLongline.clearGearUseFeaturesMeasurement(); +// gearUseFeaturesLongline.addAllGearUseFeaturesMeasurement(measurementsToSave); +// +// } +// +// } +// +// } @Override protected void resetEditBean() { @@ -533,17 +538,19 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - public List<GearUseFeaturesMeasurementLongline> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - - try { - List<GearUseFeaturesMeasurementLongline> measurements = getDataService().getDefaultGearUseFeaturesMeasurementLongline(getDataSource(), gearId); - if (log.isInfoEnabled()) { - log.info("Create mode, use default measurements: " + measurements.size()); - } - return measurements; - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not create default measurements", e); - } + public List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { + + //FIXME +// try { +// List<GearUseFeaturesMeasurementLongline> measurements = getDataService().getDefaultGearUseFeaturesMeasurementLongline(getDataSource(), gearId); +// if (log.isInfoEnabled()) { +// log.info("Create mode, use default measurements: " + measurements.size()); +// } +// return measurements; +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not create default measurements", e); +// } + return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java index 0593604..e8c9c12 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; @@ -58,8 +57,7 @@ public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLong protected boolean generalTabValid; - //FIXME -// private final GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel; + private final GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel; public GearUseFeaturesLonglineUIModel(GearUseFeaturesLonglineUI ui) { @@ -95,7 +93,7 @@ public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLong // // } // -// this.measurementsTableModel = new GearUseFeaturesMeasurementLonglinesTableModel(binder); + this.measurementsTableModel = new GearUseFeaturesMeasurementLonglinesTableModel(); List<ContentTableMeta<GearUseFeaturesLonglineDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineDto.PROPERTY_GEAR, false), diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java index a5b98ae..1a34c4c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineImplDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; /** * Created on 4/7/15. @@ -34,21 +31,21 @@ import org.nuiton.topia.persistence.util.TopiaEntityBinder; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTableWithCacheTableModelSupport<GearUseFeaturesMeasurementLongline> { +public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTableWithCacheTableModelSupport<GearUseFeaturesMeasurementLonglineDto> { private static final long serialVersionUID = 1L; - public GearUseFeaturesMeasurementLonglinesTableModel(TopiaEntityBinder<GearUseFeaturesMeasurementLongline> topiaBinder) { - super(topiaBinder); + public GearUseFeaturesMeasurementLonglinesTableModel() { + super(); } @Override - public boolean isRowNotEmpty(GearUseFeaturesMeasurementLongline valid) { + public boolean isRowNotEmpty(GearUseFeaturesMeasurementLonglineDto valid) { return !(valid.getGearCaracteristic() == null && valid.getMeasurementValue() == null); } @Override - protected boolean isRowValid(GearUseFeaturesMeasurementLongline valid) { + protected boolean isRowValid(GearUseFeaturesMeasurementLonglineDto valid) { String size = valid.getMeasurementValue(); return !(valid.getGearCaracteristic() == null || size == null) && !size.isEmpty(); } @@ -61,7 +58,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable @Override public Object getValueAt(int rowIndex, int columnIndex) { - GearUseFeaturesMeasurementLongline measure = data.get(rowIndex); + GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -85,7 +82,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable result = true; break; case 1: - GearUseFeaturesMeasurementLongline measure = data.get(rowIndex); + GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); result = measure != null && measure.getGearCaracteristic() != null; break; default: @@ -98,11 +95,12 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - GearUseFeaturesMeasurementLongline measure = data.get(rowIndex); + GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setGearCaracteristic((GearCaracteristic) aValue); + //FIXME +// measure.setGearCaracteristic((GearCaracteristicDto) aValue); break; case 1: @@ -129,7 +127,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable } @Override - protected GearUseFeaturesMeasurementLongline createNewRow() { - return new GearUseFeaturesMeasurementLonglineImpl(); + protected GearUseFeaturesMeasurementLonglineDto createNewRow() { + return new GearUseFeaturesMeasurementLonglineDto(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css index f544615..29e05a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css @@ -26,7 +26,7 @@ } #hookType { - property:{HooksComposition.PROPERTY_HOOK_TYPE}; + property:{HooksCompositionDto.PROPERTY_HOOK_TYPE}; selectedItem:{tableEditBean.getHookType()}; _validatorLabel:{t("observe.hooksComposition.hookType")}; } @@ -37,7 +37,7 @@ } #hookSize { - property:{HooksComposition.PROPERTY_HOOK_SIZE}; + property:{HooksCompositionDto.PROPERTY_HOOK_SIZE}; selectedItem:{tableEditBean.getHookSize()}; _validatorLabel:{t("observe.hooksComposition.hookSize")}; } @@ -49,7 +49,7 @@ } #hookOffset { - property:{HooksComposition.PROPERTY_HOOK_OFFSET}; + property:{HooksCompositionDto.PROPERTY_HOOK_OFFSET}; model:{tableEditBean.getHookOffset()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.hooksComposition.hookOffset")}; @@ -61,7 +61,7 @@ } #proportion { - property:{HooksComposition.PROPERTY_PROPORTION}; + property:{HooksCompositionDto.PROPERTY_PROPORTION}; model:{tableEditBean.getProportion()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; _validatorLabel:{t("observe.hooksComposition.proportion")}; @@ -73,7 +73,8 @@ } #hooksCompositionProportionSum { - text:{getStringValue(bean.getHooksCompositionProportionSum())}; + //FIXME + //text:{getStringValue(bean.getHooksCompositionProportionSum())}; _validatorLabel:{t("observe.hooksComposition.proportionSum")}; font-weight:bold; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx index cf97d4f..a9dcbbb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx @@ -63,7 +63,8 @@ <BeanValidator id='validator' autoField='true' context='n1-update-hooksComposition' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <field name="hooksComposition" component="editorPanel"/> + <!--FIXME--> + <!--<field name="hooksComposition" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> 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 23ea26d..a04f806 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 @@ -22,16 +22,17 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.DataService; 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.longline.HooksCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.swing.JTable; import javax.swing.event.TableModelEvent; @@ -46,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline, HooksComposition> { +public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, HooksCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(HooksCompositionUIHandler.class); @@ -61,7 +62,7 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - protected void onSelectedRowChanged(int editingRow, HooksComposition bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, HooksCompositionDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { @@ -88,31 +89,34 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline n("observe.hooksComposition.table.proportion"), n("observe.hooksComposition.table.proportion.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSize.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, HookTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, HookSizeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum - table.getModel().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - int proportionSum = getBean().getHooksCompositionProportionSum(); - getBean().setHooksCompositionProportionSum(proportionSum); - } - }); - - } + //FIXME +// table.getModel().addTableModelListener(new TableModelListener() { +// @Override +// public void tableChanged(TableModelEvent e) { +// int proportionSum = getBean().getHooksCompositionProportionSum(); +// getBean().setHooksCompositionProportionSum(proportionSum); +// } +// }); - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); } - @Override - public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { - return super.onUpdate(tx, parentBean, beanToSave); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { +// return super.onUpdate(tx, parentBean, beanToSave); +// } @Override public void afterSave(boolean refresh) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java index 3fac437..760eed2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java @@ -22,22 +22,19 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.business.LonglinePositionAware; import fr.ird.observe.services.dto.longline.BasketDto; -import fr.ird.observe.services.dto.longline.BasketsDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlinesDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; -import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto; import fr.ird.observe.services.dto.longline.SectionDto; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.collections4.CollectionUtils; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; /** * Created on 1/6/15. @@ -47,22 +44,22 @@ import java.util.Map; */ public class LonglinePositionHelper<E extends LonglinePositionAware> { - final BeanComboBox<Section> uiSection; + final BeanComboBox<SectionDto> uiSection; - final BeanComboBox<Basket> uiBasket; + final BeanComboBox<BasketDto> uiBasket; - final BeanComboBox<Branchline> uiBranchline; + final BeanComboBox<BranchlineDto> uiBranchline; // To avoid any propagation when doing some works on locations protected boolean locationIsAdjusting; - List<Section> sectionUniverse; + List<SectionDto> sectionUniverse; - List<Basket> basketUniverse; + List<BasketDto> basketUniverse; - public LonglinePositionHelper(BeanComboBox<Section> uiSection, - BeanComboBox<Basket> uiBasket, - BeanComboBox<Branchline> uiBranchline, + public LonglinePositionHelper(BeanComboBox<SectionDto> uiSection, + BeanComboBox<BasketDto> uiBasket, + BeanComboBox<BranchlineDto> uiBranchline, E tableEditBean) { this.uiSection = uiSection; @@ -72,31 +69,32 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { PropertyChangeListener sectionChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onSectionChanged((Section) evt.getNewValue(), (E) evt.getSource()); + onSectionChanged((SectionDto) evt.getNewValue(), (E) evt.getSource()); } }; - tableEditBean.addPropertyChangeListener(CatchLongline.PROPERTY_SECTION, sectionChanged); + tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_SECTION, sectionChanged); PropertyChangeListener basketChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onBasketChanged((Basket) evt.getNewValue(), (E) evt.getSource()); + onBasketChanged((BasketDto) evt.getNewValue(), (E) evt.getSource()); } }; - tableEditBean.addPropertyChangeListener(CatchLongline.PROPERTY_BASKET, basketChanged); + tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_BASKET, basketChanged); } - public void initSections(List<Section> sections, List<E> entities) { + public void initSections(List<SectionDto> sections, List<E> entities) { this.sectionUniverse = sections; - this.basketUniverse = Baskets.getBaskets(sections); - - List<Branchline> branchlineUniverse = Branchlines.getBranchlines(basketUniverse); - - Map<String, Section> sectionsById = Entities.toIdMap(sectionUniverse); - Map<String, Basket> basketsById = Entities.toIdMap(basketUniverse); - Map<String, Branchline> branchlinesById = Entities.toIdMap(branchlineUniverse); +//FIXME +// this.basketUniverse = Baskets.getBaskets(sections); +// +// List<Branchline> branchlineUniverse = Branchlines.getBranchlines(basketUniverse); +// +// Map<String, Section> sectionsById = Entities.toIdMap(sectionUniverse); +// Map<String, Basket> basketsById = Entities.toIdMap(basketUniverse); +// Map<String, Branchline> branchlinesById = Entities.toIdMap(branchlineUniverse); if (CollectionUtils.isNotEmpty(entities)) { @@ -104,26 +102,28 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { { - Section section = entity.getSection(); + SectionDto section = entity.getSection(); if (section != null) { // Get fully loaded section - section = sectionsById.get(section.getTopiaId()); - entity.setSection(section); +//FIXME +// section = sectionsById.get(section.getTopiaId()); +// entity.setSection(section); } } { - Basket basket = entity.getBasket(); + BasketDto basket = entity.getBasket(); if (basket != null) { // Get fully loaded basket - basket = basketsById.get(basket.getTopiaId()); - entity.setBasket(basket); +//FIXME +// basket = basketsById.get(basket.getTopiaId()); +// entity.setBasket(basket); // Must find out section - Section section = getSection(basket); + SectionDto section = getSection(basket); entity.setSection(section); } @@ -132,19 +132,20 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { { - Branchline branchline = entity.getBranchline(); + BranchlineDto branchline = entity.getBranchline(); if (branchline != null) { // Get fully loaded branchline - branchline = branchlinesById.get(branchline.getTopiaId()); - entity.setBranchline(branchline); +//FIXME +// branchline = branchlinesById.get(branchline.getTopiaId()); +// entity.setBranchline(branchline); // Must find out basket and section - Basket basket = getBasket(branchline); + BasketDto basket = getBasket(branchline); entity.setBasket(basket); // Must find out section - Section section = getSection(basket); + SectionDto section = getSection(basket); entity.setSection(section); } @@ -159,9 +160,9 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { public void resetPosition(E entity) { - Section section = entity.getSection(); - Basket basket = entity.getBasket(); - Branchline branchline = entity.getBranchline(); + SectionDto section = entity.getSection(); + BasketDto basket = entity.getBasket(); + BranchlineDto branchline = entity.getBranchline(); uiBranchline.setSelectedItem(null); uiSection.setSelectedItem(null); @@ -209,18 +210,18 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - public List<Section> getSectionUniverse() { + public List<SectionDto> getSectionUniverse() { return sectionUniverse; } - protected void onSectionChanged(Section newValue, E entity) { + protected void onSectionChanged(SectionDto newValue, E entity) { locationIsAdjusting = true; try { - Basket basket = entity.getBasket(); - Branchline branchline = entity.getBranchline(); + BasketDto basket = entity.getBasket(); + BranchlineDto branchline = entity.getBranchline(); // on deselectionne le panier entity.setBasket(null); @@ -229,17 +230,17 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { entity.setBranchline(null); // on vide l'ensemble des paniers - uiBasket.setData(Collections.<Basket>emptyList()); + uiBasket.setData(Collections.<BasketDto>emptyList()); // on vide l'ensemble des avançons - uiBranchline.setData(Collections.<Branchline>emptyList()); + uiBranchline.setData(Collections.<BranchlineDto>emptyList()); if (newValue != null) { // une section est sélectionnée // on remplit uniquement les paniers de cette section - List<Basket> baskets = newValue.getBasket(); + List<BasketDto> baskets = new ArrayList<>(newValue.getBasket()); uiBasket.setData(baskets); if (basket != null && baskets.contains(basket)) { @@ -247,7 +248,7 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { // un panier est sélectionné // on repmlit uniquement les avançons du panier - List<Branchline> branchlines = basket.getBranchline(); + List<BranchlineDto> branchlines = new ArrayList<>(basket.getBranchline()); uiBranchline.setData(branchlines); entity.setBasket(basket); @@ -270,24 +271,24 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - protected void onBasketChanged(Basket newValue, E entity) { + protected void onBasketChanged(BasketDto newValue, E entity) { if (!locationIsAdjusting) { - Branchline branchline = entity.getBranchline(); + BranchlineDto branchline = entity.getBranchline(); // on deselectionne l'avançon entity.setBranchline(null); // on vide l'ensemble des avançons - uiBranchline.setData(Collections.<Branchline>emptyList()); + uiBranchline.setData(Collections.<BranchlineDto>emptyList()); if (newValue != null) { // un panier est selectionne // on remplit uniquement les avançons des paniers - List<Branchline> branchlines = newValue.getBranchline(); + List<BranchlineDto> branchlines = new ArrayList<>(newValue.getBranchline()); uiBranchline.setData(branchlines); if (branchline != null && branchlines.contains(branchline)) { @@ -303,11 +304,11 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - protected Section getSection(Basket basket) { + protected SectionDto getSection(BasketDto basket) { - Section result = null; + SectionDto result = null; - for (Section section : sectionUniverse) { + for (SectionDto section : sectionUniverse) { if (!section.isBasketEmpty() && section.getBasket().contains(basket)) { @@ -321,11 +322,11 @@ public class LonglinePositionHelper<E extends LonglinePositionAware> { } - protected Basket getBasket(Branchline branchline) { + protected BasketDto getBasket(BranchlineDto branchline) { - Basket result = null; + BasketDto result = null; - for (Basket basket : basketUniverse) { + for (BasketDto basket : basketUniverse) { if (!basket.isBranchlineEmpty() && basket.getBranchline().contains(branchline)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css index f0676f2..1a80380 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css @@ -26,7 +26,7 @@ } #sensorType { - property:{SensorUsed.PROPERTY_SENSOR_TYPE}; + property:{SensorUsedDto.PROPERTY_SENSOR_TYPE}; selectedItem:{tableEditBean.getSensorType()}; _validatorLabel:{t("observe.sensorUsed.sensorType")}; } @@ -37,7 +37,7 @@ } #sensorDataFormat { - property:{SensorUsed.PROPERTY_SENSOR_DATA_FORMAT}; + property:{SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT}; selectedItem:{tableEditBean.getSensorDataFormat()}; _validatorLabel:{t("observe.sensorUsed.sensorDataFormat")}; } @@ -48,7 +48,7 @@ } #sensorBrand { - property:{SensorUsed.PROPERTY_SENSOR_BRAND}; + property:{SensorUsedDto.PROPERTY_SENSOR_BRAND}; selectedItem:{tableEditBean.getSensorBrand()}; _validatorLabel:{t("observe.sensorUsed.sensorBrand")}; } @@ -59,14 +59,14 @@ } #sensorSerialNo { - _tablePropertyName:{SensorUsed.PROPERTY_SENSOR_SERIAL_NO}; + _tablePropertyName:{SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO}; text:{tableEditBean.getSensorSerialNo()}; _validatorLabel:{t("observe.sensorUsed.sensorSerialNo")}; } #resetSensorSerialNo { toolTipText:"observe.sensorUsed.action.reset.sensorSerialNo.tip"; - _resetTablePropertyName: {SensorUsed.PROPERTY_SENSOR_SERIAL_NO}; + _resetTablePropertyName: {SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO}; } #dataLocationLabel { @@ -76,13 +76,13 @@ } #dataLocation { - _tablePropertyName:{SensorUsed.PROPERTY_DATA_LOCATION}; + _tablePropertyName:{SensorUsedDto.PROPERTY_DATA_LOCATION}; text:{tableEditBean.getDataLocation()}; } #resetDataLocation { toolTipText:"observe.sensorUsed.action.reset.dataLocation.tip"; - _resetTablePropertyName: {SensorUsed.PROPERTY_DATA_LOCATION}; + _resetTablePropertyName: {SensorUsedDto.PROPERTY_DATA_LOCATION}; focusable:false; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx index 1be3251..f56ebe3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.longline.SensorUsedDto fr.ird.observe.services.dto.referential.longline.SensorTypeDto diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index 8c35c05..83ee3ca 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -25,13 +25,17 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; 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.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -61,7 +65,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, SensorUsed> { +public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineDto, SensorUsedDto> { /** Logger */ static private Log log = LogFactory.getLog(SensorUsedUIHandler.class); @@ -76,7 +80,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, } @Override - protected void onSelectedRowChanged(int editingRow, SensorUsed bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, SensorUsedDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); @@ -103,9 +107,9 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, n("observe.sensorUsed.table.dataLocation"), n("observe.sensorUsed.table.dataLocation.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SensorType.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrand.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorDataFormat.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SensorTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrandDto.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorDataFormatDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newBooleanTableCellRenderer(renderer, new Predicate<Object>() { @Override @@ -116,12 +120,13 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, UIHelper.setTableColumnRenderer(table, 5, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) { - return dataContext.getSelectedActivityId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) { +// return dataContext.getSelectedActivityId(); +// } public void importData() { @@ -181,19 +186,22 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLongline, public void exportData() { - String filename; - try { - filename = getDataService().getSensorUsedDataFilename(getDataSource(), getTableEditBean()); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not obtain sensorUser data export filename", e); - } + //FIXME +// String filename; +// try { +// filename = getDataService().getSensorUsedDataFilename(getDataSource(), getTableEditBean()); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not obtain sensorUser data export filename", e); +// } File file = JaxxFileChooser .forSaving() .setParent(getUi()) .setTitle(t("observe.title.choose.sensorUsed.exportData")) .setApprovalText(t("observe.action.choose.sensorUsed.exportData")) - .setFilename(filename) + //FIXME +// .setFilename(filename) + .setFilename(null) .setUseAcceptAllFileFilter(true) .choose(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java index d835930..a510d69 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java @@ -22,10 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.longline.SizeMeasureImplDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; /** @@ -34,23 +31,24 @@ import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupport<SizeMeasure> { +public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupport<SizeMeasureDto> { private static final long serialVersionUID = 1L; public SizeMeasuresTableModel() { - super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(SizeMeasure.class)); - + //FIXME +// super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(SizeMeasureDto.class)); + super(); } @Override - public boolean isRowNotEmpty(SizeMeasure valid) { + public boolean isRowNotEmpty(SizeMeasureDto valid) { return !(valid.getSizeMeasureType() == null && valid.getSize() == null); } @Override - protected boolean isRowValid(SizeMeasure valid) { + protected boolean isRowValid(SizeMeasureDto valid) { Float size = valid.getSize(); return !(valid.getSizeMeasureType() == null || size == null) && size > 0 && size < 1000; } @@ -63,7 +61,7 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp @Override public Object getValueAt(int rowIndex, int columnIndex) { - SizeMeasure measure = data.get(rowIndex); + SizeMeasureDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -81,11 +79,12 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - SizeMeasure measure = data.get(rowIndex); + SizeMeasureDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setSizeMeasureType((SizeMeasureType) aValue); + //FIXME +// measure.setSizeMeasureType((SizeMeasureTypeDto) aValue); break; case 1: @@ -101,8 +100,8 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp } @Override - protected SizeMeasure createNewRow() { - return new SizeMeasureImpl(); + protected SizeMeasureDto createNewRow() { + return new SizeMeasureDto(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css index 209344f..acc31e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css @@ -36,12 +36,12 @@ #homeId { text: {getStringValue(tableEditBean.getHomeId())}; - _tablePropertyName: {Tdr.PROPERTY_HOME_ID}; + _tablePropertyName: {TdrDto.PROPERTY_HOME_ID}; } #resetHomeId { toolTipText:"observe.tdr.action.reset.homeId.tip"; - _resetTablePropertyName: {Tdr.PROPERTY_HOME_ID}; + _resetTablePropertyName: {TdrDto.PROPERTY_HOME_ID}; } #serialNoLabel { @@ -51,12 +51,12 @@ #serialNo { text: {getStringValue(tableEditBean.getSerialNo())}; - _tablePropertyName: {Tdr.PROPERTY_SERIAL_NO}; + _tablePropertyName: {TdrDto.PROPERTY_SERIAL_NO}; } #resetSerialNo { toolTipText:"observe.tdr.action.reset.serialNo.tip"; - _resetTablePropertyName: {Tdr.PROPERTY_SERIAL_NO}; + _resetTablePropertyName: {TdrDto.PROPERTY_SERIAL_NO}; } @@ -66,7 +66,7 @@ } #sensorBrand { - property:{Tdr.PROPERTY_SENSOR_BRAND}; + property:{TdrDto.PROPERTY_SENSOR_BRAND}; selectedItem:{tableEditBean.getSensorBrand()}; } @@ -77,13 +77,13 @@ } #dataLocation { - _tablePropertyName:{Tdr.PROPERTY_DATA_LOCATION}; + _tablePropertyName:{TdrDto.PROPERTY_DATA_LOCATION}; text:{tableEditBean.getDataLocation()}; } #resetDataLocation { toolTipText:"observe.tdr.action.reset.dataLocation.tip"; - _resetTablePropertyName: {Tdr.PROPERTY_DATA_LOCATION}; + _resetTablePropertyName: {TdrDto.PROPERTY_DATA_LOCATION}; focusable:false; } @@ -131,7 +131,7 @@ } #section { - property:{Tdr.PROPERTY_SECTION}; + property:{TdrDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; _listNoLoad:{true}; _validatorLabel: {t("observe.tdr.section")}; @@ -143,7 +143,7 @@ } #basket { - property:{Tdr.PROPERTY_BASKET}; + property:{TdrDto.PROPERTY_BASKET}; selectedItem:{tableEditBean.getBasket()}; _listNoLoad:{true}; _validatorLabel: {t("observe.tdr.basket")}; @@ -155,7 +155,7 @@ } #branchline { - property:{Tdr.PROPERTY_BRANCHLINE}; + property:{TdrDto.PROPERTY_BRANCHLINE}; selectedItem:{tableEditBean.getBranchline()}; _listNoLoad:{true}; _validatorLabel: {t("observe.tdr.branchline")}; @@ -167,7 +167,7 @@ } #itemHorizontalPosition { - property:{Tdr.PROPERTY_ITEM_HORIZONTAL_POSITION}; + property:{TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION}; selectedItem:{tableEditBean.getItemHorizontalPosition()}; _validatorLabel: {t("observe.tdr.itemHorizontalPosition")}; } @@ -178,7 +178,7 @@ } #itemVerticalPosition { - property:{Tdr.PROPERTY_ITEM_VERTICAL_POSITION}; + property:{TdrDto.PROPERTY_ITEM_VERTICAL_POSITION}; selectedItem:{tableEditBean.getItemVerticalPosition()}; _validatorLabel: {t("observe.tdr.itemVerticalPosition")}; } @@ -189,7 +189,7 @@ } #floatline1Length { - property:{Tdr.PROPERTY_FLOATLINE1_LENGTH}; + property:{TdrDto.PROPERTY_FLOATLINE1_LENGTH}; model:{tableEditBean.getFloatline1Length()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.tdr.floatline1Length")}; @@ -201,7 +201,7 @@ } #floatline2Length { - property:{Tdr.PROPERTY_FLOATLINE2_LENGTH}; + property:{TdrDto.PROPERTY_FLOATLINE2_LENGTH}; model:{tableEditBean.getFloatline2Length()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; _validatorLabel: {t("observe.tdr.floatline2Length")}; @@ -229,36 +229,36 @@ #deployementStart { label:{t("observe.tdr.deployementStart")}; date:{tableEditBean.getDeployementStart()}; - propertyDate: {Tdr.PROPERTY_DEPLOYEMENT_START}; - propertyDayDate: {Tdr.PROPERTY_DEPLOYEMENT_START_DATE}; - propertyTimeDate: {Tdr.PROPERTY_DEPLOYEMENT_START_TIME}; + propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START}; + //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_TIME}; _validatorLabel: {t("observe.tdr.deployementStart")}; } #deployementEnd { label:{t("observe.tdr.deployementEnd")}; date:{tableEditBean.getDeployementEnd()}; - propertyDate: {Tdr.PROPERTY_DEPLOYEMENT_END}; - propertyDayDate: {Tdr.PROPERTY_DEPLOYEMENT_END_DATE}; - propertyTimeDate: {Tdr.PROPERTY_DEPLOYEMENT_END_TIME}; + propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END}; + //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_TIME}; _validatorLabel: {t("observe.tdr.deployementEnd")}; } #fishingStart { label:{t("observe.tdr.fishingStart")}; date:{tableEditBean.getFishingStart()}; - propertyDate: {Tdr.PROPERTY_FISHING_START}; - propertyDayDate: {Tdr.PROPERTY_FISHING_START_DATE}; - propertyTimeDate: {Tdr.PROPERTY_FISHING_START_TIME}; + propertyDate: {TdrDto.PROPERTY_FISHING_START}; + //propertyDayDate: {TdrDto.PROPERTY_FISHING_START_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_FISHING_START_TIME}; _validatorLabel: {t("observe.tdr.fishingStart")}; } #fishingEnd { label:{t("observe.tdr.fishingEnd")}; date:{tableEditBean.getFishingEnd()}; - propertyDate: {Tdr.PROPERTY_FISHING_END}; - propertyDayDate: {Tdr.PROPERTY_FISHING_END_DATE}; - propertyTimeDate: {Tdr.PROPERTY_FISHING_END_TIME}; + propertyDate: {TdrDto.PROPERTY_FISHING_END}; + //propertyDayDate: {TdrDto.PROPERTY_FISHING_END_DATE}; + //propertyTimeDate: {TdrDto.PROPERTY_FISHING_END_TIME}; _validatorLabel: {t("observe.tdr.fishingEnd")}; } @@ -277,7 +277,7 @@ } #fishingStartDepth { - property:{Tdr.PROPERTY_FISHING_START_DEPTH}; + property:{TdrDto.PROPERTY_FISHING_START_DEPTH}; model:{tableEditBean.getFishingStartDepth()}; _validatorLabel: {t("observe.tdr.fishingStartDepth")}; } @@ -288,7 +288,7 @@ } #fishingEndDepth { - property:{Tdr.PROPERTY_FISHING_END_DEPTH}; + property:{TdrDto.PROPERTY_FISHING_END_DEPTH}; model:{tableEditBean.getFishingEndDepth()}; _validatorLabel: {t("observe.tdr.fishingEndDepth")}; } @@ -299,7 +299,7 @@ } #meanDeployementDepth { - property:{Tdr.PROPERTY_MEAN_DEPLOYEMENT_DEPTH}; + property:{TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH}; model:{tableEditBean.getMeanDeployementDepth()}; _validatorLabel: {t("observe.tdr.meanDeployementDepth")}; } @@ -310,7 +310,7 @@ } #medianDeployementDepth { - property:{Tdr.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH}; + property:{TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH}; model:{tableEditBean.getMedianDeployementDepth()}; _validatorLabel: {t("observe.tdr.medianDeployementDepth")}; } @@ -321,7 +321,7 @@ } #minFishingDepth { - property:{Tdr.PROPERTY_MIN_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MIN_FISHING_DEPTH}; model:{tableEditBean.getMinFishingDepth()}; _validatorLabel: {t("observe.tdr.minFishingDepth")}; } @@ -332,7 +332,7 @@ } #maxFishingDepth { - property:{Tdr.PROPERTY_MAX_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MAX_FISHING_DEPTH}; model:{tableEditBean.getMaxFishingDepth()}; _validatorLabel: {t("observe.tdr.maxFishingDepth")}; } @@ -343,7 +343,7 @@ } #meanFishingDepth { - property:{Tdr.PROPERTY_MEAN_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MEAN_FISHING_DEPTH}; model:{tableEditBean.getMeanFishingDepth()}; _validatorLabel: {t("observe.tdr.meanFishingDepth")}; } @@ -354,7 +354,7 @@ } #medianFishingDepth { - property:{Tdr.PROPERTY_MEDIAN_FISHING_DEPTH}; + property:{TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH}; model:{tableEditBean.getMedianFishingDepth()}; _validatorLabel: {t("observe.tdr.medianFishingDepth")}; } @@ -369,8 +369,10 @@ } #species { - property: {Tdr.PROPERTY_SPECIES}; - selected:{tableEditBean.getSpecies()}; + //FIXME + //property: {TdrDto.PROPERTY_SPECIES}; + //FIXME + //selected:{tableEditBean.getSpecies()}; _validatorLabel: {t("observe.tdr.species")}; showListLabel: true; universeLabel:{t("observe.tdr.availableSpecies")}; 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 1366299..5632352 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 @@ -25,7 +25,6 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.business.ObserveTechnicalException; @@ -33,6 +32,9 @@ 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.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -78,7 +80,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { +public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> { /** Logger */ static private Log log = LogFactory.getLog(TdrUIHandler.class); @@ -105,8 +107,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { protected boolean toogleTimeEditorSliderIsChanging; - JAXXContextEntryDef<LonglinePositionHelper<Tdr>> POSITION_HELPER_ENTRY = - UIHelper.newContextEntryDef("TdrUI-positionHelper", LonglinePositionHelper.class); + //FIXME +// JAXXContextEntryDef<LonglinePositionHelper<TdrDto>> POSITION_HELPER_ENTRY = +// UIHelper.newContextEntryDef("TdrUI-positionHelper", LonglinePositionHelper.class); public TdrUIHandler(TdrUI ui) { super(ui, DataContextType.SetLongline); @@ -118,9 +121,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } @Override - protected void onSelectedRowChanged(int editingRow, Tdr bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, TdrDto bean, boolean create) { - ContentTableModel<SetLongline, Tdr> model = getTableModel(); + ContentTableModel<SetLonglineDto, TdrDto> model = getTableModel(); TdrUI ui = getUi(); @@ -142,7 +145,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { // set date - time - SetLongline setLongline = getBean(); + SetLonglineDto setLongline = getBean(); Date settingStartTimeStamp = setLongline.getSettingStartTimeStamp(); setTimestamp(bean, settingStartTimeStamp); @@ -160,8 +163,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); - positionHelper.resetPosition(bean); + //FIXME +// LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); +// positionHelper.resetPosition(bean); requestFocus.requestFocus(); @@ -184,7 +188,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { UIHelper.setTableColumnRenderer(table, 0, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newStringTableCellRenderer(renderer, 10, true)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrand.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrandDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newBooleanTableCellRenderer(renderer, new Predicate<Object>() { @Override public boolean apply(Object input) { @@ -194,10 +198,11 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } @Override public void initUI() throws Exception { @@ -209,13 +214,13 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { super.initUI(); - LonglinePositionHelper<Tdr> positionHelper = new LonglinePositionHelper<Tdr>( - getUi().getSection(), - getUi().getBasket(), - getUi().getBranchline(), - getTableEditBean()); +// LonglinePositionHelper<TdrDto> positionHelper = new LonglinePositionHelper<TdrDto>( +// getUi().getSection(), +// getUi().getBasket(), +// getUi().getBranchline(), +// getTableEditBean()); - POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); +// POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); getUi().getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); getUi().getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); @@ -233,8 +238,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { super.openUI(); // Reset all sections - LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - getUi().getSection().setData(positionHelper.getSectionUniverse()); +// LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// getUi().getSection().setData(positionHelper.getSectionUniverse()); // To be sure always remove listener (could prevent some leaks) getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); @@ -258,26 +263,27 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - @Override - protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // load sections (and baskets and branchlines) - List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); - - LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.initSections(sections, getTableModel().getData()); - - return setLongline; - - } + //FIXME +// @Override +// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // load sections (and baskets and branchlines) +// List<Section> sections = dataService.getSections(dataSource, setLongline.getTopiaId()); +// +// LonglinePositionHelper<Tdr> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); +// positionHelper.initSections(sections, getTableModel().getData()); +// +// return setLongline; +// +// } @Override protected void resetEditBean() { super.resetEditBean(); - Tdr tableEditBean = getTableEditBean(); + TdrDto tableEditBean = getTableEditBean(); boolean withTimestamp = tableEditBean.getFishingStart() != null; getUi().getEnableTimestamp().setSelected(withTimestamp); @@ -290,7 +296,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { if (enableTimestamp) { - SetLongline setLongline = getBean(); + SetLonglineDto setLongline = getBean(); timeStamp = setLongline.getSettingStartTimeStamp(); } else { @@ -299,7 +305,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - Tdr bean = getTableEditBean(); + TdrDto bean = getTableEditBean(); setTimestamp(bean, timeStamp); } @@ -362,19 +368,22 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { public void exportData() { - String filename; - try { - filename = getDataService().getTdrDataFilename(getDataSource(), getTableEditBean()); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not obtain tdr data export filename", e); - } + //FIXME +// String filename; +// try { +// filename = getDataService().getTdrDataFilename(getDataSource(), getTableEditBean()); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not obtain tdr data export filename", e); +// } File file = JaxxFileChooser .forSaving() .setParent(getUi()) .setTitle(t("observe.title.choose.tdr.exportData")) .setApprovalText(t("observe.action.choose.tdr.exportData")) - .setFilename(filename) + //FIXME +// .setFilename(filename) + .setFilename(null) .setUseAcceptAllFileFilter(true) .choose(); @@ -469,7 +478,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLongline, Tdr> { } - protected void setTimestamp(Tdr bean, Date timestamp) { + protected void setTimestamp(TdrDto bean, Date timestamp) { bean.setDeployementStart(timestamp); bean.setDeployementEnd(timestamp); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java index 7ea091e..1f8cf05 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java @@ -22,10 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.longline.WeightMeasureImplDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; /** @@ -34,28 +31,28 @@ import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSupport<WeightMeasure> { +public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSupport<WeightMeasureDto> { private static final long serialVersionUID = 1L; public WeightMeasuresTableModel() { - super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(WeightMeasure.class)); + super(); } @Override - public boolean isRowNotEmpty(WeightMeasure valid) { + public boolean isRowNotEmpty(WeightMeasureDto valid) { return !(valid.getWeightMeasureType() == null && valid.getWeight() == null); } @Override - public boolean isRowValid(WeightMeasure valid) { + public boolean isRowValid(WeightMeasureDto valid) { Float weight = valid.getWeight(); return !(valid.getWeightMeasureType() == null || weight == null) && weight > 0 && weight < 1000; } @Override - protected WeightMeasure createNewRow() { - return new WeightMeasureImpl(); + protected WeightMeasureDto createNewRow() { + return new WeightMeasureDto(); } @Override @@ -66,7 +63,7 @@ public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSu @Override public Object getValueAt(int rowIndex, int columnIndex) { - WeightMeasure measure = data.get(rowIndex); + WeightMeasureDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -84,11 +81,12 @@ public class WeightMeasuresTableModel extends EditableTableWithCacheTableModelSu @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - WeightMeasure measure = data.get(rowIndex); + WeightMeasureDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setWeightMeasureType((WeightMeasureType) aValue); + //FIXME +// measure.setWeightMeasureType((WeightMeasureTypeDto) aValue); break; case 1: diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java index e505b72..4056281 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java @@ -24,7 +24,8 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypesDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; @@ -119,21 +120,22 @@ public class GearUseFeatureMeasurementCellEditor extends AbstractCellEditor impl @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - GearCaracteristic caracteristic = (GearCaracteristic) table.getModel().getValueAt(row, caracteristicColumn); + GearCaracteristicDto caracteristic = (GearCaracteristicDto) table.getModel().getValueAt(row, caracteristicColumn); if (caracteristic == null) { // can't edit a null value ? editor = table.getDefaultEditor(Object.class); } else { - GearCaracteristicType gearCaracteristicType = caracteristic.getGearCaracteristicType(); + ReferentialReferenceDto<GearCaracteristicTypeDto> gearCaracteristicType = caracteristic.getGearCaracteristicType(); - String gearCaracteristicTypeId = gearCaracteristicType.getTopiaId(); + String gearCaracteristicTypeId = gearCaracteristicType.getId(); Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); - value = GearCaracteristicTypes.getTypeValue(gearCaracteristicType, value); + //FIXME +// value = GearCaracteristicTypeDtos.getTypeValue(gearCaracteristicType, value); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java index 2041e3e..7ad11bf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java @@ -24,13 +24,13 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypesDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.ui.UIHelper; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import java.awt.Component; +import java.awt.*; import java.util.Map; import java.util.TreeMap; @@ -89,19 +89,20 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer TableCellRenderer tableCellRenderer; - GearCaracteristic caracteristic = (GearCaracteristic) table.getModel().getValueAt(row, caracteristicColumn); + GearCaracteristicDto caracteristic = (GearCaracteristicDto) table.getModel().getValueAt(row, caracteristicColumn); if (caracteristic == null) { tableCellRenderer = table.getDefaultRenderer(Object.class); } else { - GearCaracteristicType gearCaracteristicType = caracteristic.getGearCaracteristicType(); + ReferentialReferenceDto<GearCaracteristicTypeDto> gearCaracteristicType = caracteristic.getGearCaracteristicType(); - String gearCaracteristicTypeId = gearCaracteristicType.getTopiaId(); + String gearCaracteristicTypeId = gearCaracteristicType.getId(); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); - value = GearCaracteristicTypes.getTypeValue(gearCaracteristicType, value); + //FIXME +// value = GearCaracteristicTypeDtos.getTypeValue(gearCaracteristicType, value); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java index 2792d07..3c34671 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; -import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineImplDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; /** * Created on 4/7/15. @@ -38,8 +35,8 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit private static final long serialVersionUID = 1L; - public GearUseFeaturesMeasurementSeinesTableModel(TopiaEntityBinder<GearUseFeaturesMeasurementSeineDto> topiaBinder) { - super(topiaBinder); + public GearUseFeaturesMeasurementSeinesTableModel() { + super(); } @Override @@ -85,7 +82,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit result = true; break; case 1: - GearUseFeaturesMeasurementSeine measure = data.get(rowIndex); + GearUseFeaturesMeasurementSeineDto measure = data.get(rowIndex); result = measure != null && measure.getGearCaracteristic() != null; break; default: @@ -102,7 +99,8 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit switch (columnIndex) { case 0: - measure.setGearCaracteristic((GearCaracteristic) aValue); + //FIXME +// measure.setGearCaracteristic((GearCaracteristicDto) aValue); break; case 1: diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java index eb7d322..0e98438 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -82,13 +83,13 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineD GearUseFeaturesSeineDto rowBean = getRowBean(); GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements - Gear gear = rowBean.getGear(); + ReferentialReferenceDto<GearDto> gear = rowBean.getGear(); List<GearUseFeaturesMeasurementSeineDto> measurements = - gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getTopiaId()); + gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css index d2f186b..355ef0f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css @@ -41,7 +41,7 @@ } #gear { - property:{GearUseFeaturesSeine.PROPERTY_GEAR}; + property:{GearUseFeaturesSeineDto.PROPERTY_GEAR}; selectedItem:{tableEditBean.getGear()}; } @@ -51,7 +51,7 @@ } #number { - property:{GearUseFeaturesSeine.PROPERTY_NUMBER}; + property:{GearUseFeaturesSeineDto.PROPERTY_NUMBER}; model:{tableEditBean.getNumber()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -63,7 +63,7 @@ #usedInTrip { booleanValue:{tableEditBean.getUsedInTrip()}; - _tablePropertyName:{GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP}; + _tablePropertyName:{GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP}; } /* ***************************************************************************** */ @@ -86,7 +86,7 @@ } #comment2 { - _tablePropertyName: {GearUseFeaturesSeine.PROPERTY_COMMENT}; + _tablePropertyName: {GearUseFeaturesSeineDto.PROPERTY_COMMENT}; text:{getStringValue(tableEditBean.getComment())}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index fa0cd18..ffc8800 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -29,11 +29,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto - fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineImplDto fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -100,7 +99,7 @@ <JLabel id='gearLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='gear' constructorParams='this' genericType='Gear'/> + <BeanComboBox id='gear' constructorParams='this' genericType='GearDto'/> </cell> </row> 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 8c2218c..f353f88 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 @@ -22,15 +22,17 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveDAOHelper; 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.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDAODto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -44,9 +46,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -79,7 +78,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeine, GearUseFeaturesSeine> { +public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeineDto, GearUseFeaturesSeineDto> { /** Logger */ static private Log log = LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); @@ -118,7 +117,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - protected void onSelectedRowChanged(int editingRow, GearUseFeaturesSeine bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, GearUseFeaturesSeineDto bean, boolean create) { if (log.isInfoEnabled()) { log.info("Selected row changed: " + editingRow + ", create? " + create); @@ -136,7 +135,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // load size measures GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - List<GearUseFeaturesMeasurementSeine> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementSeine>emptyList() : measurementsTableModel.getCacheForRow(editingRow); + List<GearUseFeaturesMeasurementSeineDto> measurements = emptySelection ? Collections.<GearUseFeaturesMeasurementSeineDto>emptyList() : measurementsTableModel.getCacheForRow(editingRow); if (measurements == null) { if (log.isInfoEnabled()) { @@ -157,16 +156,17 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } else { // updating mode: loading from db - try { - - measurements = getDataService().getGearUseFeaturesMeasurementSeine(getDataSource(), bean, measurementsTableModel.getLoader()); - if (log.isInfoEnabled()) { - log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); - } - - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load measurements", e); - } + //FIXME +// try { +// +// measurements = getDataService().getGearUseFeaturesMeasurementSeine(getDataSource(), bean, measurementsTableModel.getLoader()); +// if (log.isInfoEnabled()) { +// log.info("Loaded measurements (" + bean.getTopiaId() + "): " + measurements.size()); +// } +// +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not load measurements", e); +// } } // init measurements @@ -223,7 +223,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei n("observe.gearUseFeaturesSeine.table.comment"), n("observe.gearUseFeaturesSeine.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Gear.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); @@ -239,20 +239,21 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei n("observe.gearUseFeaturesSeine.table.value"), n("observe.gearUseFeaturesSeine.table.value.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristic.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, GearCaracteristicDto.class)); UIHelper.setTableColumnRenderer(table, 1, new GearUseFeatureMeasurementCellRenderer(0, renderer)); table.getTableHeader().setReorderingAllowed(false); - Decorator<GearCaracteristic> decorator = ObserveContext.get().getDecorator(GearCaracteristic.class); + Decorator<GearCaracteristicDto> decorator = ObserveContext.get().getDecorator(GearCaracteristicDto.class); - List<GearCaracteristic> list; - try { - list = getDataService().getList(getDataSource(), GearCaracteristic.class); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not get gear caracteristics", e); - } - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); + //FIXME +// List<GearCaracteristicDto> list; +// try { +// list = getDataService().getList(getDataSource(), GearCaracteristic.class); +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not get gear caracteristics", e); +// } +// UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(list, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); GearUseFeaturesMeasurementSeinesTableModel tableModel = getModel().getMeasurementsTableModel(); @@ -277,10 +278,11 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedTripSeineId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedTripSeineId(); +// } @Override public void initUI() throws Exception { @@ -301,17 +303,18 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - @Override - protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); - - // reset measurements - getModel().getMeasurementsTableModel().clear(); - - return tripSeine; - - } + //FIXME +// @Override +// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); +// +// // reset measurements +// getModel().getMeasurementsTableModel().clear(); +// +// return tripSeine; +// +// } @Override public void openUI() throws Exception { @@ -362,7 +365,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei if (!selectionEmpty) { - GearUseFeaturesMeasurementSeine data = tableModel.getSelectedRow(); + GearUseFeaturesMeasurementSeineDto data = tableModel.getSelectedRow(); if (log.isInfoEnabled()) { log.info("Delete: " + data); @@ -389,63 +392,64 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - - @Override - protected TripSeine onCreate(TopiaContext tx, Object parentBean, TripSeine editBean) throws TopiaException { - return super.onCreate(tx, parentBean, editBean); - } - - @Override - protected void onUpdateFinalize(TopiaContext tx, TripSeine bean, Collection<GearUseFeaturesSeine> oldChilds) throws TopiaException { - - List<GearUseFeaturesSeine> gearUseFeatures = bean.getGearUseFeaturesSeine(); - - GearUseFeaturesSeineUIModel model = getModel(); - { - - // save measurments - - GearUseFeaturesMeasurementSeineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementSeineDAO(tx); - - GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); - - TopiaEntityBinder<GearUseFeaturesMeasurementSeine> loader = measurementsTableModel.getLoader(); - for (Integer row : rowsChanged) { - - GearUseFeaturesSeine gearUseFeaturesSeine = gearUseFeatures.get(row); - - List<GearUseFeaturesMeasurementSeine> measurements = measurementsTableModel.getCacheForRow(row); - List<GearUseFeaturesMeasurementSeine> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementSeine>(measurements.size()); - - for (GearUseFeaturesMeasurementSeine measure : measurements) { - - if (measurementsTableModel.isRowNotEmpty(measure)) { - - GearUseFeaturesMeasurementSeine measureToSave; - - if (measure.getTopiaId() == null) { - measureToSave = measureDao.create(measure); - loader.load(measureToSave, measure, true); - } else { - measureToSave = gearUseFeaturesSeine.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); - loader.load(measure, measureToSave, true); - } - - measurementsToSave.add(measureToSave); - - } - - } - - gearUseFeaturesSeine.clearGearUseFeaturesMeasurement(); - gearUseFeaturesSeine.addAllGearUseFeaturesMeasurement(measurementsToSave); - - } - - } - - } + //FIXME +// @Override +// protected TripSeine onCreate(TopiaContext tx, Object parentBean, TripSeine editBean) throws TopiaException { +// return super.onCreate(tx, parentBean, editBean); +// } + + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, TripSeine bean, Collection<GearUseFeaturesSeine> oldChilds) throws TopiaException { +// +// List<GearUseFeaturesSeine> gearUseFeatures = bean.getGearUseFeaturesSeine(); +// +// GearUseFeaturesSeineUIModel model = getModel(); +// { +// +// // save measurments +// +// GearUseFeaturesMeasurementSeineDAO measureDao = ObserveDAOHelper.getGearUseFeaturesMeasurementSeineDAO(tx); +// +// GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); +// Set<Integer> rowsChanged = measurementsTableModel.getCacheRowsChanged(); +// +// TopiaEntityBinder<GearUseFeaturesMeasurementSeine> loader = measurementsTableModel.getLoader(); +// for (Integer row : rowsChanged) { +// +// GearUseFeaturesSeine gearUseFeaturesSeine = gearUseFeatures.get(row); +// +// List<GearUseFeaturesMeasurementSeine> measurements = measurementsTableModel.getCacheForRow(row); +// List<GearUseFeaturesMeasurementSeine> measurementsToSave = new ArrayList<GearUseFeaturesMeasurementSeine>(measurements.size()); +// +// for (GearUseFeaturesMeasurementSeine measure : measurements) { +// +// if (measurementsTableModel.isRowNotEmpty(measure)) { +// +// GearUseFeaturesMeasurementSeine measureToSave; +// +// if (measure.getTopiaId() == null) { +// measureToSave = measureDao.create(measure); +// loader.load(measureToSave, measure, true); +// } else { +// measureToSave = gearUseFeaturesSeine.getGearUseFeaturesMeasurementByTopiaId(measure.getTopiaId()); +// loader.load(measure, measureToSave, true); +// } +// +// measurementsToSave.add(measureToSave); +// +// } +// +// } +// +// gearUseFeaturesSeine.clearGearUseFeaturesMeasurement(); +// gearUseFeaturesSeine.addAllGearUseFeaturesMeasurement(measurementsToSave); +// +// } +// +// } +// +// } @Override protected void resetEditBean() { @@ -532,17 +536,19 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - public List<GearUseFeaturesMeasurementSeine> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - - try { - List<GearUseFeaturesMeasurementSeine> measurements = getDataService().getDefaultGearUseFeaturesMeasurementSeine(getDataSource(), gearId); - if (log.isInfoEnabled()) { - log.info("Create mode, use default measurements: " + measurements.size()); - } - return measurements; - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not create default measurements", e); - } + public List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { + + //FIXME +// try { +// List<GearUseFeaturesMeasurementSeineDto> measurements = getDataService().getDefaultGearUseFeaturesMeasurementSeine(getDataSource(), gearId); +// if (log.isInfoEnabled()) { +// log.info("Create mode, use default measurements: " + measurements.size()); +// } +// return measurements; +// } catch (DataSourceException e) { +// throw new ObserveTechnicalException("Could not create default measurements", e); +// } + return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java index ad16a8e..58156ab 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java @@ -55,14 +55,16 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDt protected boolean generalTabValid; - //FIXME -// private final GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel; + private final GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel; public GearUseFeaturesSeineUIModel(GearUseFeaturesSeineUI ui) { super(TripSeineDto.class, GearUseFeaturesSeineDto.class, - new String[]{TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE}, + new String[]{ + //FIXME +// TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE + }, new String[]{ GearUseFeaturesSeineDto.PROPERTY_COMMENT, GearUseFeaturesSeineDto.PROPERTY_GEAR, @@ -88,7 +90,7 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDt // // } // -// this.measurementsTableModel = new GearUseFeaturesMeasurementSeinesTableModel(binder); + this.measurementsTableModel = new GearUseFeaturesMeasurementSeinesTableModel(); List<ContentTableMeta<GearUseFeaturesSeineDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(GearUseFeaturesSeineDto.class, GearUseFeaturesSeineDto.PROPERTY_GEAR, false), @@ -105,10 +107,9 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDt return new GearUseFeaturesSeineTableModel(ui, contentTableMetas); } - //FIXME -// public GearUseFeaturesMeasurementSeinesTableModel getMeasurementsTableModel() { -// return measurementsTableModel; -// } + public GearUseFeaturesMeasurementSeinesTableModel getMeasurementsTableModel() { + return measurementsTableModel; + } public boolean isGeneralTabValid() { return generalTabValid; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css index fe9a827..deccd5f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css @@ -29,10 +29,11 @@ labelFor:{species}; } -#species { - property:{NonTargetCatch.PROPERTY_SPECIES}; - selectedItem:{tableEditBean.getSpecies()}; -} + //FIXME +//#species { +// property:{NonTargetCatchDto.PROPERTY_SPECIES}; +// selectedItem:{tableEditBean.getSpecies()}; +//} #speciesFateLabel { text:"observe.common.speciesFate"; @@ -40,7 +41,7 @@ } #speciesFate { - property:{NonTargetCatch.PROPERTY_SPECIES_FATE}; + property:{NonTargetCatchDto.PROPERTY_SPECIES_FATE}; selectedItem:{tableEditBean.getSpeciesFate()}; } @@ -50,7 +51,7 @@ } #reasonForDiscard { - property:{NonTargetCatch.PROPERTY_REASON_FOR_DISCARD}; + property:{NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD}; selectedItem:{tableEditBean.getReasonForDiscard()}; } @@ -60,7 +61,7 @@ } #catchWeight { - property:{NonTargetCatch.PROPERTY_CATCH_WEIGHT}; + property:{NonTargetCatchDto.PROPERTY_CATCH_WEIGHT}; useFloat:true; model:{tableEditBean.getCatchWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; @@ -79,7 +80,7 @@ } #totalCount { - property:{NonTargetCatch.PROPERTY_TOTAL_COUNT}; + property:{NonTargetCatchDto.PROPERTY_TOTAL_COUNT}; model:{tableEditBean.getTotalCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -97,7 +98,7 @@ } #meanWeight { - property:{NonTargetCatch.PROPERTY_MEAN_WEIGHT}; + property:{NonTargetCatchDto.PROPERTY_MEAN_WEIGHT}; model:{tableEditBean.getMeanWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; } @@ -115,7 +116,7 @@ } #meanLength { - property:{NonTargetCatch.PROPERTY_MEAN_LENGTH}; + property:{NonTargetCatchDto.PROPERTY_MEAN_LENGTH}; model:{tableEditBean.getMeanLength()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index 1a42d45..69b568c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -32,14 +32,14 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.NonTargetCatchDto - fr.ird.observe.services.dto.referential.seine.SpeciesFate + fr.ird.observe.services.dto.referential.seine.SpeciesFateDto fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.seine.ReasonForDiscard + fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.table.* - fr.ird.observe.validation.ObserveValidator + fr.ird.observe.business.validation.ObserveValidator jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -72,7 +72,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-nonTargetCatch'> <!-- clef unique --> - <field name="nonTargetCatch" component="editorPanel"/> + <!--FIXME--> + <!--<field name="nonTargetCatch" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -91,7 +92,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='species' constructorParams='this' genericType='Species'/> + <BeanComboBox id='species' constructorParams='this' genericType='SpeciesDto'/> </cell> </row> @@ -101,7 +102,7 @@ <JLabel id='speciesFateLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='speciesFate' constructorParams='this' genericType='SpeciesFate'/> + <BeanComboBox id='speciesFate' constructorParams='this' genericType='SpeciesFateDto'/> </cell> </row> @@ -111,7 +112,7 @@ <JLabel id='reasonForDiscardLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscard'/> + <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscardDto'/> </cell> </row> 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 2a15648..637a5db 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 @@ -21,36 +21,25 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveConfig; -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.constants.seine.NonTargetCatchComputedValueSourceDto; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.UIHelper; -import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -60,16 +49,16 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, NonTargetCatch> { +public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, NonTargetCatchDto> { /** Logger */ static private Log log = LogFactory.getLog(NonTargetCatchUIHandler.class); /** l'entrée dans le contexte pour récupérer la liste complete des speciess */ - protected final JAXXContextEntryDef<List<Species>> ALL_ESPECES_ENTRY = + protected final JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = UIHelper.newListContextEntryDef("NonTargetCatchUI-all-speciess"); - protected final JAXXContextEntryDef<List<NonTargetLength>> ALL_TAILLES_TO_DELETE_ENTRY = + protected final JAXXContextEntryDef<List<NonTargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = UIHelper.newListContextEntryDef("NonTargetCatchUI-all-taille-to-delete"); /** @@ -82,7 +71,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener totalCountChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setTotalCountComputedSource(null); } }; @@ -97,7 +86,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener catchWeightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setCatchWeightComputedSource(null); } }; @@ -112,7 +101,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener meanWeightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setMeanWeightComputedSource(null); } }; @@ -127,7 +116,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non protected final PropertyChangeListener meanLengthChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetCatch source = (NonTargetCatch) evt.getSource(); + NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setMeanLengthComputedSource(null); } }; @@ -206,57 +195,58 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non getUi().getMeanLength().grabFocus(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } - - @Override - protected SetSeine loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<Species> speciesList; - - if (mode == ContentMode.UPDATE) { - - // get current ocean - Ocean ocean = dataService.getTripOcean( - dataSource, dataContext.getSelectedTripId()); - - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineNonTargetCatchId(); - - // get all species - List<Species> allSpecies = - dataService.loadDecoratedSpecies(dataSource, speciesListId); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(allSpecies); - - // filtre par ocean - speciesList = Species2.filterByOcean(allSpecies, ocean); - - } else { - - speciesList = new ArrayList<Species>(); - } - - ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); - if (log.isDebugEnabled()) { - log.debug("speciesList = " + speciesList.size()); - } - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + +// @Override +// protected SetSeine loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<Species> speciesList; +// +// if (mode == ContentMode.UPDATE) { +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean( +// dataSource, dataContext.getSelectedTripId()); +// +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineNonTargetCatchId(); +// +// // get all species +// List<Species> allSpecies = +// dataService.loadDecoratedSpecies(dataSource, speciesListId); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(allSpecies); +// +// // filtre par ocean +// speciesList = Species2.filterByOcean(allSpecies, ocean); +// +// } else { +// +// speciesList = new ArrayList<Species>(); +// } +// +// ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); +// if (log.isDebugEnabled()) { +// log.debug("speciesList = " + speciesList.size()); +// } +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } @Override protected void onSelectedRowChanged(int editingRow, - NonTargetCatch bean, + NonTargetCatchDto bean, boolean create) { NonTargetCatchUI ui = getUi(); - ContentTableModel<SetSeine, NonTargetCatch> model = getTableModel(); + ContentTableModel<SetSeineDto, NonTargetCatchDto> model = getTableModel(); if (!model.isEditable()) { @@ -264,34 +254,38 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non return; } - List<Species> availableEspeces; + //FIXME +// List<SpeciesDto> availableEspeces; JComponent requestFocus; if (create) { - availableEspeces = new ArrayList<Species>(ALL_ESPECES_ENTRY.getContextValue(ui)); + //FIXME +// availableEspeces = new ArrayList<SpeciesDto>(ALL_ESPECES_ENTRY.getContextValue(ui)); requestFocus = ui.getSpecies(); } else { - Species species = bean.getSpecies(); - availableEspeces = Arrays.asList(species); + //FIXME +// SpeciesDto species = bean.getSpecies(); +// availableEspeces = Arrays.asList(species); requestFocus = ui.getTable(); } - ui.getSpecies().setData(availableEspeces); + //FIXME +// ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); - NonTargetCatch tableEditBean = getTableEditBean(); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_TOTAL_COUNT, totalCountChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_TOTAL_COUNT, totalCountChanged); + NonTargetCatchDto tableEditBean = getTableEditBean(); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_CATCH_WEIGHT, catchWeightChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_CATCH_WEIGHT, catchWeightChanged); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, catchWeightChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, catchWeightChanged); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_WEIGHT, meanWeightChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_WEIGHT, meanWeightChanged); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, meanWeightChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, meanWeightChanged); - tableEditBean.removePropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_LENGTH, meanLengthChanged); - tableEditBean.addPropertyChangeListener(NonTargetCatch.PROPERTY_MEAN_LENGTH, meanLengthChanged); + tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_LENGTH, meanLengthChanged); + tableEditBean.addPropertyChangeListener(NonTargetCatchDto.PROPERTY_MEAN_LENGTH, meanLengthChanged); } @Override @@ -324,9 +318,9 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non n("observe.nonTargetCatch.table.comment"), n("observe.nonTargetCatch.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesFate.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscard.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesFateDto.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscardDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -334,113 +328,116 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Non UIHelper.setTableColumnRenderer(table, 7, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - @Override - protected boolean doSave(SetSeine bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<SetSeine> binder) throws Exception { - try { - return super.doSave(bean, dataService, dataSource, binder); - } finally { - - // toujours supprimer la référence du context, quoiqu'il arrive - ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); - } - } - - @Override - protected boolean prepareSave(SetSeine editBean, List<NonTargetCatch> objets) throws Exception { - super.prepareSave(editBean, objets); - - List<Species> speciessUsed = getTableModel().getColumnValues(0); - - Collection<Species> speciessToDelete = new HashSet<Species>(); - List<NonTargetLength> tailleToDelete = new ArrayList<NonTargetLength>(); - - getDataService().getObsoleteEspeceForNonTargetSample(getDataSource(), - editBean.getTopiaId(), - speciessUsed, - speciessToDelete, - tailleToDelete); - - if (!tailleToDelete.isEmpty()) { - - // il existe des echantillon faune a supprimer on demande une - // confirmation - StringBuilder sb = new StringBuilder(); - StringBuilder sb2 = new StringBuilder(); - Decorator<Species> decorator; - Decorator<NonTargetLength> decorator2; - decorator = getDecoratorService().getDecoratorByType(Species.class); - decorator2 = getDecoratorService().getDecoratorByType(NonTargetLength.class); - - for (Species e : speciessToDelete) { - sb.append(" - ").append(decorator.toString(e)).append('\n'); - } - for (NonTargetLength t : tailleToDelete) { - sb2.append(" - ").append(decorator2.toString(t)).append('\n'); - } - int reponse = UIHelper.askUser( - t("observe.title.need.confirm"), - t("observe.nonTargetCatch.message.table.will.delete.nonTargetSample", sb.toString(), sb2.toString()), - JOptionPane.ERROR_MESSAGE, - new Object[]{ - t("observe.choice.continue"), - t("observe.choice.cancel")}, - 0); - if (log.isDebugEnabled()) { - log.debug("response : " + reponse); - } - boolean canContinue = false; - switch (reponse) { - case 0: - // wil reset ui - canContinue = true; - break; - } - if (!canContinue) { - // l'utilisateur a choisi de ne pas continuer - return false; - } - - // on conserve les tailles a supprimer - ALL_TAILLES_TO_DELETE_ENTRY.setContextValue(getUi(), tailleToDelete); - } - - // mise a jour de la propriete nonTargetDiscarded - - boolean hasRejet = false; - for (NonTargetCatch c : objets) { - if (c.getReasonForDiscard() != null) { - // on a trouve un rejet de faune - hasRejet = true; - break; - } - } - editBean.setNonTargetDiscarded(hasRejet); - - return true; - } - - @Override - protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<NonTargetCatch> oldChilds) { - - List<NonTargetLength> tailleToDelete = - ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); - - if (tailleToDelete != null && !tailleToDelete.isEmpty()) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + tailleToDelete.size() + - " obsolete nonTargetSample(s)."); - } - - NonTargetSample echantillon = bean.getNonTargetSample().get(0); - - // on supprime les echantillons obsoletes - echantillon.getNonTargetLength().removeAll(tailleToDelete); - } - } + //FIXME +// @Override +// protected boolean doSave(SetSeine bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<SetSeine> binder) throws Exception { +// try { +// return super.doSave(bean, dataService, dataSource, binder); +// } finally { +// +// // toujours supprimer la référence du context, quoiqu'il arrive +// ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); +// } +// } + + //FIXME +// @Override +// protected boolean prepareSave(SetSeine editBean, List<NonTargetCatch> objets) throws Exception { +// super.prepareSave(editBean, objets); +// +// List<Species> speciessUsed = getTableModel().getColumnValues(0); +// +// Collection<Species> speciessToDelete = new HashSet<Species>(); +// List<NonTargetLength> tailleToDelete = new ArrayList<NonTargetLength>(); +// +// getDataService().getObsoleteEspeceForNonTargetSample(getDataSource(), +// editBean.getTopiaId(), +// speciessUsed, +// speciessToDelete, +// tailleToDelete); +// +// if (!tailleToDelete.isEmpty()) { +// +// // il existe des echantillon faune a supprimer on demande une +// // confirmation +// StringBuilder sb = new StringBuilder(); +// StringBuilder sb2 = new StringBuilder(); +// Decorator<Species> decorator; +// Decorator<NonTargetLength> decorator2; +// decorator = getDecoratorService().getDecoratorByType(Species.class); +// decorator2 = getDecoratorService().getDecoratorByType(NonTargetLength.class); +// +// for (Species e : speciessToDelete) { +// sb.append(" - ").append(decorator.toString(e)).append('\n'); +// } +// for (NonTargetLength t : tailleToDelete) { +// sb2.append(" - ").append(decorator2.toString(t)).append('\n'); +// } +// int reponse = UIHelper.askUser( +// t("observe.title.need.confirm"), +// t("observe.nonTargetCatch.message.table.will.delete.nonTargetSample", sb.toString(), sb2.toString()), +// JOptionPane.ERROR_MESSAGE, +// new Object[]{ +// t("observe.choice.continue"), +// t("observe.choice.cancel")}, +// 0); +// if (log.isDebugEnabled()) { +// log.debug("response : " + reponse); +// } +// boolean canContinue = false; +// switch (reponse) { +// case 0: +// // wil reset ui +// canContinue = true; +// break; +// } +// if (!canContinue) { +// // l'utilisateur a choisi de ne pas continuer +// return false; +// } +// +// // on conserve les tailles a supprimer +// ALL_TAILLES_TO_DELETE_ENTRY.setContextValue(getUi(), tailleToDelete); +// } +// +// // mise a jour de la propriete nonTargetDiscarded +// +// boolean hasRejet = false; +// for (NonTargetCatch c : objets) { +// if (c.getReasonForDiscard() != null) { +// // on a trouve un rejet de faune +// hasRejet = true; +// break; +// } +// } +// editBean.setNonTargetDiscarded(hasRejet); +// +// return true; +// } + + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<NonTargetCatch> oldChilds) { +// +// List<NonTargetLength> tailleToDelete = +// ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); +// +// if (tailleToDelete != null && !tailleToDelete.isEmpty()) { +// +// // on a demande la suppression de taille obsoletes +// +// if (log.isInfoEnabled()) { +// log.info("Will remove " + tailleToDelete.size() + +// " obsolete nonTargetSample(s)."); +// } +// +// NonTargetSample echantillon = bean.getNonTargetSample().get(0); +// +// // on supprime les echantillons obsoletes +// echantillon.getNonTargetLength().removeAll(tailleToDelete); +// } +// } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css index bc9c1ef..cd9dd56 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css @@ -63,7 +63,7 @@ } #count { - property:{NonTargetLength.PROPERTY_COUNT}; + property:{NonTargetLengthDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } @@ -73,10 +73,11 @@ labelFor:{sex}; } -#sex { - property:{NonTargetLength.PROPERTY_SEX}; - selectedItem:{tableEditBean.getSex()}; -} +//FIXME +//#sex { + //property:{NonTargetLengthDto.PROPERTY_SEX}; + //selectedItem:{tableEditBean.getSex()}; +//} #picturesReferencesLabel { text:"observe.common.picturesReferences"; @@ -85,12 +86,12 @@ #picturesReferences { text:{getStringValue(tableEditBean.getPicturesReferences())}; - _tablePropertyName:{NonTargetLength.PROPERTY_PICTURES_REFERENCES}; + _tablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } #resetPicturesReferences{ toolTipText:"observe.action.reset.picturesReferences.tip"; - _resetTablePropertyName:{NonTargetLength.PROPERTY_PICTURES_REFERENCES}; + _resetTablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } #speciesTypeTailleLabel{ @@ -101,7 +102,8 @@ #speciesTypeTaille { font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; + //FIXME + //text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; } #comment { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 66a6a8e..4ce2e2f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -32,7 +32,7 @@ <style source="AbstractSampleUI.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.seine.NonTargetLengthDto @@ -98,7 +98,7 @@ public String getLengthDataTip(boolean computed) { return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(Species species) { +public String getSpeciesFauneTypeTaille(SpeciesDto species) { return species == null ? t("observe.message.no.species.selected") : species.getLengthMeasureType(); } ]]> @@ -124,7 +124,7 @@ public String getSpeciesFauneTypeTaille(Species species) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' constructorParams='this' genericType='Species'/> + <BeanComboBox id='species' constructorParams='this' genericType='SpeciesDto'/> </cell> </row> @@ -186,7 +186,7 @@ public String getSpeciesFauneTypeTaille(Species species) { <JLabel id='sexLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sex' genericType='Sex' constructorParams='this'/> + <BeanComboBox id='sex' genericType='SexDto' constructorParams='this'/> </cell> </row> 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 165dbbe..7455a33 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 @@ -21,12 +21,14 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveDAOHelper; 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.referential.SexDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -34,17 +36,12 @@ import fr.ird.observe.ui.content.table.ContentTableUIHandler; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -54,12 +51,12 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSample, NonTargetLength> { +public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSampleDto, NonTargetLengthDto> { /** Logger */ static private Log log = LogFactory.getLog(NonTargetSampleUIHandler.class); - protected final JAXXContextEntryDef<List<Species>> ALL_ESPECES_ENTRY = + protected final JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = UIHelper.newListContextEntryDef("NonTargetSampleUI-all-speciess"); /** @@ -72,7 +69,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam protected final PropertyChangeListener weightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetLength source = (NonTargetLength) evt.getSource(); + NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); source.setWeightSource(false); } }; @@ -87,7 +84,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam protected final PropertyChangeListener lengthChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - NonTargetLength source = (NonTargetLength) evt.getSource(); + NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); source.setLengthSource(false); } }; @@ -111,76 +108,78 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam getUi().getLength().grabFocus(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - String setId = dataContext.getSelectedSetId(); - // on doit récupérer l'unique échantillonThon de la calée - String id = dataService.getNonTargetSampleId(dataSource, setId); - return id; - } - - @Override - protected NonTargetSample loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<Species> speciess; - - String setId = dataContext.getSelectedSetId(); - - if (mode == ContentMode.UPDATE) { - - - speciess = dataService.getAvailableEspeceForNonTargetSample(dataSource, setId); - - } else { - speciess = new ArrayList<Species>(); - } - ALL_ESPECES_ENTRY.setContextValue(getUi(), speciess); - - // on doit récupérer l'unique échantillonThon de la calée - String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); - - NonTargetSample editBean = getBean(); - - if (log.isInfoEnabled()) { - log.info(prefix + " - set id : " + setId); - log.info(prefix + " - echantillon faune id : " + id); - log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); - } - - if (id == null) { - - // l'échantillon n'existe pas encore, donc rien a faire - getLoadBinder().load(null, editBean, true); - - getModel().getChildsUpdator().setChilds(editBean, new ArrayList<NonTargetLength>()); - - } else { - - // preparation du bean d'édition - dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - } - - getModel().setMode(mode); - - // initialisation du modèle du tableau - getUi().getTableModel().attachModel(); - - return editBean; - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// String setId = dataContext.getSelectedSetId(); +// // on doit récupérer l'unique échantillonThon de la calée +// String id = dataService.getNonTargetSampleId(dataSource, setId); +// return id; +// } + + //FIXME +// @Override +// protected NonTargetSample loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<Species> speciess; +// +// String setId = dataContext.getSelectedSetId(); +// +// if (mode == ContentMode.UPDATE) { +// +// +// speciess = dataService.getAvailableEspeceForNonTargetSample(dataSource, setId); +// +// } else { +// speciess = new ArrayList<Species>(); +// } +// ALL_ESPECES_ENTRY.setContextValue(getUi(), speciess); +// +// // on doit récupérer l'unique échantillonThon de la calée +// String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); +// +// NonTargetSample editBean = getBean(); +// +// if (log.isInfoEnabled()) { +// log.info(prefix + " - set id : " + setId); +// log.info(prefix + " - echantillon faune id : " + id); +// log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); +// } +// +// if (id == null) { +// +// // l'échantillon n'existe pas encore, donc rien a faire +// getLoadBinder().load(null, editBean, true); +// +// getModel().getChildsUpdator().setChilds(editBean, new ArrayList<NonTargetLength>()); +// +// } else { +// +// // preparation du bean d'édition +// dataService.loadEditEntity(dataSource, id, getLoadExecutor()); +// } +// +// getModel().setMode(mode); +// +// // initialisation du modèle du tableau +// getUi().getTableModel().attachModel(); +// +// return editBean; +// } @Override - protected boolean prepareSave(NonTargetSample bean, List<NonTargetLength> objets) throws DataSourceException { + protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) throws DataSourceException { boolean withLengths = !objets.isEmpty(); if (withLengths) { - if (bean.getTopiaId() == null) { + if (bean.getId() == null) { String setId = getDataContext().getSelectedSetId(); @@ -190,7 +189,8 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam log.debug("Will create nonTargetSample " + bean + " for " + setId); } - getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); + //FIXME +// getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); } @@ -200,69 +200,73 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam } - @Override - protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { - - if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { - - // remove orphan non target sample - - String setId = getDataContext().getSelectedSetId(); - if (log.isInfoEnabled()) { - log.info("Remove obsolete nonTargetSample " + bean.getTopiaId() + " from Set: " + setId); - } - getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); - - } else { - - // normal persist - super.doPersist(bean, dataService, dataSource); - - } - - } - - @Override - protected NonTargetSample onCreate(TopiaContext tx, - Object parent, - NonTargetSample editBean) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - NonTargetSample beanToSave = - ObserveDAOHelper.getNonTargetSampleDAO(tx).create(); - if (log.isInfoEnabled()) { - log.info("Echantillon faune " + beanToSave.getTopiaId() + - " was created."); - } - editBean.setTopiaId(beanToSave.getTopiaId()); - editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); - editBean.setTopiaVersion(beanToSave.getTopiaVersion()); - parentBean.addNonTargetSample(beanToSave); - return beanToSave; - } - - @Override - protected void onDelete(TopiaContext tx, Object parent, NonTargetSample beanToDelete) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - parentBean.removeNonTargetSample(beanToDelete); - } + //FIXME +// @Override +// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { +// +// // remove orphan non target sample +// +// String setId = getDataContext().getSelectedSetId(); +// if (log.isInfoEnabled()) { +// log.info("Remove obsolete nonTargetSample " + bean.getTopiaId() + " from Set: " + setId); +// } +// getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); +// +// } else { +// +// // normal persist +// super.doPersist(bean, dataService, dataSource); +// +// } +// +// } + + //FIXME +// @Override +// protected NonTargetSample onCreate(TopiaContext tx, +// Object parent, +// NonTargetSample editBean) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// NonTargetSample beanToSave = +// ObserveDAOHelper.getNonTargetSampleDAO(tx).create(); +// if (log.isInfoEnabled()) { +// log.info("Echantillon faune " + beanToSave.getTopiaId() + +// " was created."); +// } +// editBean.setTopiaId(beanToSave.getTopiaId()); +// editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); +// editBean.setTopiaVersion(beanToSave.getTopiaVersion()); +// parentBean.addNonTargetSample(beanToSave); +// return beanToSave; +// } + + //FIXME +// @Override +// protected void onDelete(TopiaContext tx, Object parent, NonTargetSample beanToDelete) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// parentBean.removeNonTargetSample(beanToDelete); +// } @SuppressWarnings("unchecked") @Override protected void onSelectedRowChanged(int editingRow, - NonTargetLength bean, + NonTargetLengthDto bean, boolean create) { - ContentTableModel<NonTargetSample, NonTargetLength> model = getTableModel(); + ContentTableModel<NonTargetSampleDto, NonTargetLengthDto> model = getTableModel(); if (!model.isEditable()) { return; } - Species species = bean.getSpecies(); +// SpeciesDto species = bean.getSpecies(); NonTargetSampleUI ui = getUi(); - if (log.isDebugEnabled()) { - log.debug("selected species " + species); - } - List<Species> availableEspeces; + //FIXME +// if (log.isDebugEnabled()) { +// log.debug("selected species " + species); +// } +// List<Species> availableEspeces; JComponent requestFocus; if (create) { @@ -274,8 +278,8 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); } - availableEspeces = new ArrayList<Species>( - ALL_ESPECES_ENTRY.getContextValue(ui)); +// availableEspeces = new ArrayList<Species>( +// ALL_ESPECES_ENTRY.getContextValue(ui)); requestFocus = ui.getSpecies(); } else { @@ -288,17 +292,17 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam ui.getAcquisitionModeGroup().setSelectedValue(null); ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - availableEspeces = Arrays.asList(species); +// availableEspeces = Arrays.asList(species); } - ui.getSpecies().setData(availableEspeces); +// ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); - NonTargetLength tableEditBean = getTableEditBean(); - tableEditBean.removePropertyChangeListener(NonTargetLength.PROPERTY_WEIGHT, weightChanged); - tableEditBean.addPropertyChangeListener(NonTargetLength.PROPERTY_WEIGHT, weightChanged); + NonTargetLengthDto tableEditBean = getTableEditBean(); + tableEditBean.removePropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); + tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); - tableEditBean.removePropertyChangeListener(NonTargetLength.PROPERTY_LENGTH, lengthChanged); - tableEditBean.addPropertyChangeListener(NonTargetLength.PROPERTY_LENGTH, lengthChanged); + tableEditBean.removePropertyChangeListener(NonTargetLengthDto.PROPERTY_LENGTH, lengthChanged); + tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_LENGTH, lengthChanged); } @Override @@ -323,11 +327,11 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam n("observe.nonTargetSample.table.picturesReferences"), n("observe.nonTargetSample.table.picturesReferences.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 4, UIHelper.newDecorateTableCellRenderer(renderer, Sex.class)); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newDecorateTableCellRenderer(renderer, SexDto.class)); UIHelper.setTableColumnRenderer(table, 5, renderer); } @@ -337,14 +341,15 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam boolean showData = false; - try { - String setId = getDataContext().getSelectedSetId(); - showData = getDataService().canUseNonTargetSample(getDataSource(), setId); - } catch (DataSourceException e) { - if (log.isErrorEnabled()) { - log.error(e); - } - } + //FIXME +// try { +// String setId = getDataContext().getSelectedSetId(); +// showData = getDataService().canUseNonTargetSample(getDataSource(), setId); +// } catch (DataSourceException e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// } getUi().getModel().setShowData(showData); @@ -355,7 +360,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam addMessage(getUi(), NuitonValidatorScope.INFO, - getEntityLabel(SetSeine.class), + getEntityLabel(SetSeineDto.class), t("observe.setSeine.message.no.nonTargetDiscarded")); } return mode; @@ -382,7 +387,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam boolean createMode = ui.getTableModel().isCreate(); - NonTargetLength editBean = ui.getTableEditBean(); + NonTargetLengthDto editBean = ui.getTableEditBean(); switch (newMode) { case byEffectif: diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css index 2945cfe..3227180 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css @@ -26,7 +26,7 @@ } #species { - property:{ObjectObservedSpecies.PROPERTY_SPECIES}; + property:{ObjectObservedSpeciesDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; } @@ -36,7 +36,7 @@ } #speciesStatus { - property:{ObjectObservedSpecies.PROPERTY_SPECIES_STATUS}; + property:{ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS}; selectedItem:{tableEditBean.getSpeciesStatus()}; } @@ -46,7 +46,7 @@ } #count { - property:{ObjectObservedSpecies.PROPERTY_COUNT}; + property:{ObjectObservedSpeciesDto.PROPERTY_COUNT}; model:{tableEditBean.getCount()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index ad302b5..a25c70c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -31,11 +31,11 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectDto fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.seine.SpeciesStatus + fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -85,7 +85,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' constructorParams='this' - genericType='Species'/> + genericType='SpeciesDto'/> </cell> </row> @@ -96,7 +96,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='speciesStatus' constructorParams='this' - genericType='SpeciesStatus'/> + genericType='SpeciesStatusDto'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 7351740..35d3ef9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -21,17 +21,20 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; 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.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -40,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObject, ObjectObservedSpecies> { +public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObjectDto, ObjectObservedSpeciesDto> { /** Logger */ static private Log log = @@ -55,13 +58,14 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati return (ObjectObservedSpeciesUI) super.getUi(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedFloatingObjectId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedFloatingObjectId(); +// } @Override - protected void onSelectedRowChanged(int editingRow, ObjectObservedSpecies bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, ObjectObservedSpeciesDto bean, boolean create) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } @@ -82,8 +86,8 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati n("observe.objectObservedSpecies.table.count"), n("observe.objectObservedSpecies.table.count.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesStatus.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesStatusDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css index 50c62d0..15d53f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css @@ -26,7 +26,7 @@ } #species { - property:{ObjectSchoolEstimate.PROPERTY_SPECIES}; + property:{ObjectSchoolEstimateDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; } @@ -36,7 +36,7 @@ } #totalWeight { - property:{ObjectSchoolEstimate.PROPERTY_TOTAL_WEIGHT}; + property:{ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT}; model:{tableEditBean.getTotalWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx index 194aafd..fc2bc4a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectDto fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto fr.ird.observe.services.dto.referential.SpeciesDto @@ -84,7 +84,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' constructorParams='this' - genericType='Species'/> + genericType='SpeciesDto'/> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index 97b0979..1051615 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -21,17 +21,19 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; 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.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -40,7 +42,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<FloatingObject, ObjectSchoolEstimate> { +public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<FloatingObjectDto, ObjectSchoolEstimateDto> { /** Logger */ @@ -56,7 +58,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } @Override - protected void onSelectedRowChanged(int editingRow, ObjectSchoolEstimate bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, ObjectSchoolEstimateDto bean, boolean create) { if (getTableModel().isEditable()) { if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); @@ -65,10 +67,11 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedFloatingObjectId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedFloatingObjectId(); +// } @Override protected void initTableUI(DefaultTableCellRenderer renderer) { @@ -80,7 +83,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin n("observe.schoolEstimate.table.weight"), n("observe.schoolEstimate.table.weight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css index 2c0e711..b6cc3e0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css @@ -27,7 +27,7 @@ } #species { - property:{SchoolEstimate.PROPERTY_SPECIES}; + property:{SchoolEstimateDto.PROPERTY_SPECIES}; selectedItem:{tableEditBean.getSpecies()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -38,7 +38,7 @@ } #totalWeight { - property:{SchoolEstimate.PROPERTY_TOTAL_WEIGHT}; + property:{SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT}; model:{tableEditBean.getTotalWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_7_DIGITS_PATTERN}; } @@ -49,7 +49,7 @@ } #meanWeight { - property:{SchoolEstimate.PROPERTY_MEAN_WEIGHT}; + property:{SchoolEstimateDto.PROPERTY_MEAN_WEIGHT}; model:{tableEditBean.getMeanWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx index 54dcfcc..1f18a7c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx @@ -31,7 +31,7 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.SchoolEstimateDto fr.ird.observe.services.dto.referential.SpeciesDto @@ -68,7 +68,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-schoolEstimate'> <!-- clef unique --> - <field name="schoolEstimate" component="editorPanel"/> + <!--FIXME--> + <!--<field name="schoolEstimate" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -87,7 +88,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='Species' + <BeanComboBox id='species' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> 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 844a269..c03b629 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 @@ -21,14 +21,15 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; 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.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -50,12 +51,12 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, SchoolEstimate> { +public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineDto, SchoolEstimateDto> { /** Logger */ static private Log log = LogFactory.getLog(SchoolEstimateUIHandler.class); - JAXXContextEntryDef<List<Species>> ALL_ESPECES_ENTRY = + JAXXContextEntryDef<List<SpeciesDto>> ALL_ESPECES_ENTRY = UIHelper.newListContextEntryDef("SchoolEstimateUI-all-speciess"); public SchoolEstimateUIHandler(SchoolEstimateUI ui) { @@ -67,51 +68,53 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch return (SchoolEstimateUI) super.getUi(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// List<Species> speciesList; +// +// if (mode == ContentMode.UPDATE) { +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean( +// dataSource, dataContext.getSelectedTripId()); +// +// // get all species from the configured speciesList +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineSchoolEstimateId(); +// +// List<Species> allSpecies = +// dataService.loadDecoratedSpecies(dataSource, speciesListId); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(allSpecies); +// +// // filtre par ocean +// speciesList = Species2.filterByOcean(allSpecies, ocean); +// +// } else { +// +// speciesList = new ArrayList<Species>(); +// } +// +// ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); +// if (log.isDebugEnabled()) { +// log.debug("speciesList = " + speciesList.size()); +// } +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } @Override - protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { - - List<Species> speciesList; - - if (mode == ContentMode.UPDATE) { - - // get current ocean - Ocean ocean = dataService.getTripOcean( - dataSource, dataContext.getSelectedTripId()); + protected void onSelectedRowChanged(int editingRow, SchoolEstimateDto bean, boolean create) { - // get all species from the configured speciesList - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineSchoolEstimateId(); - - List<Species> allSpecies = - dataService.loadDecoratedSpecies(dataSource, speciesListId); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(allSpecies); - - // filtre par ocean - speciesList = Species2.filterByOcean(allSpecies, ocean); - - } else { - - speciesList = new ArrayList<Species>(); - } - - ALL_ESPECES_ENTRY.setContextValue(getUi(), speciesList); - if (log.isDebugEnabled()) { - log.debug("speciesList = " + speciesList.size()); - } - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } - - @Override - protected void onSelectedRowChanged(int editingRow, SchoolEstimate bean, boolean create) { - - ContentTableModel<SetSeine, SchoolEstimate> model = getTableModel(); + ContentTableModel<SetSeineDto, SchoolEstimateDto> model = getTableModel(); if (!model.isEditable()) { @@ -120,24 +123,28 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch } SchoolEstimateUI ui = getUi(); - List<Species> availableEspeces; + //FIXME +// List<Species> availableEspeces; JComponent requestFocus; if (create) { - availableEspeces = new ArrayList<Species>( - ALL_ESPECES_ENTRY.getContextValue(ui)); - - List<Species> list = model.getColumnValues(0); - availableEspeces.removeAll(list); - list.clear(); + //FIXME +// availableEspeces = new ArrayList<Species>( +// ALL_ESPECES_ENTRY.getContextValue(ui)); +// +// List<Species> list = model.getColumnValues(0); +// availableEspeces.removeAll(list); +// list.clear(); requestFocus = ui.getSpecies(); } else { - Species species = bean.getSpecies(); - availableEspeces = Arrays.asList(species); + //FIXME +// Species species = bean.getSpecies(); +// availableEspeces = Arrays.asList(species); requestFocus = ui.getTotalWeight(); } - ui.getSpecies().setData(availableEspeces); + //FIXME +// ui.getSpecies().setData(availableEspeces); requestFocus.requestFocus(); } @@ -154,18 +161,19 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeine, Sch n("observe.schoolEstimate.table.meanWeight"), n("observe.schoolEstimate.table.meanWeight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } @Override - protected boolean prepareSave(SetSeine editBean, List<SchoolEstimate> objets) { + protected boolean prepareSave(SetSeineDto editBean, List<SchoolEstimateDto> objets) { - for (SchoolEstimate schoolEstimate : objets) { + for (SchoolEstimateDto schoolEstimate : objets) { // on attache la set - schoolEstimate.setSetSeine(editBean); + //FIXME +// schoolEstimate.setSetSeine(editBean); } return true; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css index 29d0bd1..8642bb4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css @@ -43,7 +43,7 @@ } #weightCategory { - property:{TargetCatch.PROPERTY_WEIGHT_CATEGORY}; + property:{TargetCatchDto.PROPERTY_WEIGHT_CATEGORY}; selectedItem:{tableEditBean.getWeightCategory()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -54,7 +54,7 @@ } #catchWeight { - property:{TargetCatch.PROPERTY_CATCH_WEIGHT}; + property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; @@ -69,13 +69,13 @@ #resetWell { toolTipText:"observe.action.reset.well.tip"; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; - _resetTablePropertyName:{TargetCatch.PROPERTY_WELL}; + _resetTablePropertyName:{TargetCatchDto.PROPERTY_WELL}; } #well { text:{getStringValue(tableEditBean.getWell())}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; - _tablePropertyName:{TargetCatch.PROPERTY_WELL}; + _tablePropertyName:{TargetCatchDto.PROPERTY_WELL}; } #comment { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx index b299164..58888c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx @@ -31,10 +31,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.TargetCatchDto - fr.ird.observe.services.dto.referential.seine.WeightCategory + fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* @@ -68,7 +68,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-targetCatch'> <!-- clef unique --> - <field name="targetCatch" component="editorPanel"/> + <!--FIXME--> + <!--<field name="targetCatch" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -87,7 +88,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='Species' constructorParams='this'/> + <BeanComboBox id='species' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> @@ -98,7 +99,7 @@ <JLabel id='weightCategoryLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='weightCategory' genericType='WeightCategory' constructorParams='this'/> + <BeanComboBox id='weightCategory' genericType='WeightCategoryDto' constructorParams='this'/> </cell> </row> 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 cf8ea4e..6b26d43 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 @@ -21,16 +21,17 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; 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.business.util.TopiaExecutor; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +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.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -42,10 +43,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -68,27 +65,28 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, TargetCatch> { +public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, TargetCatchDto> { /** Logger */ private static final Log log = LogFactory.getLog(TargetCatchUIHandler.class); - JAXXContextEntryDef<List<TargetLength>> ALL_TAILLES_TO_DELETE_ENTRY = + JAXXContextEntryDef<List<TargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = UIHelper.newListContextEntryDef("TargetCatchUI-all-taille-to-delete"); /** * l'entrée dans le contexte pour récupérer la liste complètes des * catégories */ - JAXXContextEntryDef<List<WeightCategory>> ALL_CATEGORIES_ENTRY = + JAXXContextEntryDef<List<WeightCategoryDto>> ALL_CATEGORIES_ENTRY = UIHelper.newListContextEntryDef("TargetCatchUI-all-categories"); - TopiaExecutor<WeightCategory> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategory>() { - @Override - public void execute(TopiaContext tx, WeightCategory bean) { - getDecoratorService().decorate(bean.getSpecies()); - } - }; + //FIXME +// TopiaExecutor<WeightCategory> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategory>() { +// @Override +// public void execute(TopiaContext tx, WeightCategory bean) { +// getDecoratorService().decorate(bean.getSpecies()); +// } +// }; public TargetCatchUIHandler(TargetCatchUI ui) { super(ui, DataContextType.SetSeine); @@ -114,15 +112,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target @Override public void propertyChange(PropertyChangeEvent evt) { - ContentTableModel<SetSeine, TargetCatch> model; + ContentTableModel<SetSeineDto, TargetCatchDto> model; model = getTableModel(); - if (model.getRowBean().getTopiaId() == null) { + if (model.getRowBean().getId() == null) { // en mode creation , on doit recalculer la liste // des categories - Species species = (Species) evt.getNewValue(); + SpeciesDto species = (SpeciesDto) evt.getNewValue(); onEspeceChanged(species); @@ -132,131 +130,134 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target ); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + +// @Override +// protected SetSeine loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<Species> speciesList; +// List<WeightCategory> categorieList; +// +// if (mode == ContentMode.UPDATE) { +// +// // on charge le formulaire uniquement si en mode édition +// +// categorieList = new ArrayList<WeightCategory>( +// dataService.loadDecoratedEntities(dataSource, +// WeightCategory.class, +// weightCategoryTopiaExecutor)); +// +// // Keep only weight categories for the species +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineTargetCatchId(); +// +// java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); +// +// categorieList = Species2.filterWeightCategoryBySpeciesIds( +// categorieList, speciesIds); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(categorieList); +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean( +// dataSource, dataContext.getSelectedTripId()); +// +// // filtre par ocean +// categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); +// +// // filtre par ocean +// speciesList = Species2.toSpecies(categorieList); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(speciesList); +// +// } else { +// +// speciesList = new ArrayList<Species>(); +// categorieList = new ArrayList<WeightCategory>(); +// } +// +// TargetCatchUI ui = getUi(); +// +// ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); +// +// ui.getSpecies().setData(speciesList); +// +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } + +// @Override +// protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { +// Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); +// Collection<TargetCatch> data = new ArrayList<TargetCatch>(); +// if (CollectionUtils.isNotEmpty(childs)) { +// TopiaDAO<TargetCatch> dao = +// getDataSource().getDAO(tx, getTableEditBean()); +// TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); +// +// DecoratorService decoratorService = getDecoratorService(); +// +// for (TargetCatch c : childs) { +// if (c.isDiscarded()) { +// // c'est un rejet, on ne le retient pas dans cette liste +// if (log.isDebugEnabled()) { +// log.debug("targetDiscarded " + c.getSpecies().getLabel2() + +// " non retenu."); +// } +// continue; +// } +// try { +// +// TargetCatch c2 = getModel().newTableEditBean(); +// TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); +// WeightCategory weightCategory = safeC.getWeightCategory(); +// if (weightCategory != null) { +// Species species = weightCategory.getSpecies(); +// decoratorService.decorate(species); +// } +// childLoador.load(safeC, c2, true); +// data.add(c2); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// return data; +// } @Override - protected SetSeine loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<Species> speciesList; - List<WeightCategory> categorieList; - - if (mode == ContentMode.UPDATE) { - - // on charge le formulaire uniquement si en mode édition - - categorieList = new ArrayList<WeightCategory>( - dataService.loadDecoratedEntities(dataSource, - WeightCategory.class, - weightCategoryTopiaExecutor)); - - // Keep only weight categories for the species - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineTargetCatchId(); - - java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); - - categorieList = Species2.filterWeightCategoryBySpeciesIds( - categorieList, speciesIds); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(categorieList); - - // get current ocean - Ocean ocean = dataService.getTripOcean( - dataSource, dataContext.getSelectedTripId()); - - // filtre par ocean - categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); - - // filtre par ocean - speciesList = Species2.toSpecies(categorieList); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(speciesList); - - } else { - - speciesList = new ArrayList<Species>(); - categorieList = new ArrayList<WeightCategory>(); - } - - TargetCatchUI ui = getUi(); - - ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); - - ui.getSpecies().setData(speciesList); - - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } - - @Override - protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { - Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); - Collection<TargetCatch> data = new ArrayList<TargetCatch>(); - if (CollectionUtils.isNotEmpty(childs)) { - TopiaDAO<TargetCatch> dao = - getDataSource().getDAO(tx, getTableEditBean()); - TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); - - DecoratorService decoratorService = getDecoratorService(); - - for (TargetCatch c : childs) { - if (c.isDiscarded()) { - // c'est un rejet, on ne le retient pas dans cette liste - if (log.isDebugEnabled()) { - log.debug("targetDiscarded " + c.getSpecies().getLabel2() + - " non retenu."); - } - continue; - } - try { - - TargetCatch c2 = getModel().newTableEditBean(); - TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); - WeightCategory weightCategory = safeC.getWeightCategory(); - if (weightCategory != null) { - Species species = weightCategory.getSpecies(); - decoratorService.decorate(species); - } - childLoador.load(safeC, c2, true); - data.add(c2); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return data; - } - - @Override - protected boolean prepareSave(SetSeine bean, List<TargetCatch> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetCatch - Collection<Species> speciessUsed = new HashSet<Species>(); - for (TargetCatch c : objets) { - speciessUsed.add(c.getSpecies()); - } + Collection<SpeciesDto> speciessUsed = new HashSet<SpeciesDto>(); + //FIXME +// for (TargetCatchDto c : objets) { +// speciessUsed.add(c.getSpecies()); +// } // il faut supprimer les echantillon thons sur des speciess qui ne // sont plus sur un rejet - List<TargetLength> tailleToDelete = new ArrayList<TargetLength>(); - Collection<Species> speciessToDelete = new HashSet<Species>(); + List<TargetLengthDto> tailleToDelete = new ArrayList<TargetLengthDto>(); + Collection<SpeciesDto> speciessToDelete = new HashSet<SpeciesDto>(); - getDataService().getObsoleteEspeceForTargetSample(getDataSource(), - bean.getTopiaId(), - speciessUsed, - speciessToDelete, - tailleToDelete, - false); + //FIXME +// getDataService().getObsoleteEspeceForTargetSample(getDataSource(), +// bean.getTopiaId(), +// speciessUsed, +// speciessToDelete, +// tailleToDelete, +// false); if (!tailleToDelete.isEmpty()) { @@ -264,15 +265,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target // confirmation StringBuilder sb = new StringBuilder(512); StringBuilder sb2 = new StringBuilder(512); - Decorator<Species> decorator = - getDecoratorService().getDecoratorByType(Species.class); - Decorator<TargetLength> decorator2 = - getDecoratorService().getDecoratorByType(TargetLength.class); + Decorator<SpeciesDto> decorator = + getDecoratorService().getDecoratorByType(SpeciesDto.class); + Decorator<TargetLengthDto> decorator2 = + getDecoratorService().getDecoratorByType(TargetLengthDto.class); - for (Species e : speciessToDelete) { + for (SpeciesDto e : speciessToDelete) { sb.append(" - ").append(decorator.toString(e)).append('\n'); } - for (TargetLength t : tailleToDelete) { + for (TargetLengthDto t : tailleToDelete) { sb2.append(" - ").append(decorator2.toString(t)).append('\n'); } int reponse = UIHelper.askUser( @@ -304,54 +305,57 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target ALL_TAILLES_TO_DELETE_ENTRY.setContextValue(getUi(), tailleToDelete); } - for (TargetCatch targetCatch : objets) { + for (TargetCatchDto targetCatch : objets) { // on attache la set - targetCatch.setSetSeine(bean); + //FIXME +// targetCatch.setSetSeine(bean); } return true; } - @Override - protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { - - if (oldChilds != null && !oldChilds.isEmpty()) { - - // on reinjecte les rejet thon precedemment saisie dans la set - for (TargetCatch targetCatch : oldChilds) { - if (targetCatch.isDiscarded()) { - bean.addTargetCatch(targetCatch); - } - } - } - - - List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); - - if (tailleToDelete != null && !tailleToDelete.isEmpty()) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + tailleToDelete.size() + - " obsolete targetLength(s)."); - } - - TargetSample echantillon = bean.getTargetSample(false); - - // on supprime les echantillons obsoletes - echantillon.getTargetLength().removeAll(tailleToDelete); - } - } + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { +// +// if (oldChilds != null && !oldChilds.isEmpty()) { +// +// // on reinjecte les rejet thon precedemment saisie dans la set +// for (TargetCatch targetCatch : oldChilds) { +// if (targetCatch.isDiscarded()) { +// bean.addTargetCatch(targetCatch); +// } +// } +// } +// +// +// List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); +// +// if (tailleToDelete != null && !tailleToDelete.isEmpty()) { +// +// // on a demande la suppression de taille obsoletes +// +// if (log.isInfoEnabled()) { +// log.info("Will remove " + tailleToDelete.size() + +// " obsolete targetLength(s)."); +// } +// +// TargetSample echantillon = bean.getTargetSample(false); +// +// // on supprime les echantillons obsoletes +// echantillon.getTargetLength().removeAll(tailleToDelete); +// } +// } @Override - protected void onSelectedRowChanged(int editingRow, TargetCatch bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, TargetCatchDto bean, boolean create) { TargetCatchUI ui = getUi(); - WeightCategory beanWeightCategory = bean.getWeightCategory(); - Species beanEspece = beanWeightCategory == null ? - null : beanWeightCategory.getSpecies(); + //FIXME +// WeightCategoryDto beanWeightCategory = bean.getWeightCategory(); +// SpeciesDto beanEspece = beanWeightCategory == null ? +// null : beanWeightCategory.getSpecies(); JComponent requestFocus; if (create) { @@ -363,9 +367,11 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target if (!getTableModel().isCreate()) { // on repositionne l'species (cela reconstruira la liste // des categories) - ui.getSpecies().setSelectedItem(beanEspece); + //FIXME +// ui.getSpecies().setSelectedItem(beanEspece); // on repositionne la categorie - ui.getWeightCategory().setSelectedItem(beanWeightCategory); + //FIXME +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); } requestFocus = ui.getSpecies(); @@ -376,17 +382,20 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target // au singleton de sa valeur correspondante dans le bean // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) - ui.getSpecies().setSelectedItem(beanEspece); - ui.getWeightCategory().setData( - Arrays.asList(beanWeightCategory)); - ui.getWeightCategory().setSelectedItem(beanWeightCategory); + //FIXME +// ui.getSpecies().setSelectedItem(beanEspece); + //FIXME +// ui.getWeightCategory().setData( +// Arrays.asList(beanWeightCategory)); +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); requestFocus = ui.getCatchWeight(); } if (log.isDebugEnabled()) { - log.debug("selected categoriePoid " + beanWeightCategory); - log.debug("selected species " + beanEspece); + //FIXME +// log.debug("selected categoriePoid " + beanWeightCategory); +// log.debug("selected species " + beanEspece); } requestFocus.requestFocus(); } @@ -413,17 +422,17 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target n("observe.targetCatch.table.comment"), n("observe.targetCatch.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategory.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategoryDto.class)); UIHelper.setTableColumnRenderer(table, 2, renderer); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } @SuppressWarnings("unchecked") - protected void onEspeceChanged(Species species) { + protected void onEspeceChanged(SpeciesDto species) { - List<WeightCategory> availableCategories; + List<WeightCategoryDto> availableCategories; if (species == null) { @@ -440,9 +449,9 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target availableCategories = getAllCategories(getUi()); // on ne conserve que les categories de l'species - for (Iterator<WeightCategory> it = availableCategories.iterator(); + for (Iterator<WeightCategoryDto> it = availableCategories.iterator(); it.hasNext(); ) { - WeightCategory weighte = it.next(); + WeightCategoryDto weighte = it.next(); if (!species.equals(weighte.getSpecies())) { it.remove(); } @@ -450,15 +459,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeine, Target } // on met a jour la liste des categories disponibles - BeanComboBox<WeightCategory> combo = getUi().getWeightCategory(); + BeanComboBox<WeightCategoryDto> combo = getUi().getWeightCategory(); combo.setData(availableCategories); // on reinitialise toujours la categorie selectionnee combo.setSelectedItem(null); } - protected List<WeightCategory> getAllCategories(JAXXContext context) { - List<WeightCategory> list = new ArrayList<WeightCategory>( + protected List<WeightCategoryDto> getAllCategories(JAXXContext context) { + List<WeightCategoryDto> list = new ArrayList<WeightCategoryDto>( ALL_CATEGORIES_ENTRY.getContextValue(context)); return list; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css index bcaa6a1..52b181d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css @@ -43,7 +43,7 @@ } #weightCategory { - property:{TargetCatch.PROPERTY_WEIGHT_CATEGORY}; + property:{TargetCatchDto.PROPERTY_WEIGHT_CATEGORY}; selectedItem:{tableEditBean.getWeightCategory()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -55,7 +55,7 @@ } #reasonForDiscard { - property:{TargetCatch.PROPERTY_REASON_FOR_DISCARD}; + property:{TargetCatchDto.PROPERTY_REASON_FOR_DISCARD}; selectedItem:{tableEditBean.getReasonForDiscard()}; enabled:{!tableModel.isEditable() || !model.isRowSaved()}; } @@ -66,7 +66,7 @@ } #catchWeight { - property:{TargetCatch.PROPERTY_CATCH_WEIGHT}; + property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL3_PATTERN}; @@ -87,7 +87,7 @@ #broughtOnDeck { booleanValue:{tableEditBean.getBroughtOnDeck()}; - _tablePropertyName:{TargetCatch.PROPERTY_BROUGHT_ON_DECK}; + _tablePropertyName:{TargetCatchDto.PROPERTY_BROUGHT_ON_DECK}; } #comment { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx index 6311f9a..b317236 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx @@ -31,12 +31,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.TargetCatchDto - fr.ird.observe.services.dto.referential.seine.WeightCategory + fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.seine.ReasonForDiscard + fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -70,7 +70,8 @@ errorTableModel='{getErrorTableModel()}' context='n1-update-targetDiscarded'> <!-- clef unique --> - <field name="targetCatch" component="editorPanel"/> + <!--FIXME--> + <!--<field name="targetCatch" component="editorPanel"/>--> </BeanValidator> <!-- le validateur d'une entrée de tableau --> @@ -88,7 +89,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' constructorParams='this' genericType='Species'/> + <BeanComboBox id='species' constructorParams='this' genericType='SpeciesDto'/> </cell> </row> @@ -98,7 +99,7 @@ <JLabel id='weightCategoryLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='weightCategory' constructorParams='this' genericType='WeightCategory'/> + <BeanComboBox id='weightCategory' constructorParams='this' genericType='WeightCategoryDto'/> </cell> </row> @@ -108,7 +109,7 @@ <JLabel id='reasonForDiscardLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscard'/> + <BeanComboBox id='reasonForDiscard' constructorParams='this' genericType='ReasonForDiscardDto'/> </cell> </row> 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 c5068b1..c106650 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 @@ -21,16 +21,18 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveConfig; 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.business.util.TopiaExecutor; -import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; -import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +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.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -42,10 +44,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -68,51 +66,53 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, TargetCatch> { +public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineDto, TargetCatchDto> { /** Logger */ static private Log log = LogFactory.getLog(TargetDiscardCatchUIHandler.class); - JAXXContextEntryDef<List<WeightCategory>> ALL_CATEGORIES_ENTRY = + JAXXContextEntryDef<List<WeightCategoryDto>> ALL_CATEGORIES_ENTRY = UIHelper.newListContextEntryDef("RejetThonUI-all-categories"); - JAXXContextEntryDef<List<ReasonForDiscard>> ALL_RAISONS_REJET_ENTRY = + JAXXContextEntryDef<List<ReasonForDiscardDto>> ALL_RAISONS_REJET_ENTRY = UIHelper.newListContextEntryDef("RejetThonUI-all-reasonForDiscards"); - JAXXContextEntryDef<List<TargetLength>> ALL_TAILLES_TO_DELETE_ENTRY = + JAXXContextEntryDef<List<TargetLengthDto>> ALL_TAILLES_TO_DELETE_ENTRY = UIHelper.newListContextEntryDef("RejetThonUI-all-taille-to-delete"); - TopiaExecutor<WeightCategory> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategory>() { - @Override - public void execute(TopiaContext tx, WeightCategory bean) { - getDecoratorService().decorate(bean.getSpecies()); - } - }; + //FIXME +// TopiaExecutor<WeightCategoryDto> weightCategoryTopiaExecutor = new TopiaExecutor<WeightCategoryDto>() { +// @Override +// public void execute(TopiaContext tx, WeightCategory bean) { +// getDecoratorService().decorate(bean.getSpecies()); +// } +// }; public TargetDiscardCatchUIHandler(TargetDiscardCatchUI ui) { super(ui, DataContextType.SetSeine); } - protected static Collection<WeightCategory> getWeightCategoryUsed( - ContentTableModel<SetSeine, TargetCatch> model) { - List<WeightCategory> list = model.getColumnValues(1); - Collection<WeightCategory> set = new HashSet<WeightCategory>(list); + protected static Collection<WeightCategoryDto> getWeightCategoryUsed( + ContentTableModel<SetSeineDto, TargetCatchDto> model) { + List<WeightCategoryDto> list = model.getColumnValues(1); + Collection<WeightCategoryDto> set = new HashSet<WeightCategoryDto>(list); list.clear(); return set; } - protected static Collection<ReasonForDiscard> getReasonForDiscardUsed( - ContentTableModel<SetSeine, TargetCatch> model, - WeightCategory weightCategory) { + protected static Collection<ReasonForDiscardDto> getReasonForDiscardUsed( + ContentTableModel<SetSeineDto, TargetCatchDto> model, + WeightCategoryDto weightCategory) { - Collection<ReasonForDiscard> set = new HashSet<ReasonForDiscard>(); + Collection<ReasonForDiscardDto> set = new HashSet<ReasonForDiscardDto>(); if (weightCategory != null) { for (int i = 0; i < model.getRowCount(); i++) { - TargetCatch c = model.getValueAt(i); + TargetCatchDto c = model.getValueAt(i); if (c != null && weightCategory.equals(c.getWeightCategory()) && c.getReasonForDiscard() != null) { - set.add(c.getReasonForDiscard()); + //FIXME +// set.add(c.getReasonForDiscard()); } } } @@ -142,15 +142,15 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, @Override public void propertyChange(PropertyChangeEvent evt) { - ContentTableModel<SetSeine, TargetCatch> model = + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); - TargetCatch bean = model.getRowBean(); + TargetCatchDto bean = model.getRowBean(); - if (bean.getTopiaId() == null) { + if (bean.getId() == null) { // en mode creation , on doit recalculer la liste // des categories - Species species = (Species) evt.getNewValue(); + SpeciesDto species = (SpeciesDto) evt.getNewValue(); onEspeceChanged(bean, species); } } @@ -168,14 +168,14 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, @Override public void propertyChange(PropertyChangeEvent evt) { - ContentTableModel<SetSeine, TargetCatch> model = + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); - TargetCatch bean = model.getRowBean(); - if (bean.getTopiaId() == null) { + TargetCatchDto bean = model.getRowBean(); + if (bean.getId() == null) { // en mode creation , on doit recalculer la liste // des raison rejet - WeightCategory weightCategory = - (WeightCategory) evt.getNewValue(); + WeightCategoryDto weightCategory = + (WeightCategoryDto) evt.getNewValue(); onCategorieChanged(bean, weightCategory); } @@ -185,143 +185,149 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { - return dataContext.getSelectedSetId(); - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { +// return dataContext.getSelectedSetId(); +// } + + //FIXME +// @Override +// protected SetSeine loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// List<WeightCategory> categorieList; +// List<ReasonForDiscard> reasonForDiscardList; +// +// if (mode == ContentMode.UPDATE) { +// +// // on charge le formulaire uniquement si en mode édition +// +// categorieList = new ArrayList<WeightCategory>( +// dataService.loadDecoratedEntities( +// dataSource, +// WeightCategory.class, +// weightCategoryTopiaExecutor) +// ); +// +// // filtre sur la liste d'espèce configuree +// ObserveConfig config = getUi().getContextValue(ObserveConfig.class); +// String speciesListId = config.getSpeciesListSeineTargetCatchId(); +// java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); +// +// categorieList = Species2.filterWeightCategoryBySpeciesIds( +// categorieList, speciesIds); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(categorieList); +// +// // get current ocean +// Ocean ocean = dataService.getTripOcean(dataSource, dataContext.getSelectedTripId()); +// +// // filtre par ocean +// categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); +// +// reasonForDiscardList = new ArrayList<ReasonForDiscard>( +// dataService.loadDecoratedEntities(dataSource, ReasonForDiscard.class)); +// +// // filtre par status actif +// ReferenceEntities.filterReferentielListByStatus(reasonForDiscardList); +// +// } else { +// +// categorieList = new ArrayList<WeightCategory>(); +// reasonForDiscardList = new ArrayList<ReasonForDiscard>(); +// } +// +// TargetDiscardCatchUI ui = getUi(); +// +// ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); +// ALL_RAISONS_REJET_ENTRY.setContextValue(ui, reasonForDiscardList); +// +// return super.loadEditBean(mode, dataContext, dataService, dataSource); +// } + + //FIXME +// @Override +// protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { +// Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); +// Collection<TargetCatch> data = new ArrayList<TargetCatch>(); +// if (CollectionUtils.isNotEmpty(childs)) { +// TopiaDAO<TargetCatch> dao = +// getDataSource().getDAO(tx, getTableEditBean()); +// TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); +// DecoratorService decoratorService = getDecoratorService(); +// for (TargetCatch c : childs) { +// if (!c.isDiscarded()) { +// // ce n'est pas un rejet, on ne le retient pas dans cette +// // liste +// if (log.isDebugEnabled()) { +// log.debug("targetCatch " + c.getSpecies().getLabel2() + " non retenu."); +// } +// continue; +// } +// try { +// TargetCatch c2 = getModel().newTableEditBean(); +// TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); +// WeightCategory weightCategory = safeC.getWeightCategory(); +// if (weightCategory != null) { +// Species species = weightCategory.getSpecies(); +// decoratorService.decorate(species); +// } +// childLoador.load(safeC, c2, true); +// data.add(c2); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// } +// return data; +// } + + //FIXME +// @Override +// protected boolean doSave(SetSeine bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<SetSeine> binder) throws Exception { +// try { +// return super.doSave(bean, dataService, dataSource, binder); +// } finally { +// +// // toujours supprimer la référence du context, quoiqu'il arrive +// ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); +// } +// } @Override - protected SetSeine loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - List<WeightCategory> categorieList; - List<ReasonForDiscard> reasonForDiscardList; - - if (mode == ContentMode.UPDATE) { - - // on charge le formulaire uniquement si en mode édition - - categorieList = new ArrayList<WeightCategory>( - dataService.loadDecoratedEntities( - dataSource, - WeightCategory.class, - weightCategoryTopiaExecutor) - ); - - // filtre sur la liste d'espèce configuree - ObserveConfig config = getUi().getContextValue(ObserveConfig.class); - String speciesListId = config.getSpeciesListSeineTargetCatchId(); - java.util.Set<String> speciesIds = loadSpeciesList(speciesListId, n("observe.error.speciesList.seine.targetCatch.notFound")); - - categorieList = Species2.filterWeightCategoryBySpeciesIds( - categorieList, speciesIds); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(categorieList); - - // get current ocean - Ocean ocean = dataService.getTripOcean(dataSource, dataContext.getSelectedTripId()); - - // filtre par ocean - categorieList = Species2.filterWeightCategoryByOcean(categorieList, ocean); - - reasonForDiscardList = new ArrayList<ReasonForDiscard>( - dataService.loadDecoratedEntities(dataSource, ReasonForDiscard.class)); - - // filtre par status actif - ReferenceEntities.filterReferentielListByStatus(reasonForDiscardList); - - } else { - - categorieList = new ArrayList<WeightCategory>(); - reasonForDiscardList = new ArrayList<ReasonForDiscard>(); - } - - TargetDiscardCatchUI ui = getUi(); - - ALL_CATEGORIES_ENTRY.setContextValue(ui, categorieList); - ALL_RAISONS_REJET_ENTRY.setContextValue(ui, reasonForDiscardList); - - return super.loadEditBean(mode, dataContext, dataService, dataSource); - } - - @Override - protected Collection<TargetCatch> loadChilds(TopiaContext tx, SetSeine bean) throws TopiaException { - Collection<TargetCatch> childs = getModel().getChildsUpdator().getChilds(bean); - Collection<TargetCatch> data = new ArrayList<TargetCatch>(); - if (CollectionUtils.isNotEmpty(childs)) { - TopiaDAO<TargetCatch> dao = - getDataSource().getDAO(tx, getTableEditBean()); - TopiaEntityBinder<TargetCatch> childLoador = getModel().getChildLoador(); - DecoratorService decoratorService = getDecoratorService(); - for (TargetCatch c : childs) { - if (!c.isDiscarded()) { - // ce n'est pas un rejet, on ne le retient pas dans cette - // liste - if (log.isDebugEnabled()) { - log.debug("targetCatch " + c.getSpecies().getLabel2() + " non retenu."); - } - continue; - } - try { - TargetCatch c2 = getModel().newTableEditBean(); - TargetCatch safeC = dao.findByTopiaId(c.getTopiaId()); - WeightCategory weightCategory = safeC.getWeightCategory(); - if (weightCategory != null) { - Species species = weightCategory.getSpecies(); - decoratorService.decorate(species); - } - childLoador.load(safeC, c2, true); - data.add(c2); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - return data; - } - - @Override - protected boolean doSave(SetSeine bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<SetSeine> binder) throws Exception { - try { - return super.doSave(bean, dataService, dataSource, binder); - } finally { - - // toujours supprimer la référence du context, quoiqu'il arrive - ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); - } - } - - @Override - protected boolean prepareSave(SetSeine bean, List<TargetCatch> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetDiscarded montee sur le pont - java.util.Set<Species> speciessUsed = new HashSet<Species>(); - for (TargetCatch c : objets) { + java.util.Set<SpeciesDto> speciessUsed = new HashSet<SpeciesDto>(); + for (TargetCatchDto c : objets) { if (c.getBroughtOnDeck() != null && c.getBroughtOnDeck()) { - speciessUsed.add(c.getSpecies()); + //FIXME +// speciessUsed.add(c.getSpecies()); } } // il faut supprimer les echantillon thons sur des speciess qui ne // sont plus sur un rejet - List<TargetLength> tailleToDelete = new ArrayList<TargetLength>(); - java.util.Set<Species> speciessToDelete = new HashSet<Species>(); + List<TargetLengthDto> tailleToDelete = new ArrayList<TargetLengthDto>(); + java.util.Set<SpeciesDto> speciessToDelete = new HashSet<SpeciesDto>(); - getDataService().getObsoleteEspeceForTargetSample(getDataSource(), - bean.getTopiaId(), - speciessUsed, - speciessToDelete, - tailleToDelete, - true); + //FIXME +// getDataService().getObsoleteEspeceForTargetSample(getDataSource(), +// bean.getTopiaId(), +// speciessUsed, +// speciessToDelete, +// tailleToDelete, +// true); if (!tailleToDelete.isEmpty()) { @@ -329,15 +335,15 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // confirmation StringBuilder sb = new StringBuilder(512); StringBuilder sb2 = new StringBuilder(512); - Decorator<Species> decorator = - getDecoratorService().getDecoratorByType(Species.class); - Decorator<TargetLength> decorator2 = - getDecoratorService().getDecoratorByType(TargetLength.class); + Decorator<SpeciesDto> decorator = + getDecoratorService().getDecoratorByType(SpeciesDto.class); + Decorator<TargetLengthDto> decorator2 = + getDecoratorService().getDecoratorByType(TargetLengthDto.class); - for (Species e : speciessToDelete) { + for (SpeciesDto e : speciessToDelete) { sb.append(" - ").append(decorator.toString(e)).append('\n'); } - for (TargetLength t : tailleToDelete) { + for (TargetLengthDto t : tailleToDelete) { sb2.append(" - ").append(decorator2.toString(t)).append('\n'); } int reponse = UIHelper.askUser( @@ -372,68 +378,71 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // mise a jour de la propriete targetDiscarded bean.setTargetDiscarded(!objets.isEmpty()); - for (TargetCatch discarded : objets) { + for (TargetCatchDto discarded : objets) { // FIXME : on devrait pas a avoir a repositionner la propriete discarded discarded.setDiscarded(true); // on attache la set - discarded.setSetSeine(bean); + //FIXME +// discarded.setSetSeine(bean); } return true; } - @Override - protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { - - if (oldChilds != null && !oldChilds.isEmpty()) { - - // on reinjecte les discarded thon precedemment saisies dans la set - // et qui ne sont pas des rejets - - for (TargetCatch targetCatch : oldChilds) { - if (!targetCatch.isDiscarded()) { - bean.addTargetCatch(targetCatch); - } - } - } - - List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); - - if (tailleToDelete != null && !tailleToDelete.isEmpty()) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + tailleToDelete.size() + - " obsolete targetLength(s)."); - } - - TargetSample echantillon = bean.getTargetSample(true); - - // on supprime les echantillons obsoletes - echantillon.getTargetLength().removeAll(tailleToDelete); - } - } + //FIXME +// @Override +// protected void onUpdateFinalize(TopiaContext tx, SetSeine bean, Collection<TargetCatch> oldChilds) { +// +// if (oldChilds != null && !oldChilds.isEmpty()) { +// +// // on reinjecte les discarded thon precedemment saisies dans la set +// // et qui ne sont pas des rejets +// +// for (TargetCatch targetCatch : oldChilds) { +// if (!targetCatch.isDiscarded()) { +// bean.addTargetCatch(targetCatch); +// } +// } +// } +// +// List<TargetLength> tailleToDelete = ALL_TAILLES_TO_DELETE_ENTRY.getContextValue(getUi()); +// +// if (tailleToDelete != null && !tailleToDelete.isEmpty()) { +// +// // on a demande la suppression de taille obsoletes +// +// if (log.isInfoEnabled()) { +// log.info("Will remove " + tailleToDelete.size() + +// " obsolete targetLength(s)."); +// } +// +// TargetSample echantillon = bean.getTargetSample(true); +// +// // on supprime les echantillons obsoletes +// echantillon.getTargetLength().removeAll(tailleToDelete); +// } +// } @Override - protected void onSelectedRowChanged(int editingRow, TargetCatch bean, boolean create) { + protected void onSelectedRowChanged(int editingRow, TargetCatchDto bean, boolean create) { TargetDiscardCatchUI ui = getUi(); - WeightCategory beanWeightCategory = bean.getWeightCategory(); - Species beanEspece = beanWeightCategory == null ? null : - beanWeightCategory.getSpecies(); - ReasonForDiscard beanReasonForDiscard = bean.getReasonForDiscard(); - if (log.isDebugEnabled()) { - log.debug("selected categoriePoid " + beanWeightCategory); - log.debug("selected species " + beanEspece); - log.debug("selected reasonForDiscard " + beanReasonForDiscard); - } + //FIXME +// WeightCategoryDto beanWeightCategory = bean.getWeightCategory(); +// SpeciesDto beanEspece = beanWeightCategory == null ? null : +// beanWeightCategory.getSpecies(); +// ReasonForDiscardDto beanReasonForDiscard = bean.getReasonForDiscard(); +// if (log.isDebugEnabled()) { +// log.debug("selected categoriePoid " + beanWeightCategory); +// log.debug("selected species " + beanEspece); +// log.debug("selected reasonForDiscard " + beanReasonForDiscard); +// } JComponent requestFocus; if (create) { - ContentTableModel<SetSeine, TargetCatch> model = getTableModel(); + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); if (model.isCreate()) { // par défaut, on considère que l'espèce a été monté sur le pont // c'est le cas le plus fréquent. @@ -441,21 +450,24 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } // on recalcule la liste des speciess disponibles - List<Species> availableEspeces = buildEspeceList( - beanEspece, beanWeightCategory); - ui.getSpecies().setData(availableEspeces); + //FIXME +// List<SpeciesDto> availableEspeces = buildEspeceList( +// beanEspece, beanWeightCategory); + //FIXME +// ui.getSpecies().setData(availableEspeces); // on reinitilise toujours l'species (pour reinitialiser la liste // des categories) ui.getSpecies().setSelectedItem(null); if (!model.isCreate()) { - // on repositionne l'species (cela reconstruira la liste - // des categories) - ui.getSpecies().setSelectedItem(beanEspece); - // on repositionne la categorie - ui.getWeightCategory().setSelectedItem(beanWeightCategory); - ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); + //FIXME +// // on repositionne l'species (cela reconstruira la liste +// // des categories) +// ui.getSpecies().setSelectedItem(beanEspece); +// // on repositionne la categorie +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); +// ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); } requestFocus = ui.getSpecies(); @@ -464,11 +476,12 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // au singleton de sa valeur correspondante dans le bean // puisque dans ce mode, pas possibilite de modifier de cette // valeur (clef metier) - ui.getSpecies().setSelectedItem(beanEspece); - ui.getWeightCategory().setData(Arrays.asList(beanWeightCategory)); - ui.getWeightCategory().setSelectedItem(beanWeightCategory); - ui.getReasonForDiscard().setData(Arrays.asList(beanReasonForDiscard)); - ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); + //FIXME +// ui.getSpecies().setSelectedItem(beanEspece); +// ui.getWeightCategory().setData(Arrays.asList(beanWeightCategory)); +// ui.getWeightCategory().setSelectedItem(beanWeightCategory); +// ui.getReasonForDiscard().setData(Arrays.asList(beanReasonForDiscard)); +// ui.getReasonForDiscard().setSelectedItem(beanReasonForDiscard); requestFocus = ui.getCatchWeight(); } @@ -498,19 +511,19 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, n("observe.targetDiscarded.table.comment"), n("observe.targetDiscarded.table.comment.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategory.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscard.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, WeightCategoryDto.class)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReasonForDiscardDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newStringTableCellRenderer(renderer, 20, false)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - protected void onEspeceChanged(TargetCatch bean, Species species) { + protected void onEspeceChanged(TargetCatchDto bean, SpeciesDto species) { - WeightCategory weightCategory = null; + WeightCategoryDto weightCategory = null; - List<WeightCategory> data; + List<WeightCategoryDto> data; if (species == null) { @@ -524,12 +537,13 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // un species est selectionne, on met a jour la liste des categories // disponibles pour cet species - List<WeightCategory> availableCategories = buildWeightCategoryList( + List<WeightCategoryDto> availableCategories = buildWeightCategoryList( species); data = availableCategories; - weightCategory = bean.getWeightCategory(); + //FIXME +// weightCategory = bean.getWeightCategory(); if (weightCategory != null && !availableCategories.contains(weightCategory)) { @@ -538,18 +552,18 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } // on met a jour le model de la liste des categories - BeanComboBox<WeightCategory> combo = getUi().getWeightCategory(); + BeanComboBox<WeightCategoryDto> combo = getUi().getWeightCategory(); combo.setData(data); // on selectionne la categorie retenue combo.setSelectedItem(weightCategory); } - protected void onCategorieChanged(TargetCatch bean, WeightCategory weightCategory) { + protected void onCategorieChanged(TargetCatchDto bean, WeightCategoryDto weightCategory) { TargetDiscardCatchUI ui = getUi(); - ReasonForDiscard reasonForDiscard = null; - List<ReasonForDiscard> data; + ReasonForDiscardDto reasonForDiscard = null; + List<ReasonForDiscardDto> data; if (weightCategory == null) { // aucune categorie selectionnee, on vide simplement @@ -562,7 +576,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, // un categorie est selectionne, on met a jour la liste des raisons // rejet disponible pour cette categorie - List<ReasonForDiscard> reasonForDiscardList = buildReasonFordiscardList( + List<ReasonForDiscardDto> reasonForDiscardList = buildReasonFordiscardList( weightCategory); if (log.isDebugEnabled()) { @@ -571,7 +585,8 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, data = reasonForDiscardList; - reasonForDiscard = bean.getReasonForDiscard(); + //FIXME +// reasonForDiscard = bean.getReasonForDiscard(); if (reasonForDiscard != null && !reasonForDiscardList.contains(reasonForDiscard)) { @@ -580,7 +595,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } } - BeanComboBox<ReasonForDiscard> combo = ui.getReasonForDiscard(); + BeanComboBox<ReasonForDiscardDto> combo = ui.getReasonForDiscard(); // on met a jour le model de la liste des raison rejets combo.setData(data); @@ -589,9 +604,9 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, combo.setSelectedItem(reasonForDiscard); } - protected List<Species> buildEspeceList(Species species, WeightCategory weightCategory) { + protected List<SpeciesDto> buildEspeceList(SpeciesDto species, WeightCategoryDto weightCategory) { - List<WeightCategory> weightCategoryList = getAllCategories(getUi()); + List<WeightCategoryDto> weightCategoryList = getAllCategories(getUi()); removeFullyUsedCategories(weightCategoryList); @@ -599,25 +614,26 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, weightCategoryList.add(weightCategory); } - Collection<Species> usedEspeces = new HashSet<Species>(); - for (WeightCategory cat : weightCategoryList) { - usedEspeces.add(cat.getSpecies()); + Collection<SpeciesDto> usedEspeces = new HashSet<SpeciesDto>(); + for (WeightCategoryDto cat : weightCategoryList) { + //FIXME +// usedEspeces.add(cat.getSpecies()); } - List<Species> result = new ArrayList<Species>(usedEspeces); + List<SpeciesDto> result = new ArrayList<SpeciesDto>(usedEspeces); weightCategoryList.clear(); usedEspeces.clear(); return result; } - protected List<WeightCategory> buildWeightCategoryList(Species species) { + protected List<WeightCategoryDto> buildWeightCategoryList(SpeciesDto species) { - List<WeightCategory> weightCategoryList = getAllCategories(getUi()); + List<WeightCategoryDto> weightCategoryList = getAllCategories(getUi()); // on filtre les categories sur l'espèce donnée - for (Iterator<WeightCategory> it = weightCategoryList.iterator(); + for (Iterator<WeightCategoryDto> it = weightCategoryList.iterator(); it.hasNext(); ) { - WeightCategory weighte = it.next(); + WeightCategoryDto weighte = it.next(); if (!species.equals(weighte.getSpecies())) { it.remove(); } @@ -631,15 +647,15 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, } @SuppressWarnings("unchecked") - protected List<ReasonForDiscard> buildReasonFordiscardList(WeightCategory weightCategory) { + protected List<ReasonForDiscardDto> buildReasonFordiscardList(WeightCategoryDto weightCategory) { - ContentTableModel<SetSeine, TargetCatch> model = getTableModel(); - List<ReasonForDiscard> reasonForDiscardList = - new ArrayList<ReasonForDiscard>(ALL_RAISONS_REJET_ENTRY.getContextValue(getUi())); + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); + List<ReasonForDiscardDto> reasonForDiscardList = + new ArrayList<ReasonForDiscardDto>(ALL_RAISONS_REJET_ENTRY.getContextValue(getUi())); // on filtre les raison rejet sur la categorie for (int i = 0; i < model.getRowCount(); i++) { - TargetCatch c = model.getValueAt(i); + TargetCatchDto c = model.getValueAt(i); if (c != null && c.getReasonForDiscard() != null && weightCategory.equals(c.getWeightCategory())) { reasonForDiscardList.remove(c.getReasonForDiscard()); @@ -649,24 +665,24 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeine, return reasonForDiscardList; } - protected List<WeightCategory> getAllCategories(JAXXContext context) { - List<WeightCategory> list = new ArrayList<WeightCategory>( + protected List<WeightCategoryDto> getAllCategories(JAXXContext context) { + List<WeightCategoryDto> list = new ArrayList<WeightCategoryDto>( ALL_CATEGORIES_ENTRY.getContextValue(context)); return list; } protected void removeFullyUsedCategories( - List<WeightCategory> weightCategoryAvaillable) { + List<WeightCategoryDto> weightCategoryAvaillable) { - ContentTableModel<SetSeine, TargetCatch> model = getTableModel(); + ContentTableModel<SetSeineDto, TargetCatchDto> model = getTableModel(); int nbReasonForDiscard = ALL_RAISONS_REJET_ENTRY.getContextValue(getUi()).size(); // on filtre toutes les weightCategory qui ont deja references toutes // les raisons rejets - for (WeightCategory c : getWeightCategoryUsed(model)) { - Collection<ReasonForDiscard> raisonUsed = getReasonForDiscardUsed(model, c); + for (WeightCategoryDto c : getWeightCategoryUsed(model)) { + Collection<ReasonForDiscardDto> raisonUsed = getReasonForDiscardUsed(model, c); if (raisonUsed.size() == nbReasonForDiscard) { // toutes les raison de rejet epuisé pour cette categorie weightCategoryAvaillable.remove(c); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx index d5fb818..065199b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -122,7 +122,7 @@ public String getLengthDataTip(boolean computed) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='Species' constructorParams='this'/> + <BeanComboBox id='species' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> 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 7da40e9..8baac80 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 @@ -21,21 +21,21 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.DataService; -import fr.ird.observe.ObserveDAOHelper; 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.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; -import fr.ird.observe.ui.content.table.ContentTableUI; import fr.ird.observe.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.ui.content.table.ContentTableUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -53,7 +53,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, TargetLength> { +public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto, TargetLengthDto> { /** Logger */ static private Log log = LogFactory.getLog(TargetSampleUIHandler.class); @@ -76,7 +76,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T protected final PropertyChangeListener weightChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - TargetLength source = (TargetLength) evt.getSource(); + TargetLengthDto source = (TargetLengthDto) evt.getSource(); source.setWeightSource(false); } }; @@ -91,12 +91,12 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T protected final PropertyChangeListener lengthChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - TargetLength source = (TargetLength) evt.getSource(); + TargetLengthDto source = (TargetLengthDto) evt.getSource(); source.setLengthSource(false); } }; - public TargetSampleUIHandler(ContentTableUI<TargetSample, TargetLength> ui, + public TargetSampleUIHandler(ContentTableUI<TargetSampleDto, TargetLengthDto> ui, boolean discarded) { super(ui, DataContextType.SetSeine); this.discarded = discarded; @@ -117,72 +117,73 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T getUi().getLength().grabFocus(); } - @Override - protected String getEditBeanIdToLoad(DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - String setId = dataContext.getSelectedSetId(); - // on doit récupérer l'unique échantillonThon de la calée - String id = dataService.getTargetSampleId(dataSource, setId, discarded); - return id; - } + //FIXME +// @Override +// protected String getEditBeanIdToLoad(DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// String setId = dataContext.getSelectedSetId(); +// // on doit récupérer l'unique échantillonThon de la calée +// String id = dataService.getTargetSampleId(dataSource, setId, discarded); +// return id; +// } + +// @Override +// protected TargetSample loadEditBean(ContentMode mode, +// DataContext dataContext, +// DataService dataService, +// DataSource dataSource) throws DataSourceException { +// +// String setId = dataContext.getSelectedSetId(); +// +// if (mode == ContentMode.UPDATE) { +// +// // on ne charge les speciess uniquement si on est en mode édition +// List<Species> speciess = +// dataService.getAvailableEspeceForTargetSample(dataSource, setId, discarded); +// +// getUi().getSpecies().setData(speciess); +// } +// +// // on doit récupérer l'unique échantillonThon de la calée +// String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); +// +// TargetSample editBean = getBean(); +// +// if (log.isInfoEnabled()) { +// log.info(prefix + " - set id : " + setId); +// log.info(prefix + " - echantillon thon id : " + id); +// log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); +// } +// +// if (id == null) { +// +// // l'échantillon n'existe pas encore, donc rien a faire +// getLoadBinder().load(null, editBean, true); +// +// getModel().getChildsUpdator().setChilds(editBean, new ArrayList<TargetLength>()); +// } else { +// +// // preparation du bean d'édition +// dataService.loadEditEntity(dataSource, id, getLoadExecutor()); +// } +// +// getModel().setMode(mode); +// +// // initialisation du modèle du tableau +// getUi().getTableModel().attachModel(); +// +// return editBean; +// } @Override - protected TargetSample loadEditBean(ContentMode mode, - DataContext dataContext, - DataService dataService, - DataSource dataSource) throws DataSourceException { - - String setId = dataContext.getSelectedSetId(); - - if (mode == ContentMode.UPDATE) { - - // on ne charge les speciess uniquement si on est en mode édition - List<Species> speciess = - dataService.getAvailableEspeceForTargetSample(dataSource, setId, discarded); - - getUi().getSpecies().setData(speciess); - } - - // on doit récupérer l'unique échantillonThon de la calée - String id = getEditBeanIdToLoad(dataContext, dataService, dataSource); - - TargetSample editBean = getBean(); - - if (log.isInfoEnabled()) { - log.info(prefix + " - set id : " + setId); - log.info(prefix + " - echantillon thon id : " + id); - log.info(prefix + " - edit bean id : " + editBean.getTopiaId()); - } - - if (id == null) { - - // l'échantillon n'existe pas encore, donc rien a faire - getLoadBinder().load(null, editBean, true); - - getModel().getChildsUpdator().setChilds(editBean, new ArrayList<TargetLength>()); - } else { - - // preparation du bean d'édition - dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - } - - getModel().setMode(mode); - - // initialisation du modèle du tableau - getUi().getTableModel().attachModel(); - - return editBean; - } - - @Override - protected boolean prepareSave(TargetSample bean, List<TargetLength> objets) throws DataSourceException { + protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) throws DataSourceException { boolean withLengths = !objets.isEmpty(); if (withLengths) { - if (bean.getTopiaId() == null) { + if (bean.getId() == null) { String setId = getDataContext().getSelectedSetId(); @@ -192,14 +193,16 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T log.debug("Will create targetSample " + bean + " for " + setId); } - getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); + //FIXME +// getDataService().create(getDataSource(), setId, bean, null, getCreateExecutor()); } - for (TargetLength targetLength : objets) { + for (TargetLengthDto targetLength : objets) { // on attache a l'echantillon - targetLength.setTargetSample(bean); + //FIXME +// targetLength.setTargetSample(bean); } } @@ -208,59 +211,62 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T } + //FIXME +// @Override +// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// +// if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { +// +// // remove orphan target sample +// +// String setId = getDataContext().getSelectedSetId(); +// if (log.isInfoEnabled()) { +// log.info("Remove obsolete targetSample " + bean.getTopiaId() + " from Set: " + setId); +// } +// getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); +// +// } else { +// +// // normal persist +// super.doPersist(bean, dataService, dataSource); +// +// } +// +// } + + //FIXME +// @Override +// protected TargetSample onCreate(TopiaContext tx, +// Object parent, +// TargetSample editBean) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// TargetSample beanToSave = +// ObserveDAOHelper.getTargetSampleDAO(tx).create(); +// beanToSave.setDiscarded(discarded); +// editBean.setTopiaId(beanToSave.getTopiaId()); +// editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); +// editBean.setTopiaVersion(beanToSave.getTopiaVersion()); +// parentBean.addTargetSample(beanToSave); +// return beanToSave; +// } + + //FIXME @Override - protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { - - if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { - - // remove orphan target sample - - String setId = getDataContext().getSelectedSetId(); - if (log.isInfoEnabled()) { - log.info("Remove obsolete targetSample " + bean.getTopiaId() + " from Set: " + setId); - } - getDataService().delete(getDataSource(), setId, bean, getDeleteExecutor()); - - } else { - - // normal persist - super.doPersist(bean, dataService, dataSource); - - } +// protected void onDelete(TopiaContext tx, Object parent, TargetSample beanToDelete) throws TopiaException { +// SetSeine parentBean = (SetSeine) parent; +// parentBean.removeTargetSample(beanToDelete); +// } - } + protected void onSelectedRowChanged(int editingRow, TargetLengthDto bean, boolean create) { - @Override - protected TargetSample onCreate(TopiaContext tx, - Object parent, - TargetSample editBean) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - TargetSample beanToSave = - ObserveDAOHelper.getTargetSampleDAO(tx).create(); - beanToSave.setDiscarded(discarded); - editBean.setTopiaId(beanToSave.getTopiaId()); - editBean.setTopiaCreateDate(beanToSave.getTopiaCreateDate()); - editBean.setTopiaVersion(beanToSave.getTopiaVersion()); - parentBean.addTargetSample(beanToSave); - return beanToSave; - } - - @Override - protected void onDelete(TopiaContext tx, Object parent, TargetSample beanToDelete) throws TopiaException { - SetSeine parentBean = (SetSeine) parent; - parentBean.removeTargetSample(beanToDelete); - } - - @Override - protected void onSelectedRowChanged(int editingRow, TargetLength bean, boolean create) { - - ContentTableModel<TargetSample, TargetLength> model = getTableModel(); + ContentTableModel<TargetSampleDto, TargetLengthDto> model = getTableModel(); TargetSampleUI ui = getUi(); if (!model.isEditable()) { return; } - Species species = bean.getSpecies(); + //FIXME +// SpeciesDto species = bean.getSpecies(); JComponent requestFocus; @@ -271,8 +277,9 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T if (editingRow > 0) { // on recupere l'species de la ligne precedente - TargetLength editBean = model.getValueAt(editingRow - 1); - species = editBean.getSpecies(); + TargetLengthDto editBean = model.getValueAt(editingRow - 1); + //FIXME +// species = editBean.getSpecies(); } // on passe le mode de saisie en count @@ -301,20 +308,21 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T // on met a jour l'espce ui.getSpecies().setSelectedItem(null); - if (species != null) { - if (log.isDebugEnabled()) { - log.debug("species to use " + species); - } - ui.getSpecies().setSelectedItem(species); - } + //FIXME +// if (species != null) { +// if (log.isDebugEnabled()) { +// log.debug("species to use " + species); +// } +// ui.getSpecies().setSelectedItem(species); +// } requestFocus.requestFocus(); - TargetLength tableEditBean = getTableEditBean(); - tableEditBean.removePropertyChangeListener(TargetLength.PROPERTY_WEIGHT, weightChanged); - tableEditBean.addPropertyChangeListener(TargetLength.PROPERTY_WEIGHT, weightChanged); + TargetLengthDto tableEditBean = getTableEditBean(); + tableEditBean.removePropertyChangeListener(TargetLengthDto.PROPERTY_WEIGHT, weightChanged); + tableEditBean.addPropertyChangeListener(TargetLengthDto.PROPERTY_WEIGHT, weightChanged); - tableEditBean.removePropertyChangeListener(TargetLength.PROPERTY_LENGTH, lengthChanged); - tableEditBean.addPropertyChangeListener(TargetLength.PROPERTY_LENGTH, lengthChanged); + tableEditBean.removePropertyChangeListener(TargetLengthDto.PROPERTY_LENGTH, lengthChanged); + tableEditBean.addPropertyChangeListener(TargetLengthDto.PROPERTY_LENGTH, lengthChanged); } @Override @@ -337,7 +345,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T n("observe.targetSample.table.totalWeight"), n("observe.targetSample.table.totalWeight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Species.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CodeMesureEnum.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -351,14 +359,15 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T boolean showData = false; - try { - String setId = getDataContext().getSelectedSetId(); - showData = getDataService().canUseTargetSample(getDataSource(), setId, discarded); - } catch (DataSourceException e) { - if (log.isErrorEnabled()) { - log.error(e); - } - } + //FIXME +// try { +// String setId = getDataContext().getSelectedSetId(); +// showData = getDataService().canUseTargetSample(getDataSource(), setId, discarded); +// } catch (DataSourceException e) { +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// } getModel().setShowData(showData); @@ -368,7 +377,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T addMessage(getUi(), NuitonValidatorScope.INFO, - getEntityLabel(SetSeine.class), + getEntityLabel(SetSeineDto.class), discarded ? t("observe.setSeine.message.no.targetCatch") : t("observe.setSeine.message.no.targetDiscarded") @@ -398,7 +407,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSample, T boolean createMode = ui.getTableModel().isCreate(); - TargetLength editBean = ui.getTableEditBean(); + TargetLengthDto editBean = ui.getTableEditBean(); switch (newMode) { case byEffectif: diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java index 639f893..5950b3f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.storage; import fr.ird.observe.ObserveContext; -import fr.ird.observe.DataService; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DbMode; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.business.db.model.DataSelectionModel; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,13 +60,14 @@ public class StorageBackupUILauncher extends StorageUILauncher { StorageUIModel model = ui.getModel(); model.setCanCreateLocalService(false); - if (source instanceof H2DataSource) { - model.setCanUseLocalService(true); - model.setDbMode(DbMode.USE_LOCAL); - } else { + //FIXME +// if (source instanceof H2DataSource) { +// model.setCanUseLocalService(true); +// model.setDbMode(DbMode.USE_LOCAL); +// } else { model.setCanUseRemoteService(true); model.setDbMode(DbMode.USE_REMOTE); - } +// } model.setSteps(StorageStep.BACKUP, StorageStep.SELECT_DATA, 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 ad035dd..d90ca8e 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 @@ -27,21 +27,12 @@ import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveRunner; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceConfig; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.DataSourceFactory; -import fr.ird.observe.business.db.ReplicationService; import fr.ird.observe.business.db.constants.CreationMode; import fr.ird.observe.business.db.constants.DbMode; -import fr.ird.observe.business.db.event.DataSourceEvent; -import fr.ird.observe.business.db.event.DataSourceListenerAdapter; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.business.db.impl.H2DataSourceConfig; -import fr.ird.observe.business.db.impl.PGDataSource; -import fr.ird.observe.business.db.impl.PGDataSourceConfig; -import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; @@ -287,8 +278,9 @@ public class StorageUIHandler { if (StorageStep.SELECT_DATA == newStep && mustRecompute) { - if (ObstunaAdminAction.CREATE == ui.getModel().getAdminAction() && - model.getSelectDataModel() == null) { + if (ObstunaAdminAction.CREATE == ui.getModel().getAdminAction() ) { + //FIXME +// && model.getSelectDataModel() == null) { // récupération des données possibles à importer initSelectData(ui); @@ -876,7 +868,7 @@ public class StorageUIHandler { //FIXME // addTag("li", sb, // model.getH2Config().getDataDirectory().getAbsolutePath() - ); +// ); addCloseTag("ul", sb); computeCanMigrateAction(model, sb); @@ -990,7 +982,7 @@ public class StorageUIHandler { addTag("li", sb, model.getBackupFile().getAbsolutePath()); addCloseTag("ul", sb); - if (!model.isUseSelectData() || model.getSelectDataModel() == null) { + if (!model.isUseSelectData()) { //FIXME || model.getSelectDataModel() == null) { return; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx index 3c9492c..9dbfa89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -29,8 +29,8 @@ fr.ird.observe.ObserveConfig fr.ird.observe.ui.UIHelper fr.ird.observe.ui.storage.StorageStep - fr.ird.observe.db.constants.DbMode - fr.ird.observe.db.constants.CreationMode + fr.ird.observe.business.db.constants.DbMode + fr.ird.observe.business.db.constants.CreationMode </import> <StorageStep id='step' initializer='StorageStep.CHOOSE_DB_MODE'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx index c10cfae..80748d1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.constants.CreationMode + fr.ird.observe.business.db.constants.CreationMode fr.ird.observe.ui.storage.StorageStep javax.swing.Icon diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx index 15025e4..0d95cb0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.constants.CreationMode + fr.ird.observe.business.db.constants.CreationMode fr.ird.observe.ui.storage.StorageStep javax.swing.Icon diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx index db98abc..db7d07e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx @@ -28,7 +28,7 @@ <import> fr.ird.observe.ui.storage.StorageStep - fr.ird.observe.db.constants.ConnexionStatus + fr.ird.observe.business.db.constants.ConnexionStatus java.awt.Color java.awt.Dimension diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx index c4db2af..50c1ee3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx @@ -27,7 +27,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.util.SecurityModel + fr.ird.observe.business.util.SecurityModel fr.ird.observe.ui.storage.StorageStep fr.ird.observe.ui.storage.StorageUIModel </import> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx index 43e3b4c..4d88ef5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx @@ -27,7 +27,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.DataSource + fr.ird.observe.business.db.DataSource fr.ird.observe.ui.storage.StorageStep fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.ui.tree.DataSelectionTreeCellRenderer 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 5cc617a..fbe5620 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 @@ -343,22 +343,24 @@ public class StorageTabUIHandler { text = t(text); break; case SUCCESS: - text = t(text, ui.model.getPgConfig().toString()); + //FIXME +// text = t(text, ui.model.getPgConfig().toString()); break; case FAILED: - if (ui.model.getPgConfig().getConnexionError() != null) { - // real connexion error - text = t(text, ui.model.getPgConfig().getConnexionError().getMessage()); - } else { - - // remote version mismatch - Preconditions.checkState(!ui.model.isPgConfigVersionMatch()); - - String error = t("observe.storage.error.dbVersionMismatch", ui.model.getPgConfig().getVersion(), ui.model.getDbVersion()); - - text = t(text, error); - } + //FIXME +// if (ui.model.getPgConfig().getConnexionError() != null) { +// // real connexion error +// text = t(text, ui.model.getPgConfig().getConnexionError().getMessage()); +// } else { +// +// // remote version mismatch +// Preconditions.checkState(!ui.model.isPgConfigVersionMatch()); +// +// String error = t("observe.storage.error.dbVersionMismatch", ui.model.getPgConfig().getVersion(), ui.model.getDbVersion()); +// +// text = t(text, error); +// } break; } 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 28c638f..852ce65 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 @@ -45,7 +45,6 @@ import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.*; import javax.swing.tree.DefaultTreeModel; 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 cc65020..2a47d48 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 @@ -128,14 +128,15 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { protected void loadEntity(ObserveDataProvider oProvider) { - if (oProvider.getSelectionModel() != null) { + //FIXME +// if (oProvider.getSelectionModel() != null) { if (log.isDebugEnabled()) { log.debug("try to get entity from selectionModel " + internalClass + " : " + id); } //FIXME // entity = (E) oProvider.getSelectionModel().getEntityCache(id); - } +// } if (entity == null) { 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 1d46107..cb0a1f4 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 @@ -36,6 +36,7 @@ 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.ui.ObserveMainUI; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglinesNodeChildLoador; 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 f5995f6..9acb6a8 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 @@ -25,7 +25,6 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.services.dto.seine.RouteDto; 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.RouteSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -59,7 +58,8 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { DataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME // List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); - return data; +// return data; + return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx index fff52c1..b64d064 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx @@ -43,7 +43,7 @@ private UsagesUIHandler handler = new UsagesUIHandler(); public void init(String message, String message2, String message3, - Map<Class<? extends TopiaEntity>, List<? extends AbstractObserveDto>> usages) { + Map<Class<? extends AbstractObserveDto>, List<? extends AbstractObserveDto>> usages) { getHandler().initUI(this, message,message2, message3, usages); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java index 2ea7dd8..c68c0c8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java @@ -23,11 +23,11 @@ package fr.ird.observe.ui.usage; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JLabel; import javax.swing.JList; @@ -61,8 +61,8 @@ public class UsagesUIHandler { public void initUI(UsagesUI ui, String message, String message2, String message3, - Map<Class<? extends TopiaEntity>, - List<? extends TopiaEntity>> usages) { + Map<Class<? extends AbstractObserveDto>, + List<? extends AbstractObserveDto>> usages) { // toujours nettoyer l'ui avant tout cleanUI(ui); @@ -80,10 +80,10 @@ public class UsagesUIHandler { t("observe.message.no.usage.for.entity"))); } else { - for (Map.Entry<Class<? extends TopiaEntity>, - List<? extends TopiaEntity>> entry : usages.entrySet()) { - Class<? extends TopiaEntity> type = entry.getKey(); - List<? extends TopiaEntity> entitites = entry.getValue(); + for (Map.Entry<Class<? extends AbstractObserveDto>, + List<? extends AbstractObserveDto>> entry : usages.entrySet()) { + Class<? extends AbstractObserveDto> type = entry.getKey(); + List<? extends AbstractObserveDto> entitites = entry.getValue(); String typeTitle = DecoratorService.getEntityLabel(type); typeTitle = t(typeTitle); addUsages(ui, type, entitites, typeTitle); @@ -101,8 +101,8 @@ public class UsagesUIHandler { } protected void addUsages(UsagesUI ui, - Class<? extends TopiaEntity> type, - List<? extends TopiaEntity> entitites, + Class<? extends AbstractObserveDto> type, + List<? extends AbstractObserveDto> entitites, String typeTitle) { JScrollPane pane = new JScrollPane(); @@ -127,7 +127,7 @@ public class UsagesUIHandler { throw new NullPointerException( "could not find decorator for type " + type); } - for (TopiaEntity entitite : entitites) { + for (AbstractObserveDto entitite : entitites) { try { String s = decorator.toString(entitite); data.add(s); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java index 54f2cc1..9f7b0dd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java @@ -24,8 +24,7 @@ package fr.ird.observe.ui.util.table; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import fr.ird.observe.services.dto.AbstractObserveDto; import java.util.ArrayList; import java.util.Collections; @@ -40,7 +39,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEntity> extends EditableTableModelSupport<E> { +public abstract class EditableTableWithCacheTableModelSupport<E extends AbstractObserveDto> extends EditableTableModelSupport<E> { private static final long serialVersionUID = 1L; @@ -54,17 +53,18 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEnt /** * Pour pouvoir faire des copies de chaque object. */ - protected final TopiaEntityBinder<E> loader; + //FIXME +// protected final TopiaEntityBinder<E> loader; - protected EditableTableWithCacheTableModelSupport(TopiaEntityBinder<E> loader) { + protected EditableTableWithCacheTableModelSupport() { super(true); - this.loader = loader; this.cacheByRow = new TreeMap<Integer, EditableList<E>>(); } - public TopiaEntityBinder<E> getLoader() { - return loader; - } + //FIXME +// public TopiaEntityBinder<E> getLoader() { +// return loader; +// } public List<E> getCacheForRow(int rowIndex) { EditableList<E> measures = cacheByRow.get(rowIndex); @@ -148,7 +148,8 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEnt List<E> copy = new ArrayList<E>(data.size()); for (E measure : data) { E originalMeasure = createNewRow(); - loader.load(measure, originalMeasure, true); + //FIXME +// loader.load(measure, originalMeasure, true); copy.add(originalMeasure); } return copy; diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 437f02e..eeccb53 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1,6 +1,19 @@ +nuitonutil.error.convertor.noValue= +nuitonutil.error.float.convertor= +nuitonutil.error.no.convertor= observe.about.message= observe.about.translate.content= observe.about.translate.title= +observe.action.HookSize.create.tip= +observe.action.HookSize.delete.tip= +observe.action.HookSize.detail.tip= +observe.action.HookSize.modify.tip= +observe.action.HookSize.save.tip= +observe.action.HookType.create.tip= +observe.action.HookType.delete.tip= +observe.action.HookType.detail.tip= +observe.action.HookType.modify.tip= +observe.action.HookType.save.tip= observe.action.about= observe.action.about.tip= observe.action.add.floatingObject= @@ -715,11 +728,21 @@ observe.common.acquisitionMode.individu= observe.common.activities= observe.common.activities.list= observe.common.activity= +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= observe.common.baitObservation= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= observe.common.birdsObservation= observe.common.boolean.false= observe.common.boolean.null= observe.common.boolean.true= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= observe.common.brand= observe.common.brandName= observe.common.broughtOnDeck= @@ -727,6 +750,8 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= +observe.common.catchFateLongline= +observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -754,22 +779,53 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= +observe.common.encounter= +observe.common.encounterType= observe.common.endDate= observe.common.endLogValue= observe.common.equation= observe.common.ersId= +observe.common.faoCode= observe.common.file= observe.common.firstName= observe.common.flagCountry= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= observe.common.formsUrl= +observe.common.fpaZone= observe.common.gaugeLabel= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gearType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesSeine= +observe.common.gender= observe.common.generateReport= observe.common.global.progression.description= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= observe.common.heureobservation= +observe.common.homeId= observe.common.homeIdFAOWormsId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= observe.common.iso2Code= observe.common.iso3Code= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= observe.common.keelCodeFlotte= observe.common.label1= observe.common.label2= @@ -788,10 +844,16 @@ observe.common.length.inf= observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= observe.common.libelles= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= observe.common.longitude= observe.common.lowerValueUpperValue= observe.common.mammalsObservation= +observe.common.maturityStatus= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -805,30 +867,48 @@ observe.common.measureType.lf= observe.common.measureType.unknown= observe.common.minLengthMax= observe.common.minWeightMax= +observe.common.mitigationType= +observe.common.name= observe.common.needComment= observe.common.nextFpaZone= observe.common.no.balise= +observe.common.nocode= observe.common.nonCoupSenne= observe.common.nonTargetCatch= +observe.common.nonTargetLength= observe.common.nonTargetObservation= observe.common.nonTargetSample= +observe.common.none= observe.common.objectFate= observe.common.objectObservedSpecies= observe.common.objectOperation= +observe.common.objectSchoolEstimate= observe.common.objectType= observe.common.objectsObservation= observe.common.observedSystem= observe.common.observedSystemDistance= observe.common.observer= +observe.common.observerLabel= observe.common.obsolete.entity= observe.common.ocean= +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= observe.common.oceanForSpecies= +observe.common.oldCode3L= observe.common.operation.resume= observe.common.organism= observe.common.ownership= +observe.common.person= observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= +observe.common.program= observe.common.program.observation.value.0= observe.common.program.observation.value.1= observe.common.program.observation.value.2= @@ -840,8 +920,11 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= observe.common.reportsUrl= observe.common.resume= +observe.common.route= observe.common.routes.list= observe.common.samplesObservation= observe.common.schoolEstimate= @@ -849,6 +932,7 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= +observe.common.section= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -864,11 +948,24 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= observe.common.species= +observe.common.species/scientificLabel= observe.common.speciesFate= observe.common.speciesFaune= observe.common.speciesGroup= +observe.common.speciesList= observe.common.speciesStatus= observe.common.speciesThon= observe.common.speedRange= @@ -878,6 +975,7 @@ observe.common.startDateFinValidite= observe.common.startLogValue= observe.common.status= observe.common.step.description= +observe.common.stomacFullness= observe.common.storage.not.valid= observe.common.supportVesselName= observe.common.surroundingActivity= @@ -886,8 +984,12 @@ observe.common.taillePoids.caracteristics= observe.common.targetCatch= observe.common.targetDiscarded= observe.common.targetDiscardsObservation= +observe.common.targetLength= observe.common.targetSample= observe.common.targetSampleCapture= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -895,16 +997,38 @@ observe.common.totalCount= observe.common.totalCountComputed.computed.tip= observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= +observe.common.tracelineLength= +observe.common.transmittingBuoy= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= observe.common.trips.list= observe.common.typeTransmittingBuoyOperation= observe.common.undefined= observe.common.undefined.tip= observe.common.uri= observe.common.vessel= +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= observe.common.vesselActivitySeine= observe.common.vesselActivitySeine.comment= +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= observe.common.vesselSizeCategory= observe.common.vesselSpeed= observe.common.vesselType= @@ -915,6 +1039,8 @@ observe.common.weight.ind= observe.common.weight.observed.tip= observe.common.weightCategory= observe.common.weightLengthFormula= +observe.common.weightMeasure= +observe.common.weightMeasureType= observe.common.well= observe.common.wind= observe.common.yearService= @@ -1134,6 +1260,8 @@ observe.label.usage.referentiel.title= observe.label.weightLengthFormula.info= observe.lengthWeightParameter.tab.general= observe.lengthWeightParameter.tab.other= +observe.list.HookSize= +observe.list.HookType= observe.list.baitHaulingStatus= observe.list.baitSettingStatus= observe.list.baitType= @@ -1281,8 +1409,22 @@ observe.map.legend.hauling= observe.map.legend.setting= observe.map.legend.tripBetweenTwoDays= observe.map.legend.tripDay= +observe.map.longLine.activity= +observe.map.longLine.activity.hauling.end= +observe.map.longLine.activity.hauling.start= +observe.map.longLine.activity.interaction= +observe.map.longLine.activity.setting.end= +observe.map.longLine.activity.setting.start= +observe.map.longLine.activity.station= +observe.map.longLine.seine.harbour= observe.map.miles= observe.map.north= +observe.map.seine.activity= +observe.map.seine.activity.inHarbour= +observe.map.seine.activity.schollType.free= +observe.map.seine.activity.schollType.object= +observe.map.seine.harbour.departure= +observe.map.seine.harbour.landing= observe.map.south= observe.map.waitLoading= observe.map.west= @@ -1598,6 +1740,36 @@ observe.speciesList.selectedSpecies= observe.speciesList.tab.general= observe.speciesList.tab.species= observe.storage.action.canMigrate= +observe.storage.connexionStatut.failed= +observe.storage.connexionStatut.failed.description= +observe.storage.connexionStatut.success= +observe.storage.connexionStatut.success.description= +observe.storage.connexionStatut.untested= +observe.storage.connexionStatut.untested.description= +observe.storage.creationMode.empty= +observe.storage.creationMode.empty.description= +observe.storage.creationMode.externalDump= +observe.storage.creationMode.externalDump.description= +observe.storage.creationMode.importLocalStorage= +observe.storage.creationMode.importLocalStorage.description= +observe.storage.creationMode.importRemoteStorage= +observe.storage.creationMode.importRemoteStorage.description= +observe.storage.creationMode.internalDump= +observe.storage.creationMode.internalDump.description= +observe.storage.dataPolicy.readData= +observe.storage.dataPolicy.readData.description= +observe.storage.dataPolicy.readReferentiel= +observe.storage.dataPolicy.readReferentiel.description= +observe.storage.dataPolicy.writeData= +observe.storage.dataPolicy.writeData.description= +observe.storage.dataPolicy.writeReferentiel= +observe.storage.dataPolicy.writeReferentiel.description= +observe.storage.dbMode.createLocal= +observe.storage.dbMode.createLocal.description= +observe.storage.dbMode.useLocal= +observe.storage.dbMode.useLocal.description= +observe.storage.dbMode.useRemote= +observe.storage.dbMode.useRemote.description= observe.storage.error.dbVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= @@ -1626,6 +1798,7 @@ observe.storage.label.synchro= observe.storage.label.synchro.incoming= observe.storage.label.synchro.referentiel= observe.storage.locale.db= +observe.storage.message.provider.detected= observe.storage.no.creationMode= observe.storage.no.creationMode.required= observe.storage.no.dbMode= @@ -1933,6 +2106,8 @@ observe.title.connect.localDB= observe.title.connect.remoteDB= observe.title.consolidate= observe.title.consolidate.tip= +observe.title.content.HookSizes= +observe.title.content.HookTypes= observe.title.content.baitHaulingStatuss= observe.title.content.baitSettingStatuss= observe.title.content.baitTypes= @@ -2139,6 +2314,12 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map= observe.tripSeine.title= +observe.validation.model.type.all= +observe.validation.model.type.all.description= +observe.validation.model.type.data= +observe.validation.model.type.data.description= +observe.validation.model.type.referentiel= +observe.validation.model.type.referentiel.description= observe.validation.report.contextName= observe.validation.report.entities.with.messages= observe.validation.report.entity= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 437f02e..eeccb53 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1,6 +1,19 @@ +nuitonutil.error.convertor.noValue= +nuitonutil.error.float.convertor= +nuitonutil.error.no.convertor= observe.about.message= observe.about.translate.content= observe.about.translate.title= +observe.action.HookSize.create.tip= +observe.action.HookSize.delete.tip= +observe.action.HookSize.detail.tip= +observe.action.HookSize.modify.tip= +observe.action.HookSize.save.tip= +observe.action.HookType.create.tip= +observe.action.HookType.delete.tip= +observe.action.HookType.detail.tip= +observe.action.HookType.modify.tip= +observe.action.HookType.save.tip= observe.action.about= observe.action.about.tip= observe.action.add.floatingObject= @@ -715,11 +728,21 @@ observe.common.acquisitionMode.individu= observe.common.activities= observe.common.activities.list= observe.common.activity= +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= observe.common.baitObservation= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= observe.common.birdsObservation= observe.common.boolean.false= observe.common.boolean.null= observe.common.boolean.true= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= observe.common.brand= observe.common.brandName= observe.common.broughtOnDeck= @@ -727,6 +750,8 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= +observe.common.catchFateLongline= +observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -754,22 +779,53 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= +observe.common.encounter= +observe.common.encounterType= observe.common.endDate= observe.common.endLogValue= observe.common.equation= observe.common.ersId= +observe.common.faoCode= observe.common.file= observe.common.firstName= observe.common.flagCountry= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= observe.common.formsUrl= +observe.common.fpaZone= observe.common.gaugeLabel= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gearType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesSeine= +observe.common.gender= observe.common.generateReport= observe.common.global.progression.description= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= observe.common.heureobservation= +observe.common.homeId= observe.common.homeIdFAOWormsId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= observe.common.iso2Code= observe.common.iso3Code= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= observe.common.keelCodeFlotte= observe.common.label1= observe.common.label2= @@ -788,10 +844,16 @@ observe.common.length.inf= observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= observe.common.libelles= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= observe.common.longitude= observe.common.lowerValueUpperValue= observe.common.mammalsObservation= +observe.common.maturityStatus= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -805,30 +867,48 @@ observe.common.measureType.lf= observe.common.measureType.unknown= observe.common.minLengthMax= observe.common.minWeightMax= +observe.common.mitigationType= +observe.common.name= observe.common.needComment= observe.common.nextFpaZone= observe.common.no.balise= +observe.common.nocode= observe.common.nonCoupSenne= observe.common.nonTargetCatch= +observe.common.nonTargetLength= observe.common.nonTargetObservation= observe.common.nonTargetSample= +observe.common.none= observe.common.objectFate= observe.common.objectObservedSpecies= observe.common.objectOperation= +observe.common.objectSchoolEstimate= observe.common.objectType= observe.common.objectsObservation= observe.common.observedSystem= observe.common.observedSystemDistance= observe.common.observer= +observe.common.observerLabel= observe.common.obsolete.entity= observe.common.ocean= +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= observe.common.oceanForSpecies= +observe.common.oldCode3L= observe.common.operation.resume= observe.common.organism= observe.common.ownership= +observe.common.person= observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= +observe.common.program= observe.common.program.observation.value.0= observe.common.program.observation.value.1= observe.common.program.observation.value.2= @@ -840,8 +920,11 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= observe.common.reportsUrl= observe.common.resume= +observe.common.route= observe.common.routes.list= observe.common.samplesObservation= observe.common.schoolEstimate= @@ -849,6 +932,7 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= +observe.common.section= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -864,11 +948,24 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= observe.common.species= +observe.common.species/scientificLabel= observe.common.speciesFate= observe.common.speciesFaune= observe.common.speciesGroup= +observe.common.speciesList= observe.common.speciesStatus= observe.common.speciesThon= observe.common.speedRange= @@ -878,6 +975,7 @@ observe.common.startDateFinValidite= observe.common.startLogValue= observe.common.status= observe.common.step.description= +observe.common.stomacFullness= observe.common.storage.not.valid= observe.common.supportVesselName= observe.common.surroundingActivity= @@ -886,8 +984,12 @@ observe.common.taillePoids.caracteristics= observe.common.targetCatch= observe.common.targetDiscarded= observe.common.targetDiscardsObservation= +observe.common.targetLength= observe.common.targetSample= observe.common.targetSampleCapture= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -895,16 +997,38 @@ observe.common.totalCount= observe.common.totalCountComputed.computed.tip= observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= +observe.common.tracelineLength= +observe.common.transmittingBuoy= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= observe.common.trips.list= observe.common.typeTransmittingBuoyOperation= observe.common.undefined= observe.common.undefined.tip= observe.common.uri= observe.common.vessel= +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= observe.common.vesselActivitySeine= observe.common.vesselActivitySeine.comment= +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= observe.common.vesselSizeCategory= observe.common.vesselSpeed= observe.common.vesselType= @@ -915,6 +1039,8 @@ observe.common.weight.ind= observe.common.weight.observed.tip= observe.common.weightCategory= observe.common.weightLengthFormula= +observe.common.weightMeasure= +observe.common.weightMeasureType= observe.common.well= observe.common.wind= observe.common.yearService= @@ -1134,6 +1260,8 @@ observe.label.usage.referentiel.title= observe.label.weightLengthFormula.info= observe.lengthWeightParameter.tab.general= observe.lengthWeightParameter.tab.other= +observe.list.HookSize= +observe.list.HookType= observe.list.baitHaulingStatus= observe.list.baitSettingStatus= observe.list.baitType= @@ -1281,8 +1409,22 @@ observe.map.legend.hauling= observe.map.legend.setting= observe.map.legend.tripBetweenTwoDays= observe.map.legend.tripDay= +observe.map.longLine.activity= +observe.map.longLine.activity.hauling.end= +observe.map.longLine.activity.hauling.start= +observe.map.longLine.activity.interaction= +observe.map.longLine.activity.setting.end= +observe.map.longLine.activity.setting.start= +observe.map.longLine.activity.station= +observe.map.longLine.seine.harbour= observe.map.miles= observe.map.north= +observe.map.seine.activity= +observe.map.seine.activity.inHarbour= +observe.map.seine.activity.schollType.free= +observe.map.seine.activity.schollType.object= +observe.map.seine.harbour.departure= +observe.map.seine.harbour.landing= observe.map.south= observe.map.waitLoading= observe.map.west= @@ -1598,6 +1740,36 @@ observe.speciesList.selectedSpecies= observe.speciesList.tab.general= observe.speciesList.tab.species= observe.storage.action.canMigrate= +observe.storage.connexionStatut.failed= +observe.storage.connexionStatut.failed.description= +observe.storage.connexionStatut.success= +observe.storage.connexionStatut.success.description= +observe.storage.connexionStatut.untested= +observe.storage.connexionStatut.untested.description= +observe.storage.creationMode.empty= +observe.storage.creationMode.empty.description= +observe.storage.creationMode.externalDump= +observe.storage.creationMode.externalDump.description= +observe.storage.creationMode.importLocalStorage= +observe.storage.creationMode.importLocalStorage.description= +observe.storage.creationMode.importRemoteStorage= +observe.storage.creationMode.importRemoteStorage.description= +observe.storage.creationMode.internalDump= +observe.storage.creationMode.internalDump.description= +observe.storage.dataPolicy.readData= +observe.storage.dataPolicy.readData.description= +observe.storage.dataPolicy.readReferentiel= +observe.storage.dataPolicy.readReferentiel.description= +observe.storage.dataPolicy.writeData= +observe.storage.dataPolicy.writeData.description= +observe.storage.dataPolicy.writeReferentiel= +observe.storage.dataPolicy.writeReferentiel.description= +observe.storage.dbMode.createLocal= +observe.storage.dbMode.createLocal.description= +observe.storage.dbMode.useLocal= +observe.storage.dbMode.useLocal.description= +observe.storage.dbMode.useRemote= +observe.storage.dbMode.useRemote.description= observe.storage.error.dbVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= @@ -1626,6 +1798,7 @@ observe.storage.label.synchro= observe.storage.label.synchro.incoming= observe.storage.label.synchro.referentiel= observe.storage.locale.db= +observe.storage.message.provider.detected= observe.storage.no.creationMode= observe.storage.no.creationMode.required= observe.storage.no.dbMode= @@ -1933,6 +2106,8 @@ observe.title.connect.localDB= observe.title.connect.remoteDB= observe.title.consolidate= observe.title.consolidate.tip= +observe.title.content.HookSizes= +observe.title.content.HookTypes= observe.title.content.baitHaulingStatuss= observe.title.content.baitSettingStatuss= observe.title.content.baitTypes= @@ -2139,6 +2314,12 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map= observe.tripSeine.title= +observe.validation.model.type.all= +observe.validation.model.type.all.description= +observe.validation.model.type.data= +observe.validation.model.type.data.description= +observe.validation.model.type.referentiel= +observe.validation.model.type.referentiel.description= observe.validation.report.contextName= observe.validation.report.entities.with.messages= observe.validation.report.entity= 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 437f02e..eeccb53 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 @@ -1,6 +1,19 @@ +nuitonutil.error.convertor.noValue= +nuitonutil.error.float.convertor= +nuitonutil.error.no.convertor= observe.about.message= observe.about.translate.content= observe.about.translate.title= +observe.action.HookSize.create.tip= +observe.action.HookSize.delete.tip= +observe.action.HookSize.detail.tip= +observe.action.HookSize.modify.tip= +observe.action.HookSize.save.tip= +observe.action.HookType.create.tip= +observe.action.HookType.delete.tip= +observe.action.HookType.detail.tip= +observe.action.HookType.modify.tip= +observe.action.HookType.save.tip= observe.action.about= observe.action.about.tip= observe.action.add.floatingObject= @@ -715,11 +728,21 @@ observe.common.acquisitionMode.individu= observe.common.activities= observe.common.activities.list= observe.common.activity= +observe.common.activityLongline= +observe.common.activitySeine= +observe.common.baitHaulingStatus= observe.common.baitObservation= +observe.common.baitSettingStatus= +observe.common.baitType= +observe.common.baitsComposition= +observe.common.basket= observe.common.birdsObservation= observe.common.boolean.false= observe.common.boolean.null= observe.common.boolean.true= +observe.common.branchline= +observe.common.branchlineLength= +observe.common.branchlinesComposition= observe.common.brand= observe.common.brandName= observe.common.broughtOnDeck= @@ -727,6 +750,8 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= +observe.common.catchFateLongline= +observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -754,22 +779,53 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= +observe.common.encounter= +observe.common.encounterType= observe.common.endDate= observe.common.endLogValue= observe.common.equation= observe.common.ersId= +observe.common.faoCode= observe.common.file= observe.common.firstName= observe.common.flagCountry= +observe.common.floatingObject= +observe.common.floatline1Length= +observe.common.floatline2Length= +observe.common.floatlineLengths= +observe.common.floatlinesComposition= observe.common.formsUrl= +observe.common.fpaZone= observe.common.gaugeLabel= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gearType= +observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesSeine= +observe.common.gender= observe.common.generateReport= observe.common.global.progression.description= +observe.common.gps.activity= +observe.common.gps.gpsPoint= +observe.common.gps.gpsPointInterval= +observe.common.gpsPointInterval= +observe.common.harbour= +observe.common.haulingIdentifier= +observe.common.healthness= observe.common.heureobservation= +observe.common.homeId= observe.common.homeIdFAOWormsId= +observe.common.hookPosition= +observe.common.hookSize= +observe.common.hookType= +observe.common.hooksComposition= +observe.common.id= +observe.common.inconnu= observe.common.iso2Code= observe.common.iso3Code= +observe.common.itemHorizontalPosition= +observe.common.itemVerticalPosition= observe.common.keelCodeFlotte= observe.common.label1= observe.common.label2= @@ -788,10 +844,16 @@ observe.common.length.inf= observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= +observe.common.lengthWeightParameter= observe.common.libelles= +observe.common.lightsticksColor= +observe.common.lightsticksType= +observe.common.lineType= +observe.common.locode= observe.common.longitude= observe.common.lowerValueUpperValue= observe.common.mammalsObservation= +observe.common.maturityStatus= observe.common.meanLength= observe.common.meanLengthComputed.computed.tip= observe.common.meanLengthComputed.observed.tip= @@ -805,30 +867,48 @@ observe.common.measureType.lf= observe.common.measureType.unknown= observe.common.minLengthMax= observe.common.minWeightMax= +observe.common.mitigationType= +observe.common.name= observe.common.needComment= observe.common.nextFpaZone= observe.common.no.balise= +observe.common.nocode= observe.common.nonCoupSenne= observe.common.nonTargetCatch= +observe.common.nonTargetLength= observe.common.nonTargetObservation= observe.common.nonTargetSample= +observe.common.none= observe.common.objectFate= observe.common.objectObservedSpecies= observe.common.objectOperation= +observe.common.objectSchoolEstimate= observe.common.objectType= observe.common.objectsObservation= observe.common.observedSystem= observe.common.observedSystemDistance= observe.common.observer= +observe.common.observerLabel= observe.common.obsolete.entity= observe.common.ocean= +observe.common.ocean/label1= +observe.common.ocean/label2= +observe.common.ocean/label3= +observe.common.ocean/label4= +observe.common.ocean/label5= +observe.common.ocean/label6= +observe.common.ocean/label7= +observe.common.ocean/label8= observe.common.oceanForSpecies= +observe.common.oldCode3L= observe.common.operation.resume= observe.common.organism= observe.common.ownership= +observe.common.person= observe.common.picturesReferences= observe.common.power= observe.common.previousFpaZone= +observe.common.program= observe.common.program.observation.value.0= observe.common.program.observation.value.1= observe.common.program.observation.value.2= @@ -840,8 +920,11 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= +observe.common.reasonForNoFishing= +observe.common.reasonForNullSet= observe.common.reportsUrl= observe.common.resume= +observe.common.route= observe.common.routes.list= observe.common.samplesObservation= observe.common.schoolEstimate= @@ -849,6 +932,7 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= +observe.common.section= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -864,11 +948,24 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= +observe.common.sensorBrand= +observe.common.sensorDataFormat= +observe.common.sensorPosition= +observe.common.sensorType= +observe.common.sensorUsed= +observe.common.setLongline= +observe.common.setSeine= +observe.common.settingIdentifier= +observe.common.settingShape= observe.common.sex= +observe.common.sizeMeasure= +observe.common.sizeMeasureType= observe.common.species= +observe.common.species/scientificLabel= observe.common.speciesFate= observe.common.speciesFaune= observe.common.speciesGroup= +observe.common.speciesList= observe.common.speciesStatus= observe.common.speciesThon= observe.common.speedRange= @@ -878,6 +975,7 @@ observe.common.startDateFinValidite= observe.common.startLogValue= observe.common.status= observe.common.step.description= +observe.common.stomacFullness= observe.common.storage.not.valid= observe.common.supportVesselName= observe.common.surroundingActivity= @@ -886,8 +984,12 @@ observe.common.taillePoids.caracteristics= observe.common.targetCatch= observe.common.targetDiscarded= observe.common.targetDiscardsObservation= +observe.common.targetLength= observe.common.targetSample= observe.common.targetSampleCapture= +observe.common.tdr= +observe.common.tdrRecord= +observe.common.time= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -895,16 +997,38 @@ observe.common.totalCount= observe.common.totalCountComputed.computed.tip= observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= +observe.common.tracelineLength= +observe.common.transmittingBuoy= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= +observe.common.tripLongline= +observe.common.tripSeine= +observe.common.tripType= observe.common.trips.list= observe.common.typeTransmittingBuoyOperation= observe.common.undefined= observe.common.undefined.tip= observe.common.uri= observe.common.vessel= +observe.common.vessel/label1= +observe.common.vessel/label2= +observe.common.vessel/label3= +observe.common.vessel/label4= +observe.common.vessel/label5= +observe.common.vessel/label6= +observe.common.vessel/label7= +observe.common.vessel/label8= +observe.common.vesselActivityLongline= observe.common.vesselActivitySeine= observe.common.vesselActivitySeine.comment= +observe.common.vesselActivitySeine/label1= +observe.common.vesselActivitySeine/label2= +observe.common.vesselActivitySeine/label3= +observe.common.vesselActivitySeine/label4= +observe.common.vesselActivitySeine/label5= +observe.common.vesselActivitySeine/label6= +observe.common.vesselActivitySeine/label7= +observe.common.vesselActivitySeine/label8= observe.common.vesselSizeCategory= observe.common.vesselSpeed= observe.common.vesselType= @@ -915,6 +1039,8 @@ observe.common.weight.ind= observe.common.weight.observed.tip= observe.common.weightCategory= observe.common.weightLengthFormula= +observe.common.weightMeasure= +observe.common.weightMeasureType= observe.common.well= observe.common.wind= observe.common.yearService= @@ -1134,6 +1260,8 @@ observe.label.usage.referentiel.title= observe.label.weightLengthFormula.info= observe.lengthWeightParameter.tab.general= observe.lengthWeightParameter.tab.other= +observe.list.HookSize= +observe.list.HookType= observe.list.baitHaulingStatus= observe.list.baitSettingStatus= observe.list.baitType= @@ -1281,8 +1409,22 @@ observe.map.legend.hauling= observe.map.legend.setting= observe.map.legend.tripBetweenTwoDays= observe.map.legend.tripDay= +observe.map.longLine.activity= +observe.map.longLine.activity.hauling.end= +observe.map.longLine.activity.hauling.start= +observe.map.longLine.activity.interaction= +observe.map.longLine.activity.setting.end= +observe.map.longLine.activity.setting.start= +observe.map.longLine.activity.station= +observe.map.longLine.seine.harbour= observe.map.miles= observe.map.north= +observe.map.seine.activity= +observe.map.seine.activity.inHarbour= +observe.map.seine.activity.schollType.free= +observe.map.seine.activity.schollType.object= +observe.map.seine.harbour.departure= +observe.map.seine.harbour.landing= observe.map.south= observe.map.waitLoading= observe.map.west= @@ -1598,6 +1740,36 @@ observe.speciesList.selectedSpecies= observe.speciesList.tab.general= observe.speciesList.tab.species= observe.storage.action.canMigrate= +observe.storage.connexionStatut.failed= +observe.storage.connexionStatut.failed.description= +observe.storage.connexionStatut.success= +observe.storage.connexionStatut.success.description= +observe.storage.connexionStatut.untested= +observe.storage.connexionStatut.untested.description= +observe.storage.creationMode.empty= +observe.storage.creationMode.empty.description= +observe.storage.creationMode.externalDump= +observe.storage.creationMode.externalDump.description= +observe.storage.creationMode.importLocalStorage= +observe.storage.creationMode.importLocalStorage.description= +observe.storage.creationMode.importRemoteStorage= +observe.storage.creationMode.importRemoteStorage.description= +observe.storage.creationMode.internalDump= +observe.storage.creationMode.internalDump.description= +observe.storage.dataPolicy.readData= +observe.storage.dataPolicy.readData.description= +observe.storage.dataPolicy.readReferentiel= +observe.storage.dataPolicy.readReferentiel.description= +observe.storage.dataPolicy.writeData= +observe.storage.dataPolicy.writeData.description= +observe.storage.dataPolicy.writeReferentiel= +observe.storage.dataPolicy.writeReferentiel.description= +observe.storage.dbMode.createLocal= +observe.storage.dbMode.createLocal.description= +observe.storage.dbMode.useLocal= +observe.storage.dbMode.useLocal.description= +observe.storage.dbMode.useRemote= +observe.storage.dbMode.useRemote.description= observe.storage.error.dbVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= @@ -1626,6 +1798,7 @@ observe.storage.label.synchro= observe.storage.label.synchro.incoming= observe.storage.label.synchro.referentiel= observe.storage.locale.db= +observe.storage.message.provider.detected= observe.storage.no.creationMode= observe.storage.no.creationMode.required= observe.storage.no.dbMode= @@ -1933,6 +2106,8 @@ observe.title.connect.localDB= observe.title.connect.remoteDB= observe.title.consolidate= observe.title.consolidate.tip= +observe.title.content.HookSizes= +observe.title.content.HookTypes= observe.title.content.baitHaulingStatuss= observe.title.content.baitSettingStatuss= observe.title.content.baitTypes= @@ -2139,6 +2314,12 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map= observe.tripSeine.title= +observe.validation.model.type.all= +observe.validation.model.type.all.description= +observe.validation.model.type.data= +observe.validation.model.type.data.description= +observe.validation.model.type.referentiel= +observe.validation.model.type.referentiel.description= observe.validation.report.contextName= observe.validation.report.entities.with.messages= observe.validation.report.entity= diff --git a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java index 8970fb9..694cf8b 100644 --- a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -24,12 +24,12 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.business.DecoratorService; import fr.ird.observe.business.ObserveApplicationContext; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; -import fr.ird.observe.services.dto.longline.BasketImplDto; -import fr.ird.observe.services.dto.longline.SectionImplDto; -import fr.ird.observe.business.validation.ObserveValidator; -import jaxx.runtime.validator.swing.SwingValidator; +import fr.ird.observe.business.ObserveServiceHelper; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.service.actions.validate.ObserveValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,9 +41,7 @@ import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import javax.swing.JComponent; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; @@ -66,18 +64,19 @@ public class LonglineDetailCompositionValidatorServiceTest { ObserveServiceHelper.close(); ObserveApplicationContext applicationContext = new ObserveApplicationContext(); ObserveServiceHelper.set(applicationContext); - DecoratorService decoratorService = new DecoratorService(ReferenceLocale.FR); + DecoratorService decoratorService = new DecoratorService(ReferentialLocale.FR); - ObserveValidator<Section> sectionValidator = new ObserveValidator<Section>(Section.class, "n1-update-table", NuitonValidatorScope.values()); - ObserveValidator<Basket> basketValidator = new ObserveValidator<Basket>(Basket.class, "n1-update-table", NuitonValidatorScope.values()); - ObserveValidator<Branchline> branchlineValidator = new ObserveValidator<Branchline>(Branchline.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<SectionDto> sectionValidator = new ObserveValidator<SectionDto>(SectionDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<BasketDto> basketValidator = new ObserveValidator<BasketDto>(BasketDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<BranchlineDto> branchlineValidator = new ObserveValidator<BranchlineDto>(BranchlineDto.class, "n1-update-table", NuitonValidatorScope.values()); - service = new LonglineDetailCompositionUIValidationHelper.LonglineDetailCompositionValidatorService( - sectionValidator, - basketValidator, - branchlineValidator, - Collections.<SwingValidator, JComponent>emptyMap(), - decoratorService); + //FIXME +// service = new LonglineDetailCompositionUIValidationHelper.LonglineDetailCompositionValidatorService( +// sectionValidator, +// basketValidator, +// branchlineValidator, +// Collections.<SwingValidator, JComponent>emptyMap(), +// decoratorService); I18n.init(new ClassPathI18nInitializer(), Locale.FRANCE); @@ -86,15 +85,15 @@ public class LonglineDetailCompositionValidatorServiceTest { @Test public void testValidateSections() { - List<Section> sections = new ArrayList<Section>(); + List<SectionDto> sections = new ArrayList<SectionDto>(); { - Section section = new SectionImpl(); - section.setTopiaId("0"); + SectionDto section = new SectionDto(); + section.setId("0"); sections.add(section); } { - Section section = new SectionImpl(); - section.setTopiaId("1"); + SectionDto section = new SectionDto(); + section.setId("1"); sections.add(section); } @@ -116,23 +115,23 @@ public class LonglineDetailCompositionValidatorServiceTest { { // 2 sections with baskets without settingIdentifier { - Basket basket = new BasketImpl(); - basket.setTopiaId("00"); + BasketDto basket = new BasketDto(); + basket.setId("00"); sections.get(0).addBasket(basket); } { - Basket basket = new BasketImpl(); - basket.setTopiaId("01"); + BasketDto basket = new BasketDto(); + basket.setId("01"); sections.get(0).addBasket(basket); } { - Basket basket = new BasketImpl(); - basket.setTopiaId("10"); + BasketDto basket = new BasketDto(); + basket.setId("10"); sections.get(1).addBasket(basket); } { - Basket basket = new BasketImpl(); - basket.setTopiaId("11"); + BasketDto basket = new BasketDto(); + basket.setId("11"); sections.get(1).addBasket(basket); } List<SwingValidatorMessage> messages = service.validateSections(sections); @@ -140,10 +139,11 @@ public class LonglineDetailCompositionValidatorServiceTest { } { // 2 sections with baskets with settingIdentifier - sections.get(0).getBasket().get(0).setSettingIdentifier(1); - sections.get(0).getBasket().get(1).setSettingIdentifier(2); - sections.get(1).getBasket().get(0).setSettingIdentifier(1); - sections.get(1).getBasket().get(1).setSettingIdentifier(2); + //FIXME +// sections.get(0).getBasket().get(0).setSettingIdentifier(1); +// sections.get(0).getBasket().get(1).setSettingIdentifier(2); +// sections.get(1).getBasket().get(0).setSettingIdentifier(1); +// sections.get(1).getBasket().get(1).setSettingIdentifier(2); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 0); @@ -152,17 +152,18 @@ public class LonglineDetailCompositionValidatorServiceTest { { // Section 1 - Basket 1 mistmatch floatline1Length with Section 1 - Basket 2 - sections.get(0).getBasket().get(0).setFloatline1Length(1f); - sections.get(0).getBasket().get(0).setFloatline2Length(2f); - - sections.get(0).getBasket().get(1).setFloatline1Length(1f); // should be 2 - sections.get(0).getBasket().get(1).setFloatline2Length(6f); - - sections.get(1).getBasket().get(0).setFloatline1Length(6f); - sections.get(1).getBasket().get(0).setFloatline2Length(11f); - - sections.get(1).getBasket().get(1).setFloatline1Length(11f); - sections.get(1).getBasket().get(1).setFloatline2Length(12f); + //FIXME +// sections.get(0).getBasket().get(0).setFloatline1Length(1f); +// sections.get(0).getBasket().get(0).setFloatline2Length(2f); +// +// sections.get(0).getBasket().get(1).setFloatline1Length(1f); // should be 2 +// sections.get(0).getBasket().get(1).setFloatline2Length(6f); +// +// sections.get(1).getBasket().get(0).setFloatline1Length(6f); +// sections.get(1).getBasket().get(0).setFloatline2Length(11f); +// +// sections.get(1).getBasket().get(1).setFloatline1Length(11f); +// sections.get(1).getBasket().get(1).setFloatline2Length(12f); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 1); @@ -171,17 +172,18 @@ public class LonglineDetailCompositionValidatorServiceTest { { // OK d'ont check if last floatline has same length of first floatline for next section - sections.get(0).getBasket().get(0).setFloatline1Length(1f); - sections.get(0).getBasket().get(0).setFloatline2Length(2f); - - sections.get(0).getBasket().get(1).setFloatline1Length(2f); - sections.get(0).getBasket().get(1).setFloatline2Length(6f); - - sections.get(1).getBasket().get(0).setFloatline1Length(10f); // Should be 6 - sections.get(1).getBasket().get(0).setFloatline2Length(11f); - - sections.get(1).getBasket().get(1).setFloatline1Length(11f); - sections.get(1).getBasket().get(1).setFloatline2Length(12f); + //FIXME +// sections.get(0).getBasket().get(0).setFloatline1Length(1f); +// sections.get(0).getBasket().get(0).setFloatline2Length(2f); +// +// sections.get(0).getBasket().get(1).setFloatline1Length(2f); +// sections.get(0).getBasket().get(1).setFloatline2Length(6f); +// +// sections.get(1).getBasket().get(0).setFloatline1Length(10f); // Should be 6 +// sections.get(1).getBasket().get(0).setFloatline2Length(11f); +// +// sections.get(1).getBasket().get(1).setFloatline1Length(11f); +// sections.get(1).getBasket().get(1).setFloatline2Length(12f); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 0); @@ -190,17 +192,18 @@ public class LonglineDetailCompositionValidatorServiceTest { { // Ok - sections.get(0).getBasket().get(0).setFloatline1Length(1f); - sections.get(0).getBasket().get(0).setFloatline2Length(2f); - - sections.get(0).getBasket().get(1).setFloatline1Length(2f); - sections.get(0).getBasket().get(1).setFloatline2Length(10f); - - sections.get(1).getBasket().get(0).setFloatline1Length(10f); - sections.get(1).getBasket().get(0).setFloatline2Length(11f); - - sections.get(1).getBasket().get(1).setFloatline1Length(11f); - sections.get(1).getBasket().get(1).setFloatline2Length(12f); + //FIXME +// sections.get(0).getBasket().get(0).setFloatline1Length(1f); +// sections.get(0).getBasket().get(0).setFloatline2Length(2f); +// +// sections.get(0).getBasket().get(1).setFloatline1Length(2f); +// sections.get(0).getBasket().get(1).setFloatline2Length(10f); +// +// sections.get(1).getBasket().get(0).setFloatline1Length(10f); +// sections.get(1).getBasket().get(0).setFloatline2Length(11f); +// +// sections.get(1).getBasket().get(1).setFloatline1Length(11f); +// sections.get(1).getBasket().get(1).setFloatline2Length(12f); List<SwingValidatorMessage> messages = service.validateSections(sections); assertMessages(messages, 0); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.