Bug fix: SQL result table: Section count, position and sum were updated at the end of a selection only,

gerdwagner · gerdwagner · commit f7e66883a210 · 2024-10-17T19:44:28.000+02:00
not as the used to be during the selection, too.
diff --git a/sql12/core/doc/changes.txt b/sql12/core/doc/changes.txt
@@ -46,6 +46,9 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+SQL result table: Section count, position and sum were updated at the end of a selection only,
+  not as the used to be during the selection, too.
+
 https://github.com/squirrel-sql-client/squirrel-sql-code/issues/42
   Refactoring "Add column" raised "IllegalArgumentException: SQLDatabaseMetaData == null."
   See table in Object tree --> right mouse click --> Refactoring --> Column --> Add Column
diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/rowcolandsum/I18NStrings.properties b/sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/rowcolandsum/I18NStrings.properties
@@ -8,7 +8,7 @@ RowColAndSumDisplay.sum.and.functions=Sum
 RowColAndSumDisplay.both=Both
 
 SumFunctionController.no.sumable.row=No sum available
-SumFunctionController.more.html=<html><a href=#1>more...</a></html>
+SumFunctionController.more.html=<html><a href=#1>more ...</a></html>
 
 SumFunctionController.copy=Copy
 
diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/rowcolandsum/RowColAndSumController.java b/sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/rowcolandsum/RowColAndSumController.java
@@ -122,7 +122,7 @@ public JPanel getPanel()
    public void setDataSetViewer(IDataSetViewer dataSetViewer)
    {
       _dataSetViewer = dataSetViewer;
-      _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selColumn) -> onRowColSelectedCountOrPosChanged(selRowCount, selColCount, selRow, selColumn));
+      _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selColumn, isAdjusting) -> onRowColSelectedCountOrPosChanged(selRowCount, selColCount, selRow, selColumn));
 
       callSelectionChanged();
    }
diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
@@ -96,14 +96,14 @@ public void init(IDataSetUpdateableModel dataSetUpdateableModel, int listSelecti
 
    private void onSelectionChanged(ListSelectionEvent e)
    {
-		if(e.getValueIsAdjusting())
-		{
-			return;
-		}
+		//if(e.getValueIsAdjusting())
+		//{
+		//	return;
+		//}
 
 		for(RowColSelectedCountListener l : _rowColSelectedCountListeners.toArray(new RowColSelectedCountListener[0]))
 		{
-			l.rowColSelectedCountOrPosChanged(_table.getSelectedRowCount(), _table.getSelectedColumnCount(), _table.getSelectedRow(), _table.getSelectedColumn());
+			l.rowColSelectedCountOrPosChanged(_table.getSelectedRowCount(), _table.getSelectedColumnCount(), _table.getSelectedRow(), _table.getSelectedColumn(), e.getValueIsAdjusting());
 		}
    }
 
diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/RowColSelectedCountListener.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/RowColSelectedCountListener.java
@@ -2,5 +2,5 @@
 
 public interface RowColSelectedCountListener
 {
-   void rowColSelectedCountOrPosChanged(int selectedRowCount, int selectedColumnCount, int selectedRow, int selectedColumn);
+   void rowColSelectedCountOrPosChanged(int selectedRowCount, int selectedColumnCount, int selectedRow, int selectedColumn, boolean isAdjusting);
 }
diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/columndisplaychoice/ResultDataSetAndCellDetailDisplayHandler.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/columndisplaychoice/ResultDataSetAndCellDetailDisplayHandler.java
@@ -1,14 +1,5 @@
 package net.sourceforge.squirrel_sql.fw.datasetviewer.columndisplaychoice;
 
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.beans.PropertyChangeEvent;
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-
 import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.ExtTableColumn;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetViewer;
@@ -19,6 +10,15 @@
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
 
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.beans.PropertyChangeEvent;
+
 public class ResultDataSetAndCellDetailDisplayHandler
 {
    private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ResultDataSetAndCellDetailDisplayHandler.class);
@@ -70,7 +70,7 @@ public void componentResized(ComponentEvent e)
          setCellDetailVisible(ColumnDisplayUtil.isShowCellDetail(), true);
          _splitPane.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, e -> onDividerLocationChanged(e));
 
-         _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selCol) -> onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer));
+         _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selCol, isAdjusting) -> onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer, isAdjusting));
       }
       else
       {
@@ -95,9 +95,9 @@ private void onSplitPaneResized()
       }
    }
 
