This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e3bd0f87385c4418f3581feec0ff1fc4de77ed38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 13:01:41 2016 +0100 [iso] factorisation de code --- .../table/impl/seine/AbstractSampleUIHandler.java | 53 ++++++++++++++++++++++ .../table/impl/seine/NonTargetSampleUIHandler.java | 41 +++-------------- .../table/impl/seine/TargetSampleUIHandler.java | 39 +++------------- 3 files changed, 66 insertions(+), 67 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java new file mode 100644 index 0000000..5c74528 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java @@ -0,0 +1,53 @@ +package fr.ird.observe.application.swing.ui.content.table.impl.seine; + +import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; + +import java.beans.PropertyChangeListener; + +/** + * Created on 31/10/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto> extends ContentTableUIHandler<E, D> { + + /** + * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, + * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à + * {@code false}. + * + * @since 3.0 + */ + protected final PropertyChangeListener weightChanged; + + /** + * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()}, + * et repasser alors le flag {@link TargetLengthDto#isIsLengthComputed()} à + * {@code false}. + * + * @since 3.0 + */ + protected final PropertyChangeListener lengthChanged; + + protected AbstractSampleUIHandler(ObserveContentTableUI<E, D> ui) { + super(ui, DataContextType.SetSeine); + weightChanged = evt -> { + TargetLengthDto source = (TargetLengthDto) evt.getSource(); + source.setIsWeightComputed(false); + }; + lengthChanged = evt -> { + TargetLengthDto source = (TargetLengthDto) evt.getSource(); + source.setIsLengthComputed(false); + }; + } + + public abstract void resetIsWeightComputed(); + + public abstract void resetIsLengthComputed(); + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 3e58c87..5aa7646 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -24,7 +24,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -36,10 +38,6 @@ import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.NonTargetSampleService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -47,7 +45,6 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -60,39 +57,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSampleDto, NonTargetLengthDto> { +public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetSampleDto, NonTargetLengthDto> { /** Logger */ private static final Log log = LogFactory.getLog(NonTargetSampleUIHandler.class); - /** - * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getWeight()}, - * et repasser alors le flag {@link NonTargetLengthDto#isIsWeightComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener weightChanged; - - /** - * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getLength()}, - * et repasser alors le flag {@link NonTargetLengthDto#isIsLengthComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener lengthChanged; - public NonTargetSampleUIHandler(NonTargetSampleUI ui) { - super(ui, DataContextType.SetSeine); - weightChanged = evt -> { - NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setIsWeightComputed(false); - }; - lengthChanged = evt -> { - NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setIsLengthComputed(false); - }; + super(ui); } @Override @@ -100,11 +71,13 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam return (NonTargetSampleUI) super.getUi(); } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } + @Override public void resetIsLengthComputed() { getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 4f4fcdb..6dfdb3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -23,12 +23,10 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -46,7 +44,6 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -58,7 +55,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto, TargetLengthDto> { +public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleDto, TargetLengthDto> { /** Logger */ private static final Log log = LogFactory.getLog(TargetSampleUIHandler.class); @@ -71,36 +68,10 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto */ protected final boolean discarded; - /** - * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, - * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener weightChanged; - - /** - * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()}, - * et repasser alors le flag {@link TargetLengthDto#isIsLengthComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener lengthChanged; - public TargetSampleUIHandler(ContentTableUI<TargetSampleDto, TargetLengthDto> ui, boolean discarded) { - super(ui, DataContextType.SetSeine); + super(ui); this.discarded = discarded; - weightChanged = evt -> { - TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setIsWeightComputed(false); - }; - lengthChanged = evt -> { - TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setIsLengthComputed(false); - }; } @Override @@ -108,11 +79,13 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto return (TargetSampleUI) super.getUi(); } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } + @Override public void resetIsLengthComputed() { getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); @@ -233,8 +206,8 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto NuitonValidatorScope.INFO, getTypeI18nKey(SetSeineDto.class), discarded ? - t("observe.content.setSeine.message.no.targetCatch") : - t("observe.content.setSeine.message.no.targetDiscarded") + t("observe.content.setSeine.message.no.targetCatch") : + t("observe.content.setSeine.message.no.targetDiscarded") ); } return mode; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.