Feature #43

   The maximum number of characters to display in the table cell data popup can now be configured.
   See menu File -- > Global Preferences --> tab General --> section "Table cell data value popup".

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,10 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+https://github.com/squirrel-sql-client/squirrel-sql-code/issues/43
+  The maximum number of characters to display in the table cell data popup can now be configured.
+  See menu File -- > Global Preferences --> tab General --> section "Table cell data value popup".
+
 #617 | https://github.com/squirrel-sql-client/squirrel-sql-code/issues/41
   SQL result table: The detail data display now allows to automatically reformat XML or Json data.
   To configure automatic reformatting go to menu File --> Global preferences

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesGUI.java

@@ -5,6 +5,7 @@
 import net.sourceforge.squirrel_sql.client.session.messagepanel.MessagePrefsCtrl;
 import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
 import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
 import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -45,6 +46,7 @@ final class GeneralPreferencesGUI extends JPanel
    private JCheckBox _showPluginFilesInSplashScreen = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.showpluginfiles"));
    private JCheckBox _useShortSessionTitle = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.useShortSessionTitle"));
    private JCheckBox _rememberValueOfPopup = new JCheckBox(s_stringMgr.getString("GeneralPreferencesPanel.rememberValueOfPopup"));
+   private IntegerField _maxCharsInValuePopup = new IntegerField(8, 0);
 
 
    //      private JLabel _executionLogFileNameLbl = new OutputLabel(" ");
@@ -98,6 +100,7 @@ void loadData(SquirrelPreferences prefs)
       _showPluginFilesInSplashScreen.setSelected(prefs.getShowPluginFilesInSplashScreen());
       _useShortSessionTitle.setSelected(prefs.getUseShortSessionTitle());
       _rememberValueOfPopup.setSelected(prefs.isRememberValueOfPopup());
+      _maxCharsInValuePopup.setInt(prefs.getMaxCharsInValuePopup());
 
       _confirmSessionCloseChk.setSelected(prefs.getConfirmSessionClose());
       _warnJreJdbcMismatch.setSelected(prefs.getWarnJreJdbcMismatch());
@@ -151,6 +154,7 @@ void applyChanges(SquirrelPreferences prefs)
       prefs.setShowPluginFilesInSplashScreen(_showPluginFilesInSplashScreen.isSelected());
       prefs.setUseShortSessionTitle(_useShortSessionTitle.isSelected());
       prefs.setRememberValueOfPopup(_rememberValueOfPopup.isSelected());
+      prefs.setMaxCharsInValuePopup(_maxCharsInValuePopup.getInt());
       prefs.setConfirmSessionClose(_confirmSessionCloseChk.isSelected());
       prefs.setWarnJreJdbcMismatch(_warnJreJdbcMismatch.isSelected());
       prefs.setWarnForUnsavedFileEdits(_warnForUnsavedFileEdits.isSelected());
@@ -251,7 +255,7 @@ private JPanel createAppearancePanel()
       ++gbc.gridy;
       pnl.add(_useShortSessionTitle, gbc);
       ++gbc.gridy;
-      pnl.add(_rememberValueOfPopup, gbc);
+      pnl.add(createValuePopupPanel(), gbc);
 
       ++gbc.gridy;
       final GridBagConstraints gbcThemes = (GridBagConstraints) gbc.clone();
@@ -268,6 +272,26 @@ private JPanel createAppearancePanel()
       return pnl;
    }
 
