branch feature/7937 updated (e100100 -> 9c3e9d4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7937 in repository tutti. See http://git.codelutin.com/tutti.git from e100100 ajouter bouton pour recopier les valeurs a et b saisie dans Mâle vers femelles et Indéterminé. (refs#7937) new 7ee337f bug : pour fermer il faut parfois cliquer deux fois sur [Fermer] (refs #7937) new 9c3e9d4 n'activer RTP que si méthode de mensuration renseignée. Donc dans la navigation flèche avant flèche arrière penser à "sauter" les espèces sans méthode de mensuration (fixes #7937) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9c3e9d43cdce327361cf79b1ff6f0fa99cc34775 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 18:27:44 2016 +0100 n'activer RTP que si méthode de mensuration renseignée. Donc dans la navigation flèche avant flèche arrière penser à "sauter" les espèces sans méthode de mensuration (fixes #7937) commit 7ee337fa7e94aa399034a622bc68c7739917df89 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 15:19:39 2016 +0100 bug : pour fermer il faut parfois cliquer deux fois sur [Fermer] (refs #7937) Summary of changes: .../protocol/EditProtocolSpeciesTableModel.java | 42 ++++++++++++++++++++++ .../content/protocol/EditProtocolUIHandler.java | 3 -- .../ui/swing/content/protocol/rtp/RtpButton.java | 14 +++++--- .../swing/content/protocol/rtp/RtpCellEditor.java | 4 +-- .../content/protocol/rtp/RtpEditorUIHandler.java | 9 ++--- .../content/protocol/rtp/RtpEditorUIModel.java | 32 ++++++++++++++--- 6 files changed, 84 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7937 in repository tutti. See http://git.codelutin.com/tutti.git commit 7ee337fa7e94aa399034a622bc68c7739917df89 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 15:19:39 2016 +0100 bug : pour fermer il faut parfois cliquer deux fois sur [Fermer] (refs #7937) --- .../tutti/ui/swing/content/protocol/rtp/RtpButton.java | 14 ++++++++++---- .../ui/swing/content/protocol/rtp/RtpEditorUIHandler.java | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java index c9064b4..1fba689 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java @@ -27,11 +27,13 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.swing.JToggleButton; import javax.swing.RowSorter; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -44,6 +46,9 @@ import static org.nuiton.i18n.I18n.t; */ public class RtpButton extends JToggleButton { + /** Logger. */ + private static final Log log = LogFactory.getLog(RtpButton.class); + private static final long serialVersionUID = 1L; protected final RtpEditorUI popup; @@ -75,9 +80,10 @@ public class RtpButton extends JToggleButton { } }); - addChangeListener(new ChangeListener() { + addActionListener(new ActionListener() { + @Override - public void stateChanged(ChangeEvent e) { + public void actionPerformed(ActionEvent e) { if (isSelected()) { if (!popup.isVisible()) { SwingUtil.center(ui.getHandler().getContext().getMainUI(), popup); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java index fff1340..2dcfb9e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java @@ -33,7 +33,6 @@ import jaxx.runtime.swing.ComponentResizer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTitledPanel; import javax.swing.JComponent; import javax.swing.JOptionPane; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm