Bug fix follow up to #1530: The number of a Session's finalized result tabs do not appear in SQuirreL's logs anymore

  but in the "Session garbage collection status", see button on the left of the garbage collection button.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -76,6 +76,9 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+Follow up to #1530: The number of a Session's finalized result tabs do not appear in SQuirreL's logs anymore
+  but in the "Session garbage collection status", see button on the left of the garbage collection button.
+
 Follow up to https://github.com/squirrel-sql-client/squirrel-sql-code/issues/46
 SQL result and table export to MS-Excel files: The options to make header rows bold and centered did not
   work for MS-Excel but for Libre Office only.

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

@@ -87,8 +87,8 @@ MemoryPanel.memSize={0} of {1} MB
 MemoryPanel.gcStatus={0}\n\nSessions waiting for garbage collection:\n==================================================\n{1}\nSessions open:\n==================================================\n{2}\nSessions garbage collected:\n==================================================\n{3}\n
 
 MemoryPanel.statusDialogTitle=Session garbage collection status
-MemoryPanel.sessionInfo.toString1=Session: ID={0}, Alias={1}: created at {2}, closed at {3}
-MemoryPanel.sessionInfo.toString2=Session: ID={0}, Alias={1}: created at {2}
-MemoryPanel.sessionInfo.toString3=Session: ID={0}, Alias={1}: created at {2}, closed at {3}, finalized at {4}
+MemoryPanel.sessionInfo.toString1.incl.res.tab=Session: ID={0}, Alias={1}: created at {2}, closed at {4}, number of finalized result tabs while open {3}
+MemoryPanel.sessionInfo.toString2.incl.res.tab=Session: ID={0}, Alias={1}: created at {2}, number of finalized result tabs while open {3}
+MemoryPanel.sessionInfo.toString3.incl.res.tab=Session: ID={0}, Alias={1}: created at {2}, closed at {4}, finalized at {5}, number of finalized result tabs while open {3}
 
 ThreadPanel.refresh=Refresh

sql12/core/src/net/sourceforge/squirrel_sql/client/gui/MemoryPanel.java

@@ -126,11 +126,7 @@ public void actionPerformed(ActionEvent e)
 			public void sessionClosed(SessionEvent evt)
 			{
 				IIdentifier id = evt.getSession().getIdentifier();
-				MemorySessionInfo msi = _sessionInfosBySessionIDs.get(id);
-				if(null == msi)
-				{
-					throw new IllegalStateException("A session with ID " + id + " has not been created");
-				}
+				MemorySessionInfo msi = getMemorySessionInfo(id);
 				msi.closed = new Date();
 				updateGcStatus();
 			}
@@ -149,14 +145,16 @@ public void sessionConnected(SessionEvent evt)
 
 			public void sessionFinalized(IIdentifier sessionId)
 			{
-				MemorySessionInfo msi = _sessionInfosBySessionIDs.get(sessionId);
-				if(null == msi)
-				{
-					throw new IllegalStateException("A session with ID " + sessionId + " has not been created");
-				}
+				MemorySessionInfo msi = getMemorySessionInfo(sessionId);
 				msi.finalized = new Date();
 				updateGcStatus();
 			}
+
+			@Override
+			public void resultTabOfOpenSessionFinalized(IIdentifier sessionId)
+			{
+				++getMemorySessionInfo(sessionId).countFinalizedResultTabsWhileSessionOpen;
+			}
 		});
 
 		Timer t = new Timer(500, new ActionListener()
@@ -170,6 +168,16 @@ public void actionPerformed(ActionEvent e)
 
 	}
 
