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 3d15ec0b19d16a306ad622aa840bb99e9cd61fcd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:22 2015 +0200 refs #6855 ecran autonome pour les equipements d'une marée seine --- .../ird/observe/ui/content/ContentUIManager.java | 18 +- .../ui/content/open/impl/seine/TripSeineUI.css | 15 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 311 ++++++++++----------- .../open/impl/seine/TripSeineUIHandler.java | 76 ----- .../content/open/impl/seine/TripSeineUIModel.java | 53 ---- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- 6 files changed, 157 insertions(+), 328 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 90e6183..ce3da0d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -57,6 +57,7 @@ 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.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; @@ -113,19 +114,20 @@ public class ContentUIManager { addMapping(DATA, Program.class, GearType.seine.name(), TripSeinesUI.class); addMapping(DATA, TripSeine.class, TripSeineUI.class); - addMapping(DATA, TripSeine.class, n("observe.common.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeine.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeine.class, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); addMapping(DATA, TripSeine.class, TripSeine.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, Route.class, RouteUI.class); - addMapping(DATA, Route.class, n("observe.common.route.unsaved"), RouteUI.class); + addMapping(DATA, Route.class, n("observe.tree.route.unsaved"), RouteUI.class); addMapping(DATA, Route.class, Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeine.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeine.class, n("observe.common.activitySeine.unsaved"), ActivitySeineUI.class); + addMapping(DATA, ActivitySeine.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); addMapping(DATA, ActivitySeine.class, ActivitySeine.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeine.class, SetSeineUI.class); - addMapping(DATA, SetSeine.class, n("observe.common.setSeine.unsaved"), SetSeineUI.class); + addMapping(DATA, SetSeine.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_CATCH, TargetCatchUI.class); addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); @@ -135,7 +137,7 @@ public class ContentUIManager { addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); addMapping(DATA, FloatingObject.class, FloatingObjectUI.class); - addMapping(DATA, FloatingObject.class, n("observe.common.floatingObject.unsaved"), FloatingObjectUI.class); + addMapping(DATA, FloatingObject.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); @@ -145,16 +147,16 @@ public class ContentUIManager { addMapping(DATA, Program.class, GearType.longline.name(), TripLonglinesUI.class); addMapping(DATA, TripLongline.class, TripLonglineUI.class); - addMapping(DATA, TripLongline.class, n("observe.common.tripLongline.unsaved"), TripLonglineUI.class); + addMapping(DATA, TripLongline.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); addMapping(DATA, TripLongline.class, TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLongline.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLongline.class, n("observe.common.activityLongline.unsaved"), ActivityLonglineUI.class); + addMapping(DATA, ActivityLongline.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); addMapping(DATA, ActivityLongline.class, ActivityLongline.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLongline.class, ActivityLongline.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLongline.class, SetLonglineUI.class); - addMapping(DATA, SetLongline.class, n("observe.common.setLongline.unsaved"), SetLonglineUI.class); + addMapping(DATA, SetLongline.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); addMapping(DATA, SetLongline.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); addMapping(DATA, SetLongline.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index 4be1629..b747f9a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -36,17 +36,6 @@ NumberEditor { valid:{validator.isValid()}; } -#generalTab { - title:{t("observe.tripSeine.tab.general")}; - icon:{getHandler().getErrorIconIfFalse(model.isGeneralTabValid())}; -} - -#caracteristicTab { - title:{t("observe.tripSeine.tab.caracteristics")}; - icon:{getHandler().getErrorIconIfFalse(model.isCaracteristicsTabValid())}; - enabled:{!model.isCreatingMode()}; -} - #observerLabel { text:"observe.common.observer"; labelFor:{observer}; @@ -80,7 +69,7 @@ NumberEditor { _listPredicate:{Persons.newDataEntryOperatorPredicate()}; } -#vesselLabel{ +#vesselLabel { text:"observe.common.vessel"; labelFor:{vessel}; } @@ -91,7 +80,7 @@ NumberEditor { _listPredicate:{Vessels.newVesselByVesselTypeIdPredicate(getConfig().getSeineVesselTypeIds())}; } -#oceanLabel{ +#oceanLabel { text:"observe.common.ocean"; labelFor:{ocean}; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx index 49b576d..b8d2d76 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -33,8 +33,6 @@ fr.ird.observe.entities.referentiel.Person fr.ird.observe.entities.referentiel.Ocean - fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI - org.jdesktop.swingx.JXDatePicker jaxx.runtime.swing.editor.NumberEditor @@ -79,177 +77,156 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <!-- formulaire --> <JPanel id="body" layout='{new BorderLayout()}'> <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> + + <!-- captain --> + <row> + <cell anchor='west'> + <JLabel id='captainLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- observer --> + <row> + <cell anchor='west'> + <JLabel id='observerLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- dataEntryOperator --> + <row> + <cell anchor='west'> + <JLabel id='dataEntryOperatorLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- vessel --> + <row> + <cell anchor='west'> + <JLabel id='vesselLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> + </cell> + </row> + + <!-- ocean (editable uniquement si pas de route saisie) --> <row> - <cell anchor="north" weightx="1"> - <JTabbedPane id='fishingOperationTabPane'> - - <tab id='generalTab'> - <JPanel layout="{new BorderLayout()}"> - <Table fill="both" weightx="1" constraints='BorderLayout.NORTH'> - <!-- captain --> - <row> - <cell anchor='west'> - <JLabel id='captainLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- observer --> - <row> - <cell anchor='west'> - <JLabel id='observerLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- dataEntryOperator --> - <row> - <cell anchor='west'> - <JLabel id='dataEntryOperatorLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- vessel --> - <row> - <cell anchor='west'> - <JLabel id='vesselLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> - </cell> - </row> - - <!-- ocean (editable uniquement si pas de route saisie) --> - <row> - <cell anchor='west'> - <JLabel id='oceanLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> - </cell> - </row> - - <!-- departureHarbour --> - <row> - <cell anchor='west'> - <JLabel id='departureHarbourLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> - </cell> - </row> - - <!-- landingHarbour --> - <row> - <cell anchor='west'> - <JLabel id='landingHarbourLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> - </cell> - </row> - - <!-- id ers --> - <row> - - <cell anchor='west'> - <JLabel id='ersIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='ersIdToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetErsId' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='ersId' constraints='BorderLayout.CENTER'/> - </JPanel> - </cell> - </row> - - <!-- startDate --> - <row> - <cell anchor='west'> - <JLabel id='startDateLabel'/> - </cell> - <cell anchor='west' weightx="0.5"> - <JXDatePicker id='startDate'/> - </cell> - </row> - - <!-- endDate --> - <row> - <cell anchor='west'> - <JLabel id='endDateLabel'/> - </cell> - <cell anchor='west' weightx="0.5"> - <JXDatePicker id='endDate'/> - </cell> - </row> - - <!-- formsUrl --> - <row> - <cell anchor="west"> - <JLabel id='formsUrlLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='formsUrlToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetFormsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='formsUrl' constraints='BorderLayout.CENTER'/> - <JToolBar id='formsUrlToolbar2' constraints='BorderLayout.EAST'> - <JButton id='openLinkFormulairesUrl' - onActionPerformed='getHandler().openLink(getModel().getBean().getFormsUrl())'/> - </JToolBar> - - </JPanel> - </cell> - </row> - - <!-- reportsUrl --> - <row> - <cell anchor="west"> - <JLabel id='reportsUrlLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='reportsUrlToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetReportsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='reportsUrl' constraints='BorderLayout.CENTER'/> - - <JToolBar id='reportsUrlToolbar2' constraints='BorderLayout.EAST'> - <JButton id='openLinkRapportsUrl' constraints='BorderLayout.EAST' - onActionPerformed='getHandler().openLink(getModel().getBean().getReportsUrl())'/> - </JToolBar> - </JPanel> - </cell> - </row> - - </Table> - </JPanel> - </tab> - - <tab id='caracteristicTab'> - <JPanel id='caracteristicPane' layout='{new BorderLayout()}'> - <GearUseFeaturesSeineUI id='gearUseFeaturesSeineUI' constructorParams='this' - constraints='BorderLayout.NORTH'/> - </JPanel> - </tab> - - </JTabbedPane> + <cell anchor='west'> + <JLabel id='oceanLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> + </cell> + </row> + + <!-- departureHarbour --> + <row> + <cell anchor='west'> + <JLabel id='departureHarbourLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> + </cell> + </row> + + <!-- landingHarbour --> + <row> + <cell anchor='west'> + <JLabel id='landingHarbourLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> + </cell> + </row> + + <!-- id ers --> + <row> + + <cell anchor='west'> + <JLabel id='ersIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='ersIdToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetErsId' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='ersId' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + + <!-- startDate --> + <row> + <cell anchor='west'> + <JLabel id='startDateLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JXDatePicker id='startDate'/> + </cell> + </row> + + <!-- endDate --> + <row> + <cell anchor='west'> + <JLabel id='endDateLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JXDatePicker id='endDate'/> + </cell> + </row> + + <!-- formsUrl --> + <row> + <cell anchor="west"> + <JLabel id='formsUrlLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='formsUrlToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetFormsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='formsUrl' constraints='BorderLayout.CENTER'/> + <JToolBar id='formsUrlToolbar2' constraints='BorderLayout.EAST'> + <JButton id='openLinkFormulairesUrl' + onActionPerformed='getHandler().openLink(getModel().getBean().getFormsUrl())'/> + </JToolBar> + + </JPanel> + </cell> + </row> + + <!-- reportsUrl --> + <row> + <cell anchor="west"> + <JLabel id='reportsUrlLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='reportsUrlToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetReportsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='reportsUrl' constraints='BorderLayout.CENTER'/> + + <JToolBar id='reportsUrlToolbar2' constraints='BorderLayout.EAST'> + <JButton id='openLinkRapportsUrl' constraints='BorderLayout.EAST' + onActionPerformed='getHandler().openLink(getModel().getBean().getReportsUrl())'/> + </JToolBar> + </JPanel> </cell> </row> <!-- comment --> <row> - <cell fill='both' weighty="1"> + <cell fill='both' weighty="1" columns="2"> <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> <JTextArea id='comment2' onKeyReleased='getModel().getBean().setComment(comment2.getText())'/> </JScrollPane> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index c1ec978..34bdd7d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -33,9 +33,6 @@ import fr.ird.observe.entities.seine.TripSeine; 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.content.table.impl.seine.GearUseFeaturesSeineUI; -import jaxx.runtime.validator.swing.SwingValidatorMessage; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -44,13 +41,8 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.DateUtil; -import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import java.util.Date; -import java.util.HashSet; -import java.util.Set; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -64,17 +56,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { /** Logger */ static private final Log log = LogFactory.getLog(TripSeineUIHandler.class); - // Compute valid state of tab from the error table - protected final TableModelListener computeTabValidStateListener = new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - - SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); - computeTabValidState(source); - - } - }; - public TripSeineUIHandler(TripSeineUI ui) { super(ui, DataContextType.Program, @@ -110,23 +91,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } @Override - public void initUI() throws Exception { - - super.initUI(); - - // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); - // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - - GearUseFeaturesSeineUI gearUseFeaturesSeineUI = getUi().getGearUseFeaturesSeineUI(); - gearUseFeaturesSeineUI.init(); - getUi().getCaracteristicPane().remove(gearUseFeaturesSeineUI); - getUi().getCaracteristicPane().add(gearUseFeaturesSeineUI.getBody()); - - } - - @Override public void openUI() throws Exception { super.openUI(); @@ -151,8 +115,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { // create mode - getUi().getFishingOperationTabPane().setSelectedIndex(0); - if (log.isInfoEnabled()) { log.info(prefix + "create a new trip"); } @@ -171,14 +133,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { Routes.sort(bean.getRoute()); } - GearUseFeaturesSeineUI gearUseFeaturesSeineUI = getUi().getGearUseFeaturesSeineUI(); - gearUseFeaturesSeineUI.open(); - } - SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); - computeTabValidState(errorTableModel); - finalizeOpenUI(mode, create); } @@ -220,7 +176,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { addInfoMessage(t("observe.message.historical.data")); } - getUi().getGearUseFeaturesSeineUI().startEdit(null); } // date is current day @@ -300,8 +255,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { getLoadBinder().copyExcluding(getBean(), beanToSave, TripSeine.PROPERTY_ROUTE, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); - getUi().getGearUseFeaturesSeineUI().getHandler().onUpdate(tx, parentBean, beanToSave); - return beanToSave; } @@ -340,33 +293,4 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } - @Override - protected void afterSave(boolean refresh) { - super.afterSave(refresh); - - getUi().getGearUseFeaturesSeineUI().getHandler().afterSave(refresh); - - } - - protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - - Set<String> errorProperties = new HashSet<String>(); - int rowCount = errorTableModel.getRowCount(); - for (int i = 0; i < rowCount; i++) { - - SwingValidatorMessage row = errorTableModel.getRow(i); - if (NuitonValidatorScope.ERROR.equals(row.getScope())) { - errorProperties.add(row.getField()); - } - } - - boolean generalTabValid = !errorProperties.removeAll(TripSeineUIModel.GENERAL_TAB_PROPERTIES); - boolean caracteristicsTabValid = !errorProperties.removeAll(TripSeineUIModel.CARACTERISTICS_TAB_PROPERTIES); - - TripSeineUIModel model = (TripSeineUIModel) getModel(); - model.setGeneralTabValid(generalTabValid); - model.setCaracteristicsTabValid(caracteristicsTabValid); - - } - } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index de1b92e..ddaab6b 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -22,15 +22,12 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; -import java.util.Set; - /** * Created on 9/26/14. * @@ -39,59 +36,12 @@ import java.util.Set; */ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { - public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; - - public static final String PROPERTY_CARACTERISTICS_TAB_VALID = "caracteristicsTabValid"; - - public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TripSeine.PROPERTY_CAPTAIN, - TripSeine.PROPERTY_OBSERVER, - TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, - - TripSeine.PROPERTY_VESSEL, - TripSeine.PROPERTY_OCEAN, - TripSeine.PROPERTY_DEPARTURE_HARBOUR, - TripSeine.PROPERTY_LANDING_HARBOUR, - - TripSeine.PROPERTY_ERS_ID, - TripSeine.PROPERTY_START_DATE, - TripSeine.PROPERTY_END_DATE, - TripSeine.PROPERTY_FORMS_URL, - TripSeine.PROPERTY_REPORTS_URL).build(); - - public static final Set<String> CARACTERISTICS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE).build(); - private static final long serialVersionUID = 1L; - protected boolean generalTabValid; - - protected boolean caracteristicsTabValid; - public TripSeineUIModel() { super(TripSeine.class); } - public boolean isCaracteristicsTabValid() { - return caracteristicsTabValid; - } - - public void setCaracteristicsTabValid(boolean caracteristicsTabValid) { - Object oldValue = isCaracteristicsTabValid(); - this.caracteristicsTabValid = caracteristicsTabValid; - firePropertyChange(PROPERTY_CARACTERISTICS_TAB_VALID, oldValue, caracteristicsTabValid); - } - - public boolean isGeneralTabValid() { - return generalTabValid; - } - - public void setGeneralTabValid(boolean generalTabValid) { - Object oldValue = isGeneralTabValid(); - this.generalTabValid = generalTabValid; - firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); - } - @Override protected BinderModelBuilder<TripSeine, TripSeine> createOpeningBinder(BinderService binderService, String binderName) { @@ -111,14 +61,11 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_LANDING_HARBOUR, TripSeine.PROPERTY_PROGRAM, TripSeine.PROPERTY_ROUTE, - TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, TripSeine.PROPERTY_ERS_ID, TripSeine.PROPERTY_OPEN); // on ajoute la recopie de l'association route builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); - // on ajoute la recopie de l'association gearUseFeatues - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); return builder; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 76b17db..10eeda0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -42,7 +42,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); public GearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUI ui) { - super(ui, DataContextType.SetSeine); + super(ui, DataContextType.TripSeine); } @Override @@ -80,11 +80,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - protected void addUpdateInfoMessage() { - // No message to display - } - - @Override protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { return dataContext.getSelectedTripId(); } @@ -121,11 +116,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - public void afterSave(boolean refresh) { - super.afterSave(refresh); - } - - @Override public TripSeine onUpdate(TopiaContext tx, Object parentBean, TripSeine beanToSave) throws TopiaException { List<GearUseFeaturesSeine> childs = getUi().getTableModel().getData(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.