[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6163] trunk/sql12/plugins/dbdiff/src/main/java/ net/sourceforge/squirrel_sql/plugins/dbdiff/actions/CompareAction.java

[<man...@us...>]

Revision: 6163
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6163&view=rev
Author:   manningr
Date:     2011-02-22 14:55:15 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
Fixed bug where comparison didn't work the second time around.

Modified Paths:
--------------
    trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/CompareAction.java

Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/CompareAction.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/CompareAction.java	2011-02-21 21:35:10 UTC (rev 6162)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/CompareAction.java	2011-02-22 14:55:15 UTC (rev 6163)
@@ -62,6 +62,7 @@
 	 */
 	public void actionPerformed(ActionEvent evt)
 	{
+		final ISession sourceSession = sessionInfoProv.getSourceSession();
 		final ISession destSession = sessionInfoProv.getDestSession();
 		final IObjectTreeAPI api = destSession.getObjectTreeAPIOfActiveSessionWindow();
 		if (api == null)
@@ -70,28 +71,28 @@
 		}
 		final IDatabaseObjectInfo[] dbObjs = api.getSelectedDatabaseObjects();
 
-		if (sessionInfoProv.getSourceSession() != null)
+		// sourceSession can be null in the case where two tables are selected in the same schema for direct
+		// compare.
+		if (sourceSession != null && !sourceSession.getIdentifier().equals(destSession.getIdentifier()))
 		{
 			sessionInfoProv.setDestSelectedDatabaseObjects(dbObjs);
 		}
 		else
 		{
-
 			// User didn't 'select' any objects in a different session to compare. If there are two objects
 			// that are selected in this session, then compare them. Otherwise, we need to inform the user
 			// how object selection in the diff plugin works.
 			if (dbObjs.length == 2)
 			{
-
 				sessionInfoProv.setSourceSession(destSession);
 				sessionInfoProv.setSourceSelectedDatabaseObjects(new IDatabaseObjectInfo[] { dbObjs[0] });
 				sessionInfoProv.setDestSession(destSession);
 				sessionInfoProv.setDestSelectedDatabaseObjects(new IDatabaseObjectInfo[] { dbObjs[1] });
-
 			}
 			else
 			{
-				// TODO: tell the user what we expected.
+				destSession.showErrorMessage("To compare, you must have exactly two tables selected in the "
+					+ "object tree");
 			}
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.