[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db JTreeAliasesListImpl.java, 1.11, 1.12

[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-serv1806/app/src/net/sourceforge/squirrel_sql/client/gui/db

Modified Files:
	JTreeAliasesListImpl.java 
Log Message:
RSyntax editor integration

Index: JTreeAliasesListImpl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JTreeAliasesListImpl.java	15 Nov 2009 13:18:40 -0000	1.11
--- JTreeAliasesListImpl.java	29 Nov 2009 21:17:54 -0000	1.12
***************
*** 329,334 ****
  
        DefaultMutableTreeNode parent = (DefaultMutableTreeNode) delNode.getParent();
        treeModel.removeNodeFromParent(delNode);
!       treeModel.nodeStructureChanged(parent);
  
        if(null != nextToSel)
--- 329,337 ----
  
        DefaultMutableTreeNode parent = (DefaultMutableTreeNode) delNode.getParent();
+       int indexOfChild = treeModel.getIndexOfChild(parent, delNode);
        treeModel.removeNodeFromParent(delNode);
! 
!       treeModel.nodesWereRemoved(parent, new int[]{indexOfChild}, new Object[]{delNode});
!       //treeModel.nodeStructureChanged(parent);
  
        if(null != nextToSel)
***************
*** 485,491 ****
                 removeAllAliasesFromNode(selNode);
  
-                selNode.removeFromParent();
                 DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
!                dtm.nodeStructureChanged(parent);
              }
           }
--- 488,496 ----
                 removeAllAliasesFromNode(selNode);
  
                 DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
!                int indexOfChild = dtm.getIndexOfChild(parent, selNode);
!                selNode.removeFromParent();
!                dtm.nodesWereRemoved(parent, new int[]{indexOfChild}, new Object[]{selNode});
!                //dtm.nodeStructureChanged(parent);
              }
           }
***************
*** 671,676 ****
           {
              DefaultMutableTreeNode parent = (DefaultMutableTreeNode) tn.getParent();
!             parent.insert(newFolder, parent.getIndex(tn) + 1);
!             treeModel.nodeStructureChanged(parent);
           }
           else
--- 676,682 ----
           {
              DefaultMutableTreeNode parent = (DefaultMutableTreeNode) tn.getParent();
!             int childIndex = parent.getIndex(tn) + 1;
!             parent.insert(newFolder, childIndex);
!             treeModel.nodesWereInserted(parent, new int[]{childIndex});
           }
           else
***************
*** 683,688 ****
        {
           DefaultMutableTreeNode root = (DefaultMutableTreeNode) _tree.getModel().getRoot();
           root.add(newFolder);
!          treeModel.nodeStructureChanged(root);
        }
  
--- 689,696 ----
        {
           DefaultMutableTreeNode root = (DefaultMutableTreeNode) _tree.getModel().getRoot();
+ 
+          int[] childIndices = new int[]{root.getChildCount()};
           root.add(newFolder);
!          treeModel.nodesWereInserted(root, childIndices);
        }
  
***************
*** 837,845 ****
           DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
  
           for (int i = 0; i < cutNodes.size(); i++)
           {
              root.add(cutNodes.get(i));
           }
!          dtm.nodeStructureChanged(root);
        }
        else
--- 845,856 ----
           DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
  
+          int[] childIndices = new int[cutNodes.size()];
           for (int i = 0; i < cutNodes.size(); i++)
           {
+             childIndices[i] = root.getChildCount();
              root.add(cutNodes.get(i));
           }
!          //dtm.nodeStructureChanged(root);
!          dtm.nodesWereInserted(root, childIndices);
        }
        else