This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 5b9c6e61d57621541c66e8d6a3904862e69ea8e8 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><![CDATA[ @@ -43,7 +44,9 @@ public RtpEditorUI(TuttiUI<?,?> parentUI) { TuttiUIUtil.setParentUI(this, parentUI); } -public void setBean(EditProtocolSpeciesTableModel tableModel, int row) { handler.setBean(tableModel, row); } +public void setBean(EditProtocolSpeciesTableModel tableModel, RowSorter rowSorter, int row) { + handler.setBean(tableModel, rowSorter, row); +} public void openEditor() { handler.openEditor(); } 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 cf8700e..34f6d5e 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 @@ -12,7 +12,7 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; import javax.swing.JOptionPane; - +import javax.swing.RowSorter; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -139,8 +139,8 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, return ui.getValidator(); } - public void setBean(EditProtocolSpeciesTableModel tableModel, int row) { - getModel().setRowModel(tableModel, row); + public void setBean(EditProtocolSpeciesTableModel tableModel, RowSorter rowSorter, int row) { + getModel().setRowModel(tableModel, rowSorter, row); } public void openEditor() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java index 7f4fcb8..e23eec1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java @@ -8,6 +8,8 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.RowSorter; + /** * Created on 14/01/16. * @@ -41,6 +43,8 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci protected EditProtocolSpeciesTableModel tableModel; + protected RowSorter rowSorter; + protected int row = -1; public RtpEditorUIModel() { @@ -148,10 +152,10 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci firePropertyChange(PROPERTY_ROW, oldValue, row); } - public void setRowModel(EditProtocolSpeciesTableModel tableModel, int row) { + public void setRowModel(EditProtocolSpeciesTableModel tableModel, RowSorter rowSorter, int row) { this.tableModel = tableModel; - + this.rowSorter = rowSorter; setRowModel(row); } @@ -162,11 +166,10 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci } setRow(row); - setFirstRow(row == 0); setLastRow(row == tableModel.getRowCount() - 1); - EditProtocolSpeciesRowModel rowModel = tableModel.getEntry(row); + EditProtocolSpeciesRowModel rowModel = getRowModel(); Rtp rtpMale = rowModel.getRtpMale(); setRtpMaleA(rtpMale == null ? null : rtpMale.getA()); @@ -184,7 +187,8 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci } public EditProtocolSpeciesRowModel getRowModel() { - return tableModel.getEntry(row); + int rowIndex = rowSorter.convertRowIndexToModel(row); + return tableModel.getEntry(rowIndex); } public void reset() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.