Feature: #48 (comment)

 Cell data popup: When the popup is pinned it is updated by table selection change and single mouse click.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,9 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+https://github.com/squirrel-sql-client/squirrel-sql-code/issues/48#issuecomment-2566434346
+ Cell data popup: When the popup is pinned it is updated by table selection change and single mouse click.
+
 https://github.com/squirrel-sql-client/squirrel-sql-code/issues/54
   Object Tree: Content tabs now show the number of rows.
   If the number of rows is limited, the display indicates this,

sql12/core/src/net/sourceforge/squirrel_sql/client/Application.java

@@ -1562,7 +1562,7 @@ public CellDetailDisplayModeManager getCellDetailDisplayModeManager()
    }
 
    @Override
-   public PinnedCellDataDialogHandler getStickyCellDataDialog()
+   public PinnedCellDataDialogHandler getPinnedCellDataDialogHandler()
    {
       return _pinnedCellDataDialogHandler;
    }

sql12/core/src/net/sourceforge/squirrel_sql/client/IApplication.java

@@ -317,5 +317,5 @@ interface IMenuIDs extends MainFrame.IMenuIDs
 
 	CellDetailDisplayModeManager getCellDetailDisplayModeManager();
 
-	PinnedCellDataDialogHandler getStickyCellDataDialog();
+	PinnedCellDataDialogHandler getPinnedCellDataDialogHandler();
 }

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java

@@ -20,10 +20,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.session.DataModelImplementationDetails;
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.LimitReadLengthFeatureUnstable;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataDialogHandler;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.DefaultFindService;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.FindService;
 
