[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6282] trunk/sql12/fw/src

[<wi...@us...>]

Revision: 6282
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6282&view=rev
Author:   wis775
Date:     2011-06-01 18:55:13 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
Use  the right name for the action, if only one WIKI configuration is present.

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java
    trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java	2011-06-01 18:36:38 UTC (rev 6281)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java	2011-06-01 18:55:13 UTC (rev 6282)
@@ -109,9 +109,9 @@
 	 */
 	private JMenuItem createMenuForExactlyOneConfiguration(ITableActionCallback callback,
 			IWikiTableConfiguration configuration) {
-		JMenuItem item = new JMenuItem(s_stringMgr.getString("TablePopupMenu.copyaswikitableSpecific", configuration.getName()));
-		item.setAction(new CopyWikiTableAction(configuration .getName(), configuration, callback));
-		return item;
+		String actionName = s_stringMgr.getString("TablePopupMenu.copyaswikitableSpecific", configuration.getName());
+		CopyWikiTableAction action = new CopyWikiTableAction(actionName, configuration, callback);
+		return new JMenuItem(action);
 	}
 
 

Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java	2011-06-01 18:36:38 UTC (rev 6281)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java	2011-06-01 18:55:13 UTC (rev 6282)
@@ -105,6 +105,7 @@
 		JMenuItem menuItem = classUnderTest.createMenueItem(mockCallback);
 		assertNotNull(menuItem);
 		assertEquals(JMenuItem.class, menuItem.getClass());
+		assertEquals("Copy as WIKI table (MockConfig)", menuItem.getText());
 	}	
 	
 	


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