+   private JPanel createValuePopupPanel()
+   {
+      JPanel ret = new JPanel(new GridBagLayout());
+
+      GridBagConstraints gbc;
+
+      gbc = new GridBagConstraints(0,0, 1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,0,0), 0,0);
+      ret.add(_rememberValueOfPopup, gbc);
+
+      gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(10,5,0,0), 0,0);
+      ret.add(new JLabel(s_stringMgr.getString("GeneralPreferencesPanel.maxCharNumbersInValueOfPopup")), gbc);
+
+      gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(2,5,0,0), 0,0);
+      ret.add(_maxCharsInValuePopup, gbc);
+
+      ret.setBorder(BorderFactory.createTitledBorder(s_stringMgr.getString("GeneralPreferencesPanel.value.popup.title")));
+
+      return ret;
+   }
+
    private JPanel createGeneralPanel()
    {
       final JPanel pnl = new JPanel();

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties

@@ -23,6 +23,8 @@ GeneralPreferencesPanel.showmainwintoolbar=Show Main Window Toolbar
 GeneralPreferencesPanel.showpluginfiles=Show Plugin files being loaded in Splash Screen
 GeneralPreferencesPanel.useShortSessionTitle=Use short Session tab title (Alias name only)
 GeneralPreferencesPanel.rememberValueOfPopup=Remember value popup size
+GeneralPreferencesPanel.maxCharNumbersInValueOfPopup=Maximum characters to display in value popup (0 for no limit):
+GeneralPreferencesPanel.value.popup.title=Table cell data value popup
 GeneralPreferencesPanel.showSessionStartupTimeHint=Show Session startup time hint
 GeneralPreferencesPanel.showtooltips=Show Tooltips
 GeneralPreferencesPanel.showwindowcontents=Show Window Contents While Dragging

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java

@@ -114,6 +114,7 @@ public interface IPropertyNames
       String MAX_COLUMN_ADJUST_LENGTH_DEFINED = "maxColumnAdjustLengthDefined";
       String MAX_COLUMN_ADJUST_LENGTH = "maxColumnAdjustLength";
       String REMEMBER_VALUE_OF_POPUP = "rememberValueOfPopup";
+      String MAX_CHARS_IN_VALUE_POPUP = "maxCharsInValuePopup";
       String RELOAD_SQL_CONTENTS = "ReloadSqlContents";
       String MAX_TEXTOUTPUT_COLUMN_WIDTH = "MaxTextOutputColumnWidth";
       String NOTIFY_EXTERNAL_FILE_CHANGES = "NotifyExternalFileChanges";
@@ -303,6 +304,8 @@ public interface IJdbcDebugTypes
 
 	private boolean _rememberValueOfPopup = false;
 
+	private int _maxCharsInValuePopup = 10000;
+
 	private boolean _reloadSqlContents;
 
 	private int _maxTextOutputColumnWidth = IDataSetViewer.MAX_COLUMN_WIDTH;
@@ -1371,6 +1374,17 @@ public void setRememberValueOfPopup(boolean b)
 		_rememberValueOfPopup = b;
 	}
 
+	public int getMaxCharsInValuePopup()
+	{
+		return _maxCharsInValuePopup;
+	}
+
+	public void setMaxCharsInValuePopup(int maxCharsInValuePopup)
+	{
+		_maxCharsInValuePopup = maxCharsInValuePopup;
+	}
+
+
 	public boolean isReloadSqlContents()
 	{
 		return _reloadSqlContents;

sql12/core/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java

@@ -112,6 +112,7 @@ public PropertyDescriptor[] getPropertyDescriptors()
             prop(MAX_COLUMN_ADJUST_LENGTH, SquirrelPreferences.class, "getMaxColumnAdjustLength", "setMaxColumnAdjustLength"),
 
             prop(REMEMBER_VALUE_OF_POPUP, SquirrelPreferences.class, "isRememberValueOfPopup", "setRememberValueOfPopup"),
+            prop(MAX_CHARS_IN_VALUE_POPUP, SquirrelPreferences.class, "getMaxCharsInValuePopup", "setMaxCharsInValuePopup"),
 
             prop(RELOAD_SQL_CONTENTS, SquirrelPreferences.class, "isReloadSqlContents", "setReloadSqlContents"),
 

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/BigDataRenderResult.java

@@ -2,6 +2,7 @@
 
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.TableNameAccess;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
@@ -10,12 +11,9 @@
 public class BigDataRenderResult
 {
 
-   public static final int MAX_BYTES_IN_CELL_DETAIL_DISPLAY = 10000;
-
    private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DataTypeBinary.class);
    private static ILogger s_log = LoggerController.createLogger(BigDataRenderResult.class);
 
-
    private final String _renderResult;
    private final boolean _maxBytesReached;
 
@@ -37,16 +35,26 @@ public boolean isMaxBytesReached()
 
    public static void showMaxBytesReachedMessage(ColumnDisplayDefinition colDef)
    {
-      String msg = s_stringMgr.getString("BinaryTypeRenderResult.MaxBytesReached", MAX_BYTES_IN_CELL_DETAIL_DISPLAY, colDef.getFullTableColumnName(), colDef.getSqlTypeName());
+      String msg = s_stringMgr.getString("BinaryTypeRenderResult.MaxBytesReached", getMaxCharsInValuePopup(), TableNameAccess.getTableName(colDef), colDef.getSqlTypeName());
       s_log.warn(msg);
       Main.getApplication().getMessageHandler().showWarningMessage(msg);
    }
 
    public static void showStringLenReachedMessage(ColumnDisplayDefinition colDef)
    {
-      String msg = s_stringMgr.getString("BinaryTypeRenderResult.StringLenReached", MAX_BYTES_IN_CELL_DETAIL_DISPLAY, colDef.getFullTableColumnName(), colDef.getSqlTypeName());
+      String msg = s_stringMgr.getString("BinaryTypeRenderResult.StringLenReached", getMaxCharsInValuePopup(), TableNameAccess.getTableName(colDef), colDef.getSqlTypeName());
       s_log.warn(msg);
       Main.getApplication().getMessageHandler().showWarningMessage(msg);
    }
 
+   public static int getMaxCharsInValuePopup()
+   {
+      int ret = Main.getApplication().getSquirrelPreferences().getMaxCharsInValuePopup();
+      if(0 == ret)
+      {
+         return Integer.MAX_VALUE;
+      }
+
+      return ret;
+   }
 }

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBinary.java

