|
From: <ger...@us...> - 2012-10-24 19:52:06
|
Revision: 6698
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6698&view=rev
Author: gerdwagner
Date: 2012-10-24 19:51:59 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
- Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
- 2798081 Right click on column header changes sort order
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 19:51:59 UTC (rev 6698)
@@ -38,6 +38,10 @@
Bug fixes:
+Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
+
+2798081 Right click on column header changes sort order
+
On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
3575054: SQL results text mode is not working
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 19:51:59 UTC (rev 6698)
@@ -74,13 +74,13 @@
* if <tt>_pressed</tt> is <tt>true</tt> then this is the physical column
* that the mouse was pressed in.
*/
- private int _pressedColumnIdx;
+ private int _pressedViewColumnIdx;
/** Icon for the currently sorted column. */
private Icon _currentSortedColumnIcon;
/** Physical (as opposed to model) index of the currently sorted column. */
- private int _currentlySortedColumnIdx = -1;
+ private int _currentlySortedModelIdx = -1;
static
{
@@ -106,7 +106,7 @@
super();
_pressed = false;
_dragged = false;
- _pressedColumnIdx = -1;
+ _pressedViewColumnIdx = -1;
setDefaultRenderer(new ButtonTableRenderer(getFont()));
@@ -138,8 +138,8 @@
{
_currentSortedColumnIcon = s_descIcon;
}
- _currentlySortedColumnIdx = viewColumnIndex;
- _pressedColumnIdx = viewColumnIndex;
+ _currentlySortedModelIdx = modelColumnIx;
+ _pressedViewColumnIdx = viewColumnIndex;
repaint();
}
@@ -185,7 +185,7 @@
}
}
_currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ _currentlySortedModelIdx = -1;
}
// SS: Display complete column header as tooltip if the column isn't wide enough to display it
@@ -220,9 +220,9 @@
/**
* @return The currently sorted column index. If no column is sorted -1.
*/
- public int getCurrentlySortedColumnIdx()
+ public int getCurrentlySortedModelIdx()
{
- return _currentlySortedColumnIdx;
+ return _currentlySortedModelIdx;
}
/**
@@ -236,22 +236,22 @@
public void columnIndexWillBeRemoved(int colIx)
{
- if( colIx < _currentlySortedColumnIdx)
- {
- --_currentlySortedColumnIdx;
- }
- else if (colIx == _currentlySortedColumnIdx)
- {
- _currentlySortedColumnIdx = -1;
- }
+// if( colIx < _currentlySortedModelIdx)
+// {
+// --_currentlySortedModelIdx;
+// }
+// else if (colIx == _currentlySortedModelIdx)
+// {
+// _currentlySortedModelIdx = -1;
+// }
}
public void columnIndexWillBeAdded(int colIx)
{
- if( colIx <= _currentlySortedColumnIdx)
- {
- ++_currentlySortedColumnIdx;
- }
+// if( colIx <= _currentlySortedModelIdx)
+// {
+// ++_currentlySortedModelIdx;
+// }
}
public void adjustAllColWidths(boolean includeColHeaders)
@@ -291,7 +291,7 @@
public void tableChanged(TableModelEvent evt)
{
_currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ _currentlySortedModelIdx = -1;
}
}
@@ -373,7 +373,7 @@
*/
public void mousePressed(MouseEvent e)
{
- if(getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ if(getCursor().getType() == Cursor.E_RESIZE_CURSOR || MouseEvent.BUTTON1 != e.getButton())
{
return;
}
@@ -384,7 +384,7 @@
return;
}
- _pressedColumnIdx = columnAtPoint(e.getPoint());
+ _pressedViewColumnIdx = columnAtPoint(e.getPoint());
repaint();
}
@@ -413,7 +413,7 @@
*/
public void mouseReleased(MouseEvent e)
{
- if(getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ if(getCursor().getType() == Cursor.E_RESIZE_CURSOR || MouseEvent.BUTTON1 != e.getButton())
{
return;
}
@@ -430,7 +430,7 @@
if (!_dragged)
{
_currentSortedColumnIcon = null;
- int column = getTable().convertColumnIndexToModel(_pressedColumnIdx);
+ int column = getTable().convertColumnIndexToModel(_pressedViewColumnIdx);
TableModel tm = table.getModel();
if (column > -1
@@ -446,7 +446,7 @@
{
_currentSortedColumnIcon = s_descIcon;
}
- _currentlySortedColumnIdx = _pressedColumnIdx;
+ _currentlySortedModelIdx = column;
}
repaint();
}
@@ -461,8 +461,9 @@
_dragged = true;
if (_pressed)
{
- _currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ //_currentSortedColumnIcon = null;
+// _currentlySortedModelIdx = -1;
+// _pressedViewColumnIdx = -1;
_pressed = false;
repaint();
}
@@ -518,13 +519,13 @@
}
// Rendering the column that the mouse has been pressed in.
- if (_pressedColumnIdx == column && _pressed)
+ if (_pressedViewColumnIdx == column && _pressed)
{
_buttonLowered.setText(value.toString());
// If this is the column that the table is currently is
// currently sorted by then display the sort icon.
- if (column == _currentlySortedColumnIdx
+ if (column == getViewColumnIndex(_currentlySortedModelIdx)
&& _currentSortedColumnIcon != null)
{
_buttonLowered.setIcon(_currentSortedColumnIcon);
@@ -539,7 +540,7 @@
// This is not the column that the mouse has been pressed in.
_buttonRaised.setText(value.toString());
if (_currentSortedColumnIcon != null
- && column == _currentlySortedColumnIdx)
+ && column == getViewColumnIndex(_currentlySortedModelIdx))
{
_buttonRaised.setIcon(_currentSortedColumnIcon);
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 19:51:59 UTC (rev 6698)
@@ -36,10 +36,8 @@
public class SortableTableModel extends AbstractTableModel
{
- private static final long serialVersionUID = -3534263285990454876L;
+ transient private MyTableModelListener _actualModelLis = new MyTableModelListener();
- transient private MyTableModelListener _actualModelLis = new MyTableModelListener();
-
/** Column currently being sorted by. -1 means unsorted. */
private int _sortedColumn = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