+	private MemorySessionInfo getMemorySessionInfo(IIdentifier id)
+	{
+		MemorySessionInfo msi = _sessionInfosBySessionIDs.get(id);
+		if(null == msi)
+		{
+			throw new IllegalStateException("A session with ID " + id + " has not been created");
+		}
+		return msi;
+	}
+
 	private void updateGcStatus()
 	{
 		SessionGCStatus gcStat = getSessionGCStatus();

sql12/core/src/net/sourceforge/squirrel_sql/client/gui/MemorySessionInfo.java

@@ -22,6 +22,7 @@ class MemorySessionInfo implements Comparable<MemorySessionInfo>
    java.util.Date created = new Date();
    Date closed;
    Date finalized;
+   int countFinalizedResultTabsWhileSessionOpen;
 
    public String toString()
    {
@@ -32,24 +33,22 @@ public String toString()
                   sessionId,
                   aliasName,
                   df.format(created),
+                  countFinalizedResultTabsWhileSessionOpen,
                   null == closed ? "" : df.format(closed),
-                  null == finalized ? "" : df.format(finalized)
+                  null == finalized ? "" : df.format(finalized),
             };
 
       if (null != closed && null == finalized)
       {
-         // i18n[MemoryPanel.sessionInfo.toString1=Session: ID={0}, Alias={1}: created at {2}, closed at {3}]
-         return s_stringMgr.getString("MemoryPanel.sessionInfo.toString1", params);
+         return s_stringMgr.getString("MemoryPanel.sessionInfo.toString1.incl.res.tab", params);
       }
       else if (null == closed)
       {
-         // i18n[MemoryPanel.sessionInfo.toString2=Session: ID={0}, Alias={1}: created at {2}]
-         return s_stringMgr.getString("MemoryPanel.sessionInfo.toString2", params);
+         return s_stringMgr.getString("MemoryPanel.sessionInfo.toString2.incl.res.tab", params);
       }
       else if (null != finalized)
       {
-         // i18n[MemoryPanel.sessionInfo.toString3=Session: ID={0}, Alias={1}: created at {2}, closed at {3}, finalized at {4}]
-         return s_stringMgr.getString("MemoryPanel.sessionInfo.toString3", params);
+         return s_stringMgr.getString("MemoryPanel.sessionInfo.toString3.incl.res.tab", params);
       }
       else
       {

sql12/core/src/net/sourceforge/squirrel_sql/client/session/SessionManager.java

@@ -571,9 +571,27 @@ public void run()
             }
          }
       });
+   }
 
+   public void fireResultTabOfOpenSessionFinalized(IIdentifier sessionIdentifier)
+   {
+      SwingUtilities.invokeLater(new Runnable()
+      {
+         public void run()
+         {
+            Object[] listeners = listenerList.getListenerList();
+            for (int i = listeners.length - 2; i >= 0; i -= 2)
+            {
+               if (listeners[i] == ISessionListener.class)
+               {
+                  ((ISessionListener)listeners[i + 1]).resultTabOfOpenSessionFinalized(sessionIdentifier);
+               }
+            }
+         }
+      });
    }
 
+
    public void addAllowedSchemaChecker(IAllowedSchemaChecker allowedSchemaChecker)
    {
       _allowedSchemaCheckers.add(allowedSchemaChecker);

sql12/core/src/net/sourceforge/squirrel_sql/client/session/event/ISessionListener.java

@@ -66,4 +66,6 @@ public interface ISessionListener extends EventListener
 	void reconnectFailed(SessionEvent evt);
 
 	void sessionFinalized(IIdentifier sessionIdentifier);
+
+	void resultTabOfOpenSessionFinalized(IIdentifier sessionIdentifier);
 }

sql12/core/src/net/sourceforge/squirrel_sql/client/session/event/SessionAdapter.java

@@ -36,30 +36,25 @@ public class SessionAdapter implements ISessionListener
 	 */
 	public void sessionClosed(SessionEvent evt)
 	{
-		// Empty body.
 	}
 
 	public void allSessionsClosed()
 	{
-		//Empty body
 	}
 
 	/**
 	 * The session is about to close
 	 */
 	public void sessionClosing(SessionEvent evt)
 	{
-		//Empty Bbody
 	}
 
 	public void sessionConnected(SessionEvent evt)
 	{
-		//Empty Body
 	}
 
 	public void sessionActivated(SessionEvent evt)
 	{
-		//Empty Body
 	}
 
 	public void connectionClosedForReconnect(SessionEvent evt)
@@ -77,4 +72,9 @@ public void reconnectFailed(SessionEvent evt)
 	public void sessionFinalized(IIdentifier sessionIdentifier)
 	{
 	}
+
+   @Override
+   public void resultTabOfOpenSessionFinalized(IIdentifier sessionIdentifier)
+   {
+   }
 }

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

@@ -23,6 +23,7 @@
  * 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.gui.builders.UIFactory;
 import net.sourceforge.squirrel_sql.client.session.DataModelImplementationDetails;
 import net.sourceforge.squirrel_sql.client.session.EditableSqlCheck;
@@ -788,7 +789,9 @@ protected void finalize()
    {
       if(false == _session.isClosed())
       {
-         s_log.info("Result tab finalized for open Session \"" + _session.getTitle() + "\" with id=" + _session.getIdentifier());
+         //s_log.info("Result tab finalized for open Session \"" + _session.getTitle() + "\" with id=" + _session.getIdentifier());
+         Main.getApplication().getSessionManager().fireResultTabOfOpenSessionFinalized(_session.getIdentifier());
+
       }
    }
 }