[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action ToggleTreeViewAction.java, 1.1, 1.2

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

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

Modified Files:
	ToggleTreeViewAction.java 
Log Message:
Fixed the following NPE  :
java.lang.NullPointerException
	at net.sourceforge.squirrel_sql.client.mainframe.action.ToggleTreeViewAction.actionPerformed(ToggleTreeViewAction.java:37)
	at net.sourceforge.squirrel_sql.client.gui.db.AliasesListInternalFrame$UserInterfaceFactory$2.run(AliasesListInternalFrame.java:211)
	at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:597)
	at net.sourceforge.squirrel_sql.client.Application$1.dispatchEvent(Application.java:185)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:273)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:183)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:173)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:168)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:160)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:121)

Index: ToggleTreeViewAction.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action/ToggleTreeViewAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ToggleTreeViewAction.java	5 Jun 2008 01:25:27 -0000	1.1
--- ToggleTreeViewAction.java	27 Jul 2008 00:30:57 -0000	1.2
***************
*** 1,18 ****
  package net.sourceforge.squirrel_sql.client.mainframe.action;
  
  import net.sourceforge.squirrel_sql.client.IApplication;
  import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
! import net.sourceforge.squirrel_sql.client.gui.db.IAliasesList;
! import net.sourceforge.squirrel_sql.client.gui.db.IToogleableAliasesList;
  import net.sourceforge.squirrel_sql.client.gui.db.AliasesListInternalFrame;
  import net.sourceforge.squirrel_sql.fw.gui.IToggleAction;
  import net.sourceforge.squirrel_sql.fw.gui.ToggleComponentHolder;
  
- import java.awt.event.ActionEvent;
- 
  public class ToggleTreeViewAction extends SquirrelAction implements IToggleAction
  {
  
!    private ToggleComponentHolder _toogleComponentHolder;
     private IToogleableAliasesList _aliasesList;
  
--- 1,20 ----
  package net.sourceforge.squirrel_sql.client.mainframe.action;
  
+ import java.awt.event.ActionEvent;
+ 
  import net.sourceforge.squirrel_sql.client.IApplication;
  import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
! import net.sourceforge.squirrel_sql.client.gui.WindowManager;
  import net.sourceforge.squirrel_sql.client.gui.db.AliasesListInternalFrame;
+ import net.sourceforge.squirrel_sql.client.gui.db.IToogleableAliasesList;
  import net.sourceforge.squirrel_sql.fw.gui.IToggleAction;
  import net.sourceforge.squirrel_sql.fw.gui.ToggleComponentHolder;
  
  public class ToggleTreeViewAction extends SquirrelAction implements IToggleAction
  {
  
! 	private static final long serialVersionUID = 2767325027149049773L;
! 	
! 	private ToggleComponentHolder _toogleComponentHolder;
     private IToogleableAliasesList _aliasesList;
  
***************
*** 34,39 ****
     public void actionPerformed(ActionEvent evt)
     {
!       _aliasesList.setViewAsTree(_toogleComponentHolder.isSelected());   
!       getApplication().getWindowManager().getAliasesListInternalFrame().enableDisableActions();
     }
  }
\ No newline at end of file
--- 36,53 ----
     public void actionPerformed(ActionEvent evt)
     {
!       _aliasesList.setViewAsTree(_toogleComponentHolder.isSelected());
! 		IApplication application = getApplication();
! 		if (application != null)
! 		{
! 			WindowManager windowManager = application.getWindowManager();
! 			if (windowManager != null)
! 			{
! 				AliasesListInternalFrame aliasesListInternalFrame = windowManager.getAliasesListInternalFrame();
! 				if (aliasesListInternalFrame != null)
! 				{
! 					aliasesListInternalFrame.enableDisableActions();
! 				}
! 			}
! 		}
     }
  }
\ No newline at end of file