-   private void onRowColSelectionChanged(DataSetViewerTablePanel dataSetViewer)
+   private void onRowColSelectionChanged(DataSetViewerTablePanel dataSetViewer, boolean isAdjusting)
    {
-      if( false == isCellDetailSplitActive() )
+      if( isAdjusting || false == isCellDetailSplitActive() )
       {
          return;
       }
@@ -267,7 +267,7 @@ private boolean isCellDetailSplitActive()
 
    private void fireCellSelectionChangedForCurrentSelectedCell()
    {
-      onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer);
+      onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer, false);
    }
 
    private void onDisplayChanged()

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public JPanel getPanel()`
`122`	`122`	`public void setDataSetViewer(IDataSetViewer dataSetViewer)`
`123`	`123`	`{`
`124`	`124`	`_dataSetViewer = dataSetViewer;`
`125`		`- _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selColumn) -> onRowColSelectedCountOrPosChanged(selRowCount, selColCount, selRow, selColumn));`
	`125`	`+ _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selColumn, isAdjusting) -> onRowColSelectedCountOrPosChanged(selRowCount, selColCount, selRow, selColumn));`
`126`	`126`
`127`	`127`	`callSelectionChanged();`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,14 @@ public void init(IDataSetUpdateableModel dataSetUpdateableModel, int listSelecti`
`96`	`96`
`97`	`97`	`private void onSelectionChanged(ListSelectionEvent e)`
`98`	`98`	`{`
`99`		`- if(e.getValueIsAdjusting())`
`100`		`- {`
`101`		`- return;`
`102`		`- }`
	`99`	`+ //if(e.getValueIsAdjusting())`
	`100`	`+ //{`
	`101`	`+ // return;`
	`102`	`+ //}`
`103`	`103`
`104`	`104`	`for(RowColSelectedCountListener l : _rowColSelectedCountListeners.toArray(new RowColSelectedCountListener[0]))`
`105`	`105`	`{`
`106`		`- l.rowColSelectedCountOrPosChanged(_table.getSelectedRowCount(), _table.getSelectedColumnCount(), _table.getSelectedRow(), _table.getSelectedColumn());`
	`106`	`+ l.rowColSelectedCountOrPosChanged(_table.getSelectedRowCount(), _table.getSelectedColumnCount(), _table.getSelectedRow(), _table.getSelectedColumn(), e.getValueIsAdjusting());`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`public interface RowColSelectedCountListener`
`4`	`4`	`{`
`5`		`- void rowColSelectedCountOrPosChanged(int selectedRowCount, int selectedColumnCount, int selectedRow, int selectedColumn);`
	`5`	`+ void rowColSelectedCountOrPosChanged(int selectedRowCount, int selectedColumnCount, int selectedRow, int selectedColumn, boolean isAdjusting);`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,5 @@`
`1`	`1`	`package net.sourceforge.squirrel_sql.fw.datasetviewer.columndisplaychoice;`
`2`	`2`
`3`		`-import java.awt.event.ComponentAdapter;`
`4`		`-import java.awt.event.ComponentEvent;`
`5`		`-import java.beans.PropertyChangeEvent;`
`6`		`-import javax.swing.BorderFactory;`
`7`		`-import javax.swing.JLabel;`
`8`		`-import javax.swing.JPanel;`
`9`		`-import javax.swing.JScrollPane;`
`10`		`-import javax.swing.JSplitPane;`
`11`		`-`
`12`	`3`	`import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;`
`13`	`4`	`import net.sourceforge.squirrel_sql.fw.datasetviewer.ExtTableColumn;`
`14`	`5`	`import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetViewer;`
`@@ -19,6 +10,15 @@`
`19`	`10`	`import net.sourceforge.squirrel_sql.fw.util.StringManager;`
`20`	`11`	`import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;`
`21`	`12`
	`13`	`+import javax.swing.BorderFactory;`
	`14`	`+import javax.swing.JLabel;`
	`15`	`+import javax.swing.JPanel;`
	`16`	`+import javax.swing.JScrollPane;`
	`17`	`+import javax.swing.JSplitPane;`
	`18`	`+import java.awt.event.ComponentAdapter;`
	`19`	`+import java.awt.event.ComponentEvent;`
	`20`	`+import java.beans.PropertyChangeEvent;`
	`21`	`+`
`22`	`22`	`public class ResultDataSetAndCellDetailDisplayHandler`
`23`	`23`	`{`
`24`	`24`	`private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ResultDataSetAndCellDetailDisplayHandler.class);`
`@@ -70,7 +70,7 @@ public void componentResized(ComponentEvent e)`
`70`	`70`	`setCellDetailVisible(ColumnDisplayUtil.isShowCellDetail(), true);`
`71`	`71`	`_splitPane.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, e -> onDividerLocationChanged(e));`
`72`	`72`
`73`		`- _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selCol) -> onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer));`
	`73`	`+ _dataSetViewer.addRowColSelectedCountListener((selRowCount, selColCount, selRow, selCol, isAdjusting) -> onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer, isAdjusting));`
`74`	`74`	`}`
`75`	`75`	`else`
`76`	`76`	`{`
`@@ -95,9 +95,9 @@ private void onSplitPaneResized()`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- private void onRowColSelectionChanged(DataSetViewerTablePanel dataSetViewer)`
	`98`	`+ private void onRowColSelectionChanged(DataSetViewerTablePanel dataSetViewer, boolean isAdjusting)`
`99`	`99`	`{`
`100`		`- if( false == isCellDetailSplitActive() )`
	`100`	`+ if( isAdjusting \|\| false == isCellDetailSplitActive() )`
`101`	`101`	`{`
`102`	`102`	`return;`
`103`	`103`	`}`
`@@ -267,7 +267,7 @@ private boolean isCellDetailSplitActive()`
`267`	`267`
`268`	`268`	`private void fireCellSelectionChangedForCurrentSelectedCell()`
`269`	`269`	`{`
`270`		`- onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer);`
	`270`	`+ onRowColSelectionChanged((DataSetViewerTablePanel)_dataSetViewer, false);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`private void onDisplayChanged()`