This is an automated email from the git hooks/post-receive script. New commit to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git commit 883d7c62cf9ccfba39aaf7344709e543d24d2e19 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 3 18:05:33 2016 +0100 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) --- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 6 +++ .../CalcifiedPiecesSamplingEditorRowModel.java | 54 +++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorTableModel.java | 38 +++++++++++++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 56 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorUI.jcss | 4 ++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 37 ++++++++++++++ .../actions/AddSpeciesAction.java | 20 ++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 7 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 7 +++ 9 files changed, 229 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index 5dd2e0d..4acf68c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -28,6 +28,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpEditorUI + fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -238,6 +239,11 @@ </JPanel> </tab> + <tab title='tutti.editProtocol.tab.cps'> + <CalcifiedPiecesSamplingEditorUI id="cpsEditor" + constructorParams='this'/> + </tab> + </JTabbedPane> <JPanel id='saveWarningContainer' layout='{new BorderLayout(10, 10)}' constraints='BorderLayout.NORTH'> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java new file mode 100644 index 0000000..3edea71 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java @@ -0,0 +1,54 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling; + +import fr.ifremer.tutti.persistence.entities.referential.Species; +import org.jdesktop.beans.AbstractSerializableBean; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class CalcifiedPiecesSamplingEditorRowModel extends AbstractSerializableBean { + + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_MIN_SIZE = "minSize"; + + public static final String PROPERTY_MAX_SIZE = "maxSize"; + + protected Species species; + + protected int minSize; + + protected int maxSize; + + public int getMaxSize() { + return maxSize; + } + + public void setMaxSize(int maxSize) { + Object oldValue = getMaxSize(); + this.maxSize = maxSize; + firePropertyChange(PROPERTY_MAX_SIZE, oldValue, maxSize); + } + + public int getMinSize() { + return minSize; + } + + public void setMinSize(int minSize) { + Object oldValue = getMinSize(); + this.minSize = minSize; + firePropertyChange(PROPERTY_MIN_SIZE, oldValue, minSize); + } + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + Object oldValue = getSpecies(); + this.species = species; + firePropertyChange(PROPERTY_SPECIES, oldValue, species); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java new file mode 100644 index 0000000..a9fb747 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java @@ -0,0 +1,38 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling; + +import org.jdesktop.swingx.table.TableColumnModelExt; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; + +import static org.nuiton.i18n.I18n.n; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class CalcifiedPiecesSamplingEditorTableModel extends AbstractApplicationTableModel<CalcifiedPiecesSamplingEditorRowModel> { + + public static final ColumnIdentifier<CalcifiedPiecesSamplingEditorRowModel> SPECIES = ColumnIdentifier.newId( + CalcifiedPiecesSamplingEditorRowModel.PROPERTY_SPECIES, + n("tutti.editCps.table.header.species.field"), + n("tutti.editCps.table.header.species.field.tip")); + + public static final ColumnIdentifier<CalcifiedPiecesSamplingEditorRowModel> MIN_SIZE = ColumnIdentifier.newId( + CalcifiedPiecesSamplingEditorRowModel.PROPERTY_MIN_SIZE, + n("tutti.editCps.table.header.minSize.field"), + n("tutti.editCps.table.header.minSize.field.tip")); + + public static final ColumnIdentifier<CalcifiedPiecesSamplingEditorRowModel> MAX_SIZE = ColumnIdentifier.newId( + CalcifiedPiecesSamplingEditorRowModel.PROPERTY_MAX_SIZE, + n("tutti.editCps.table.header.maxSize.field"), + n("tutti.editCps.table.header.maxSize.field.tip")); + + public CalcifiedPiecesSamplingEditorTableModel(TableColumnModelExt columnModel) { + super(columnModel, false, false); + } + + @Override + public CalcifiedPiecesSamplingEditorRowModel createNewRow() { + return new CalcifiedPiecesSamplingEditorRowModel(); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx new file mode 100644 index 0000000..7e9bba5 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx @@ -0,0 +1,56 @@ +<JPanel id='cpsPanel' layout="{new BorderLayout()}" + implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<EditProtocolUIModel, CalcifiedPiecesSamplingEditorUIHandler>'> + + <import> + fr.ifremer.tutti.persistence.entities.referential.Species + + fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel + fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + + org.jdesktop.swingx.JXTable + + + </import> + + <script><![CDATA[ + + public CalcifiedPiecesSamplingEditorUI(TuttiUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); + } + ]]> + </script> + + <EditProtocolUIModel id='model' + initializer='getContextValue(EditProtocolUIModel.class)'/> + + <JPopupMenu id='cpsTablePopup'> + <JMenuItem id='splitCpsRowMenu'/> + </JPopupMenu> + + <Table fill='both' constraints='BorderLayout.CENTER'> + + <row fill='both'> + <cell fill='both' weightx='1'> + <BeanFilterableComboBox id='speciesComboBox' + constructorParams='this' + genericType='Species'/> + </cell> + <cell fill='both'> + <JButton id='addSpeciesButton'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both' columns='3'> + <JScrollPane> + <JXTable id='cpsTable' + onMouseClicked='handler.autoSelectRowInTable(event, cpsTablePopup)' + onKeyPressed='handler.openRowMenu(event, cpsTablePopup)'/> + </JScrollPane> + </cell> + </row> + </Table> + +</JPanel> \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss new file mode 100644 index 0000000..cafa9da --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss @@ -0,0 +1,4 @@ +#addSpeciesButton { + actionIcon: add; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.actions.AddSpeciesAction.class}; +} \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java new file mode 100644 index 0000000..d413d3b --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java @@ -0,0 +1,37 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling; + +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import jaxx.runtime.validator.swing.SwingValidator; + +import javax.swing.JComponent; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class CalcifiedPiecesSamplingEditorUIHandler extends AbstractTuttiUIHandler<EditProtocolUIModel, CalcifiedPiecesSamplingEditorUI> { + + + @Override + public void afterInit(CalcifiedPiecesSamplingEditorUI calcifiedPiecesSamplingEditorUI) { + initUI(calcifiedPiecesSamplingEditorUI); + + + } + + @Override + protected JComponent getComponentToFocus() { + return null; + } + + @Override + public void onCloseUI() { + + } + + @Override + public SwingValidator<EditProtocolUIModel> getValidator() { + return null; + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java new file mode 100644 index 0000000..a0c660b --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.actions; + +import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class AddSpeciesAction extends SimpleActionSupport<CalcifiedPiecesSamplingEditorUI> { + + public AddSpeciesAction(CalcifiedPiecesSamplingEditorUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(CalcifiedPiecesSamplingEditorUI ui) { + + } +} diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index e998df3..7e288ee 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -717,6 +717,12 @@ tutti.editCatchBatch.legend.marineLitter= tutti.editCatchBatch.legend.species= tutti.editCatchBatch.legend.total= tutti.editCatchBatch.svgLoading.error= +tutti.editCps.table.header.maxSize.field= +tutti.editCps.table.header.maxSize.field.tip= +tutti.editCps.table.header.minSize.field= +tutti.editCps.table.header.minSize.field.tip= +tutti.editCps.table.header.species.field= +tutti.editCps.table.header.species.field.tip= tutti.editCruise.action.closeEditCruise= tutti.editCruise.action.closeEditCruise.mnemonic= tutti.editCruise.action.closeEditCruise.tip= @@ -1092,6 +1098,7 @@ tutti.editProtocol.tab.caracteristic.individualObservation= tutti.editProtocol.tab.caracteristic.lengthClasses= tutti.editProtocol.tab.caracteristic.mapping= tutti.editProtocol.tab.caracteristic.vesselUseFeature= +tutti.editProtocol.tab.cps= tutti.editProtocol.tab.info= tutti.editProtocol.tab.species= tutti.editProtocol.table.header.calcifySample= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 6b35ea6..7754560 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -684,6 +684,12 @@ tutti.editCatchBatch.legend.marineLitter=Macro déchets tutti.editCatchBatch.legend.species=Espèces tutti.editCatchBatch.legend.total=Capture tutti.editCatchBatch.svgLoading.error=Erreur lors du chargement du diagramme du résumé +tutti.editCps.table.header.maxSize.field= +tutti.editCps.table.header.maxSize.field.tip= +tutti.editCps.table.header.minSize.field= +tutti.editCps.table.header.minSize.field.tip= +tutti.editCps.table.header.species.field= +tutti.editCps.table.header.species.field.tip= tutti.editCruise.action.closeEditCruise=Fermer tutti.editCruise.action.closeEditCruise.mnemonic=F tutti.editCruise.action.closeEditCruise.tip=Fermer l'écran d'édition de campagne @@ -1048,6 +1054,7 @@ tutti.editProtocol.tab.caracteristic=Caractéristiques tutti.editProtocol.tab.caracteristic.individualObservation=Observations individuelles tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille tutti.editProtocol.tab.caracteristic.mapping=Caractéristiques du trait +tutti.editProtocol.tab.cps= tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.table.header.calcifySample=Prélèvement de pièces calcifiées -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.