branch feature/6115_ajout_RTP updated (96b1fb7 -> 8cc4b09)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git from 96b1fb7 ajout des actions pour naviguer dans le tableau (refs #6115) new 8cc4b09 conversion entre index de vue et de modele (refs #6115) The 1 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 8cc4b090d6a43cd7d9ce3b29b4a5ebf895b616d8 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 14:39:26 2016 +0100 conversion entre index de vue et de modele (refs #6115) Summary of changes: .../ui/swing/content/protocol/rtp/RtpButton.java | 5 +++-- .../swing/content/protocol/rtp/RtpCellEditor.java | 25 +++++++++++----------- .../content/protocol/rtp/RtpCellRenderer.java | 3 ++- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 5 ++++- .../content/protocol/rtp/RtpEditorUIHandler.java | 6 +++--- .../content/protocol/rtp/RtpEditorUIModel.java | 14 +++++++----- 6 files changed, 34 insertions(+), 24 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/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git commit 8cc4b090d6a43cd7d9ce3b29b4a5ebf895b616d8 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 14:39:26 2016 +0100 conversion entre index de vue et de modele (refs #6115) --- .../ui/swing/content/protocol/rtp/RtpButton.java | 5 +++-- .../swing/content/protocol/rtp/RtpCellEditor.java | 25 +++++++++++----------- .../content/protocol/rtp/RtpCellRenderer.java | 3 ++- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 5 ++++- .../content/protocol/rtp/RtpEditorUIHandler.java | 6 +++--- .../content/protocol/rtp/RtpEditorUIModel.java | 14 +++++++----- 6 files changed, 34 insertions(+), 24 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 dd60643..96bc1f0 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 @@ -5,6 +5,7 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import jaxx.runtime.SwingUtil; import javax.swing.JToggleButton; +import javax.swing.RowSorter; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.event.WindowAdapter; @@ -67,8 +68,8 @@ public class RtpButton extends JToggleButton { } - public void init(EditProtocolSpeciesTableModel tableModel, int row) { - popup.setBean(tableModel, row); + public void init(EditProtocolSpeciesTableModel tableModel, RowSorter rowSorter, int rowIndex) { + popup.setBean(tableModel, rowSorter, rowIndex); } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java index cf700b5..29bba6b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java @@ -26,13 +26,13 @@ public class RtpCellEditor extends AbstractCellEditor implements TableCellEditor return new RtpCellEditor(ui); } - protected JTable table; - - protected EditProtocolSpeciesTableModel tableModel; - - protected Integer rowIndex; - - protected Integer columnIndex; +// protected JTable table; +// +// protected EditProtocolSpeciesTableModel tableModel; +// +// protected Integer rowIndex; +// +// protected Integer columnIndex; protected final RtpButton editorButton; @@ -59,13 +59,14 @@ public class RtpCellEditor extends AbstractCellEditor implements TableCellEditor boolean isSelected, int row, int column) { - this.table = table; - this.tableModel = (EditProtocolSpeciesTableModel) table.getModel(); +// this.table = table; +// this.tableModel = (EditProtocolSpeciesTableModel) table.getRowSorter().getModel(); + EditProtocolSpeciesTableModel tableModel = (EditProtocolSpeciesTableModel) table.getModel(); - rowIndex = row; - columnIndex = column; +// int rowIndex = table.convertRowIndexToModel(row); +// columnIndex = table.convertColumnIndexToModel(column); - editorButton.init(tableModel, row); + editorButton.init(tableModel, table.getRowSorter(), row); return editorButton; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java index 960d9e3..323d51f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java @@ -63,7 +63,8 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { selectedFont = defaultFont.deriveFont(Font.BOLD); } - EditProtocolSpeciesRowModel rowModel = ((EditProtocolSpeciesTableModel) table.getModel()).getEntry(row); + int rowIndex = table.convertRowIndexToModel(row); + EditProtocolSpeciesRowModel rowModel = ((EditProtocolSpeciesTableModel) table.getModel()).getEntry(rowIndex); boolean useRtp = rowModel.isUseRtp(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx index 1112f41..6d2183e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx @@ -34,6 +34,7 @@ org.nuiton.jaxx.widgets.number.NumberEditor javax.swing.JComponent + javax.swing.RowSorter </import> <script><
codelutin.com scm