@@ -282,7 +282,7 @@ public JTextArea getJTextArea(Object value, ColumnDisplayDefinition colDef) {
 
 		// value is a simple string representation of the data,
 		// the same one used in Text and in-cell operations.
-		 BigDataRenderResult renderResult = _renderObject(value, BigDataRenderResult.MAX_BYTES_IN_CELL_DETAIL_DISPLAY);
+		 BigDataRenderResult renderResult = _renderObject(value, BigDataRenderResult.getMaxCharsInValuePopup());
 
 		 if(renderResult.isMaxBytesReached())
 		 {

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBlob.java

@@ -139,14 +139,14 @@ private static String renderForTextArea(Object value, ColumnDisplayDefinition co
 		Byte[] useValue;
 		if(value instanceof BlobDescriptor)
 		{
-			useValue = Utilities.toBoxedByteArray(((BlobDescriptor)value).getData(), BigDataRenderResult.MAX_BYTES_IN_CELL_DETAIL_DISPLAY);
+			useValue = Utilities.toBoxedByteArray(((BlobDescriptor)value).getData(), BigDataRenderResult.getMaxCharsInValuePopup());
 		}
 		else
 		{
-			useValue = Utilities.toBoxedByteArray(value, BigDataRenderResult.MAX_BYTES_IN_CELL_DETAIL_DISPLAY);
+			useValue = Utilities.toBoxedByteArray(value, BigDataRenderResult.getMaxCharsInValuePopup());
 		}
 
-		if(null != useValue && useValue.length == BigDataRenderResult.MAX_BYTES_IN_CELL_DETAIL_DISPLAY)
+		if(null != useValue && useValue.length == BigDataRenderResult.getMaxCharsInValuePopup())
 		{
 			BigDataRenderResult.showMaxBytesReachedMessage(colDef);
 		}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeClob.java

@@ -345,9 +345,9 @@ public JTextArea getJTextArea(Object value, ColumnDisplayDefinition colDef)
 		// use the _renderer object to do the rendering.
 		String renderedValue = DefaultColumnRenderer.renderObject(value);
 
-		if(renderedValue.length() > BigDataRenderResult.MAX_BYTES_IN_CELL_DETAIL_DISPLAY)
+		if(renderedValue.length() > BigDataRenderResult.getMaxCharsInValuePopup())
 		{
-			renderedValue = renderedValue.substring(0, BigDataRenderResult.MAX_BYTES_IN_CELL_DETAIL_DISPLAY);
+			renderedValue = renderedValue.substring(0, BigDataRenderResult.getMaxCharsInValuePopup());
 			BigDataRenderResult.showStringLenReachedMessage(colDef);
 		}