[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe MainFrameMenuBar.java,1.13,1.14

[Colin B. <co...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23781/app/src/net/sourceforge/squirrel_sql/client/mainframe

Modified Files:
	MainFrameMenuBar.java 
Log Message:
If OSX plugin loaded then make app look a little more Mac like

Index: MainFrameMenuBar.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/MainFrameMenuBar.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MainFrameMenuBar.java	22 Apr 2004 20:02:37 -0000	1.13
--- MainFrameMenuBar.java	12 Aug 2004 11:41:13 -0000	1.14
***************
*** 30,33 ****
--- 30,34 ----
  import net.sourceforge.squirrel_sql.fw.gui.action.IHasJDesktopPane;
  import net.sourceforge.squirrel_sql.fw.util.Resources;
+ import net.sourceforge.squirrel_sql.fw.util.SystemProperties;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
***************
*** 62,65 ****
--- 63,69 ----
  import net.sourceforge.squirrel_sql.client.mainframe.action.ViewHelpAction;
  import net.sourceforge.squirrel_sql.client.mainframe.action.ViewLogsAction;
+ import net.sourceforge.squirrel_sql.client.plugin.PluginInfo;
+ import net.sourceforge.squirrel_sql.client.plugin.PluginManager;
+ import net.sourceforge.squirrel_sql.client.plugin.PluginStatus;
  import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
  import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
***************
*** 110,113 ****
--- 114,119 ----
  	private SquirrelPropertiesListener _propsLis;
  
+ 	private final boolean _osxPluginLoaded;
+ 
  	/**
  	 * Ctor.
***************
*** 141,144 ****
--- 147,151 ----
  
  		_app = app;
+ 		_osxPluginLoaded = isOsxPluginLoaded();
  
  		add(createFileMenu(rsrc));
***************
*** 286,295 ****
  	{
  		JMenu menu = rsrc.createMenu(SquirrelResources.IMenuResourceKeys.FILE);
! 		addToMenu(rsrc, GlobalPreferencesAction.class, menu);
  		addToMenu(rsrc, NewSessionPropertiesAction.class, menu);
  		menu.addSeparator();
  		addToMenu(rsrc, DumpApplicationAction.class, menu);
  		menu.addSeparator();
! 		addToMenu(rsrc, ExitAction.class, menu);
  		return menu;
  	}
--- 293,309 ----
  	{
  		JMenu menu = rsrc.createMenu(SquirrelResources.IMenuResourceKeys.FILE);
! 		if (!_osxPluginLoaded)
! 		{
! 			addToMenu(rsrc, GlobalPreferencesAction.class, menu);
! 		}
  		addToMenu(rsrc, NewSessionPropertiesAction.class, menu);
  		menu.addSeparator();
  		addToMenu(rsrc, DumpApplicationAction.class, menu);
  		menu.addSeparator();
! 		if (!_osxPluginLoaded)
! 		{
! 			addToMenu(rsrc, ExitAction.class, menu);
! 		}
! 
  		return menu;
  	}
***************
*** 392,396 ****
  
  		menu.addSeparator();
! 		addToMenu(rsrc, AboutAction.class, menu);
  		return menu;
  	}
--- 406,414 ----
  
  		menu.addSeparator();
! 		if (!_osxPluginLoaded)
! 		{
! 			addToMenu(rsrc, AboutAction.class, menu);
! 		}
! 
  		return menu;
  	}
***************
*** 471,474 ****
--- 489,510 ----
  	}
  
+ 	// TODO: This is a nasty quick hack. Needs an API to do this.
+ 	private boolean isOsxPluginLoaded()
+ 	{
+ 		if (SystemProperties.isRunningOnOSX())
+ 		{
+ 			final PluginManager mgr = _app.getPluginManager();
+ 			PluginInfo[] ar = mgr.getPluginInformation();
+ 			for (int i = 0; i < ar.length; ++i)
+ 			{
+ 				if (ar[i].getInternalName().equals("macosx"))
+ 				{
+ 					return ar[i].isLoaded();
+ 				}
+ 			}
+ 		}
+ 		return false;
+ 	}
+ 
  	/**
  	 * Listener for changes to Squirrel Properties.