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 e63dfae0f7256397a9b7d4c86c0471c602406f22 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 11 11:09:25 2016 +0100 - symbole infini au lieu de null - validation de la taille minquand on clique sur entrée refs #7930 --- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- .../CalcifiedPiecesSamplingEditorUIHandler.java | 13 +++++++------ .../calcifiedpiecessampling/MinSizePopupUI.jcss | 2 ++ .../MinSizePopupUIHandler.java | 20 ++++++++++++++++++-- .../actions/ValidateMinSizeAction.java | 20 ++++++++++++++++++++ 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 812cfd6..f8d3802 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -5,7 +5,7 @@ tutti.caracteristicType.VESSEL_USE_FEATURE=Autres caractéristiques tutti.caracteristicType.lengthStep= tutti.csv.import.error.on.field=Colonne %s \: %s tutti.csv.import.error.on.row=Des erreurs ont été détectées à la ligne %s \:\n %s -tutti.decorator.null.infinite= +tutti.decorator.null.infinite=∞ tutti.error.messages=Erreurs \:\n %s tutti.fatal.messages=Erreurs critiques \:\n %s tutti.io.mkDir.error=Erreur à la création du dossier %s 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 index 4e35b5d..040d037 100644 --- 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 @@ -20,11 +20,9 @@ import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.event.TableModelEvent; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import java.awt.Component; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -67,14 +65,17 @@ public class CalcifiedPiecesSamplingEditorUIHandler extends AbstractTuttiUIHandl // renderer to display infinite instead of null TableCellRenderer renderer = new TableCellRenderer() { - private final TableCellRenderer tableCellRenderer = new DefaultTableCellRenderer(); + private final TableCellRenderer tableCellRenderer = cpsTable.getDefaultRenderer(Integer.class); @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Component result = tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - JLabel jLabel = (JLabel) result; - jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); - jLabel.setText(decorate((Serializable) value, DecoratorService.NULL_INFINITE)); + if(result instanceof JLabel) { + JLabel jLabel = (JLabel)result; + String decoratedValue = getDecorator(Integer.class, DecoratorService.NULL_INFINITE).toString(value); + jLabel.setText(decoratedValue); + jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); + } return result; } }; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUI.jcss index bb084a6..9812a87 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUI.jcss @@ -47,6 +47,7 @@ text: "tutti.common.cancel"; toolTipText: "tutti.common.cancel"; i18nMnemonic: "tutti.common.cancel.mnemonic"; + _skipAction: true; } #validateButton { @@ -55,5 +56,6 @@ toolTipText: "tutti.common.validate"; i18nMnemonic: "tutti.common.validate.mnemonic"; enabled: {validator.isValid()}; + _skipAction: true; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java index ce3ed12..5e2cce6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java @@ -30,6 +30,9 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; + import static org.nuiton.i18n.I18n.t; /** @@ -43,8 +46,21 @@ public class MinSizePopupUIHandler extends AbstractTuttiUIHandler<MinSizePopupUI @Override public void afterInit(MinSizePopupUI ui) { - initNumberEditor(ui.getMinSizeField()); - initComponentToFocus(ui); + initUI(ui); + + ui.getMinSizeField().getTextField().addKeyListener(new KeyAdapter() { + + @Override + public void keyReleased(KeyEvent e) { + super.keyReleased(e); + if (log.isInfoEnabled()) { + log.info("action key ? " + e.isActionKey() + " " + e.getKeyCode()); + } + if (e.getKeyCode() == KeyEvent.VK_ENTER) { + validate(); + } + } + }); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ValidateMinSizeAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ValidateMinSizeAction.java new file mode 100644 index 0000000..61da88b --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ValidateMinSizeAction.java @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.actions; + +import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.MinSizePopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class ValidateMinSizeAction extends SimpleActionSupport<MinSizePopupUI> { + + public ValidateMinSizeAction(MinSizePopupUI minSizePopupUI) { + super(minSizePopupUI); + } + + @Override + protected void onActionPerformed(MinSizePopupUI minSizePopupUI) { + minSizePopupUI.getHandler().validate(); + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.