@@ -96,10 +98,11 @@ public void init(IDataSetUpdateableModel dataSetUpdateableModel, int listSelecti
 
    private void onSelectionChanged(ListSelectionEvent e)
    {
-		//if(e.getValueIsAdjusting())
-		//{
-		//	return;
-		//}
+		if(false == e.getValueIsAdjusting())
+		{
+			Main.getApplication().getPinnedCellDataDialogHandler();
+			CellDataDialogHandler.showSelectedValueInPinnedCellDataDialog(_table, isTableEditable());
+		}
 
 		for(RowColSelectedCountListener l : _rowColSelectedCountListeners.toArray(new RowColSelectedCountListener[0]))
 		{
@@ -300,14 +303,16 @@ public void moveColumnsToFront(ArrayList<ExtTableColumn> columnsToMoveToFront)
 	 * MyTable.isCellEditable().  We do not bother to distinguish between
 	 * editable and non-editable cells within the same table.
 	 */
-	public boolean isTableEditable() {
+	public boolean isTableEditable()
+	{
 		return false;
 	}
 
 	/**
 	 * Tell the table whether particular columns are editable.
 	 */
-	public boolean isColumnEditable(int col, Object originalValue) {
+	public boolean isColumnEditable(int col, Object originalValue)
+	{
 		return false;
 	}
 
@@ -318,7 +323,8 @@ public boolean isColumnEditable(int col, Object originalValue) {
 	 * to be able to view the entire contents of the cell even if it was not
 	 * completely loaded during the initial table setup.
 	 */
-	public boolean needToReRead(int col, Object originalValue) {
+	public boolean needToReRead(int col, Object originalValue)
+	{
 		// call the DataType object for this column and have it check the current value
 		return CellComponentFactory.needToReRead(getColDefs()[col], originalValue);
 	}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/celldatapopup/CellDataDialog.java

@@ -69,11 +69,11 @@ private void onToggleSticky(boolean sticky)
    {
       if(sticky)
       {
-         Main.getApplication().getStickyCellDataDialog().setStickyCellDataDialog(this);
+         Main.getApplication().getPinnedCellDataDialogHandler().setPinnedCellDataDialog(this);
       }
       else
       {
-         Main.getApplication().getStickyCellDataDialog().clearStickyCellDataDialog();
+         Main.getApplication().getPinnedCellDataDialogHandler().clearPinnedCellDataDialog();
       }
    }
 

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/celldatapopup/CellDataDialogHandler.java

@@ -20,6 +20,7 @@
 
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ExtTableColumn;
 import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
 import net.sourceforge.squirrel_sql.fw.props.Props;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -28,6 +29,7 @@
 import javax.swing.CellEditor;
 import javax.swing.JTable;
 import javax.swing.SwingUtilities;
+import javax.swing.table.TableColumn;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Point;
@@ -70,17 +72,51 @@ public static void showDialog(JTable table,
          editor.cancelCellEditing();
       }
 
-      if(null == Main.getApplication().getStickyCellDataDialog().getStickyPopup())
+      CellDataDialog pinnedCellDataDialog = Main.getApplication().getPinnedCellDataDialogHandler().getPinnedCellDataDialog();
+      if(null == pinnedCellDataDialog)
       {
          createAndShowCellDataDialog(table, table.getColumnName(colIx), rowIx, colIx, colDef, obj, isModelEditable, evt);
       }
-      else
+
+      // Redundant because handled by showSelectedValueInPinnedCellDataDialog(...) below
+      //else
+      //{
+      //   pinnedCellDataDialog.initCellDisplayPanel(table, table.getColumnName(colIx), rowIx, colIx, colDef, obj, isModelEditable, true);
+      //}
+   }
+
+   public static void showSelectedValueInPinnedCellDataDialog(JTable table, boolean isModelEditable)
+   {
+      CellDataDialog pinnedCellDataDialog = Main.getApplication().getPinnedCellDataDialogHandler().getPinnedCellDataDialog();
+
+      if(null == pinnedCellDataDialog)
+      {
+         return;
+      }
+
+      int selectedRow = table.getSelectedRow();
+      int selectedColumn = table.getSelectedColumn();
+
+      if(-1 == selectedRow || -1 == selectedColumn)
+      {
+         return;
+      }
+
+      TableColumn column = table.getColumnModel().getColumn(selectedColumn);
+
+      if(false == column instanceof ExtTableColumn)
       {
-         CellDataDialog cellDataDialog = Main.getApplication().getStickyCellDataDialog().getStickyPopup();
-         cellDataDialog.initCellDisplayPanel(table, table.getColumnName(colIx), rowIx, colIx, colDef, obj, isModelEditable, true);
+         return;
       }
+
+      Object obj = table.getValueAt(selectedRow, selectedColumn);
+      ColumnDisplayDefinition colDef = ((ExtTableColumn) column).getColumnDisplayDefinition();
+
+      pinnedCellDataDialog.initCellDisplayPanel(table, table.getColumnName(selectedColumn), selectedRow, selectedColumn, colDef, obj, isModelEditable, true);
    }
 
+
+
    private static void createAndShowCellDataDialog(JTable parentTable,
                                                    String columnName,
                                                    int rowIx,

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/celldatapopup/PinnedCellDataDialogHandler.java

@@ -5,7 +5,7 @@
 
 public class PinnedCellDataDialogHandler
 {
-   private CellDataDialog _stickyCellDataDialog;
+   private CellDataDialog _pinnedCellDataDialog;
 
    private WindowAdapter _windowAdapter;
 
@@ -16,36 +16,36 @@ public PinnedCellDataDialogHandler()
          @Override
          public void windowClosing(WindowEvent e)
          {
-            clearStickyCellDataDialog();
+            clearPinnedCellDataDialog();
          }
 
          @Override
          public void windowClosed(WindowEvent e)
          {
-            clearStickyCellDataDialog();
+            clearPinnedCellDataDialog();
          }
       };
    }
 
-   public void setStickyCellDataDialog(CellDataDialog stickyCellDataDialog)
+   void setPinnedCellDataDialog(CellDataDialog pinnedCellDataDialog)
    {
-      clearStickyCellDataDialog();
-      _stickyCellDataDialog = stickyCellDataDialog;
-      _stickyCellDataDialog.addWindowListener(_windowAdapter);
+      clearPinnedCellDataDialog();
+      _pinnedCellDataDialog = pinnedCellDataDialog;
+      _pinnedCellDataDialog.addWindowListener(_windowAdapter);
    }
 
-   public void clearStickyCellDataDialog()
+   void clearPinnedCellDataDialog()
    {
-      if(null != _stickyCellDataDialog)
+      if(null != _pinnedCellDataDialog)
       {
-         _stickyCellDataDialog.switchOffPinned();
-         _stickyCellDataDialog.removeWindowListener(_windowAdapter);
-         _stickyCellDataDialog = null;
+         _pinnedCellDataDialog.switchOffPinned();
+         _pinnedCellDataDialog.removeWindowListener(_windowAdapter);
+         _pinnedCellDataDialog = null;
       }
    }
 
-   public CellDataDialog getStickyPopup()
+   CellDataDialog getPinnedCellDataDialog()
    {
-      return _stickyCellDataDialog;
+      return _pinnedCellDataDialog;
    }
 }