[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db AliasFolderState.java, 1.4, 1.5

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3797/app/src/net/sourceforge/squirrel_sql/client/gui/db

Modified Files:
	AliasFolderState.java 
Log Message:
Fixed startup error

Index: AliasFolderState.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/AliasFolderState.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AliasFolderState.java	27 Dec 2008 19:20:53 -0000	1.4
--- AliasFolderState.java	30 Nov 2009 23:02:55 -0000	1.5
***************
*** 148,162 ****
     public void applyExpansionAndSelection(JTree tree)
     {
!       if (null != _folderName)
        {
!          applyExpansionAndSelectionToNode(tree, _node);
!          for (AliasFolderState kid : _kids)
           {
!             kid.applyExpansionAndSelection(tree);
           }
-       }
-       else
-       {
-          applyExpansionAndSelectionToNode(tree, _node);
        }
     }
--- 148,168 ----
     public void applyExpansionAndSelection(JTree tree)
     {
!       if (_node != null)
        {
!          // _node is null when there is an _aliasIdentifier with no Alias
!          // This has been seen some times and caused NullPointersHere  
! 
!          if (null != _folderName)
           {
!             applyExpansionAndSelectionToNode(tree, _node);
!             for (AliasFolderState kid : _kids)
!             {
!                kid.applyExpansionAndSelection(tree);
!             }
!          }
!          else
!          {
!             applyExpansionAndSelectionToNode(tree, _node);
           }
        }
     }