Feature: #54

  Object Tree: Content tabs now show the number of rows.
  If the number of rows is limited, the display indicates this,
  and the limited number of rows is written in red.
  To configure the row limit for content tabs see menu File --> New Session Properties --> tab "Object Tree"

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,12 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+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,
+  and the limited number of rows is written in red.
+  To configure the row limit for content tabs see menu File --> New Session Properties --> tab "Object Tree"
+
 Updated the following Look and Feels to their latest versions:
   FlatLaf, Radiance, JTattoo, Nimrod, Kunstoff
 

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeTabbedPane.java

@@ -17,12 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JTabbedPane;
 
 import net.sourceforge.squirrel_sql.client.IApplication;
 import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
@@ -32,6 +26,14 @@
 import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 /**
  * This is the tabbed panel displayed when a node is selected in the
  * object tree.
@@ -102,38 +104,43 @@ IObjectTab getSelectedTab() {
         IObjectTab tab = _tabs.get(_tabPnl.getSelectedIndex());
         return tab;
     }
-    
+
 	synchronized void addObjectPanelTab(IObjectTab tab)
 	{
-		if (tab == null)
+		if(tab == null)
 		{
 			throw new IllegalArgumentException("Null IObjectTab passed");
 		}
-        // For some reason, when the Oracle plugin adds details tabs for 
-        // triggers, the _tabPnl's first tab ends up being the trigger details
-        // tab and not the generic database object info tab.  This causes the 
-        // _tabs length to be 1 tab greater than the tabs that are actually in 
-        // the _tabPnl.  This throws off the selection such that the tab 
-        // selected in the tab panel doesn't get rendered until the tab to the
-        // right of the selected tab is selected.  This is a work-around for 
-        // this problem until I can determine why the DatabaseObjectInfoTab 
-        // never makes it into the _tabPnl in the first place.
-		if (_tabs.size() == 1 && _tabPnl.getTabCount() == 0) {
-            log.debug(
-                "addObjectPanelTab: _tabs.size() == 1, but " +
-                "_tabPnl.getTabCount() == 0 - adding first tab component to " +
-                "the tabbed page");
-            IObjectTab firstTab = _tabs.get(0);
-            _tabPnl.addTab(firstTab.getTitle(), 
-                           null, 
-                           firstTab.getComponent(), 
-                           firstTab.getHint());
-        }
-        
-        tab.setSession(_app.getSessionManager().getSession(_sessionId));
-        final String title = tab.getTitle();
-        _tabPnl.addTab(title, null, tab.getComponent(), tab.getHint());
-        _tabs.add(tab);
+		// For some reason, when the Oracle plugin adds details tabs for
+		// triggers, the _tabPnl's first tab ends up being the trigger details
+		// tab and not the generic database object info tab.  This causes the
+		// _tabs length to be 1 tab greater than the tabs that are actually in
+		// the _tabPnl.  This throws off the selection such that the tab
+		// selected in the tab panel doesn't get rendered until the tab to the
+		// right of the selected tab is selected.  This is a work-around for
+		// this problem until I can determine why the DatabaseObjectInfoTab
+		// never makes it into the _tabPnl in the first place.
+		if(_tabs.size() == 1 && _tabPnl.getTabCount() == 0)
+		{
+			log.debug( "addObjectPanelTab: _tabs.size() == 1, but _tabPnl.getTabCount() == 0 - adding first tab component to the tabbed page");
+			IObjectTab firstTab = _tabs.get(0);
+			_tabPnl.addTab(firstTab.getTitle(), null,firstTab.getComponent(),firstTab.getHint());
+		}
+
+		tab.setSession(_app.getSessionManager().getSession(_sessionId));
+		final String title = tab.getTitle();
+		if(null == tab.getHeaderComponent())
+		{
+			_tabPnl.addTab(title, null, tab.getComponent(), tab.getHint());
+		}
+		else
+		{
+			JPanel pnlIncludingHeader = new JPanel(new BorderLayout());
+			pnlIncludingHeader.add(tab.getHeaderComponent(), BorderLayout.NORTH);
+			pnlIncludingHeader.add(tab.getComponent(), BorderLayout.CENTER);
+			_tabPnl.addTab(title, null, pnlIncludingHeader);
+		}
+		_tabs.add(tab);
 	}
 
 	void selectCurrentTab()

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java

@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * 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.DataSetException;
@@ -26,6 +27,8 @@
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 
+import java.awt.Component;
+
 public abstract class BaseDataSetTab extends BaseObjectTab
 {
 	/** Logger for this class. */
@@ -37,7 +40,6 @@ public abstract class BaseDataSetTab extends BaseObjectTab
 
 	public BaseDataSetTab()
 	{
-		super();
 	}
 
 	/**
@@ -89,6 +91,12 @@ public synchronized DataSetScrollingPanel getComponent()
 		return _comp;
 	}
 
+	@Override
+	public Component getHeaderComponent()
+	{
+		return null;
+	}
+
 	/**
 	 * Rebuild the tab. This usually means that some kind of configuration
 	 * data has changed (I.E. the output type has changed from text to table).
@@ -121,7 +129,7 @@ public synchronized void refreshComponent() throws DataSetException
 			throw new IllegalStateException("Null ISession");
 		}
 
-		super._app.getThreadPool().addTask(() -> {
+		Main.getApplication().getThreadPool().addTask(() -> {
 			try
 			{
 				getComponent().load(createDataSet(), new DataModelImplementationDetails(session));

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseObjectTab.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
 import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
@@ -35,12 +35,7 @@
  */
 public abstract class BaseObjectTab implements IObjectTab
 {
-	/** Logger for this class. */
-	private static final ILogger s_log =
-		LoggerController.createLogger(BaseObjectTab.class);
-
-	/** Application API. */
-	protected IApplication _app;
+	private static final ILogger s_log = LoggerController.createLogger(BaseObjectTab.class);
 
 	/** Current session. */
 //	private ISession _session;
@@ -71,7 +66,6 @@ public void setSession(ISession session) throws IllegalArgumentException
 		{
 			throw new IllegalArgumentException("Null ISession passed");
 		}
-		_app = session.getApplication();
 		_sessionId = session.getIdentifier();
 	}
 
@@ -82,7 +76,7 @@ public void setSession(ISession session) throws IllegalArgumentException
 	 */
 	public final ISession getSession()
 	{
-		return _app.getSessionManager().getSession(_sessionId);
+		return Main.getApplication().getSessionManager().getSession(_sessionId);
 	}
 
 	/**

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java

@@ -114,6 +114,12 @@ public Component getComponent()
 		return _comp;
 	}
 
+	@Override
+	public Component getHeaderComponent()
+	{
+		return null;
+	}
+
 	protected void refreshComponent() throws DataSetException
 	{
 		if(getDatabaseObjectInfo().getDatabaseObjectType().isContainerNode())

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourceTab.java

@@ -27,9 +27,9 @@
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 
-import javax.swing.*;
+import javax.swing.JScrollPane;
 import javax.swing.text.JTextComponent;
-import java.awt.*;
+import java.awt.Component;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -129,6 +129,12 @@ public Component getComponent()
       return _textFindCtrl.getContainerPanel();
    }
 
+   @Override
+   public Component getHeaderComponent()
+   {
+      return null;
+   }
+
    protected void refreshComponent()
    {
       ISession session = getSession();

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/IObjectTab.java

@@ -17,11 +17,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-import java.awt.Component;
 
+import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
 
-import net.sourceforge.squirrel_sql.client.session.ISession;
+import java.awt.Component;
 /**
  * This interface defines the behaviour for a tab in one of the object panels.
  *
@@ -50,6 +50,8 @@ public interface IObjectTab
 	 */
 	Component getComponent();
 
+	Component getHeaderComponent();
+
 	/**
 	 * Set the current session.
 	 *