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

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26098/app/src/net/sourceforge/squirrel_sql/client/gui/db

Modified Files:
      Tag: squirrel_3_0_branch
	JTreeAliasesListImpl.java 
Log Message:
Merged from trunk: Error in Alias tree: Alias vanished / rose error when dragged on itself.

Index: JTreeAliasesListImpl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** JTreeAliasesListImpl.java	1 Jan 2009 20:26:02 -0000	1.10
--- JTreeAliasesListImpl.java	18 Nov 2009 01:43:37 -0000	1.10.2.1
***************
*** 821,830 ****
        DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
  
!       DefaultMutableTreeNode[] cutNodes = new DefaultMutableTreeNode[pathsToPaste.length];
  
        for (int i = 0; i < pathsToPaste.length; i++)
        {
!          cutNodes[i] = (DefaultMutableTreeNode) pathsToPaste[i].getLastPathComponent();
!          dtm.removeNodeFromParent(cutNodes[i]);
        }
  
--- 821,834 ----
        DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
  
!       ArrayList<DefaultMutableTreeNode> cutNodes = new ArrayList<DefaultMutableTreeNode>();
  
        for (int i = 0; i < pathsToPaste.length; i++)
        {
!          if(false == pathsToPaste[i].equals(targetPath))
!          {
!             DefaultMutableTreeNode cutNode = (DefaultMutableTreeNode) pathsToPaste[i].getLastPathComponent();
!             cutNodes.add(cutNode);
!             dtm.removeNodeFromParent(cutNode);
!          }
        }
  
***************
*** 833,839 ****
           DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
  
!          for (int i = 0; i < cutNodes.length; i++)
           {
!             root.add(cutNodes[i]);
           }
           dtm.nodeStructureChanged(root);
--- 837,843 ----
           DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
  
!          for (int i = 0; i < cutNodes.size(); i++)
           {
!             root.add(cutNodes.get(i));
           }
           dtm.nodeStructureChanged(root);
***************
*** 846,852 ****
           {
              DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selNode.getParent();
!             for (int i = 0; i < cutNodes.length; i++)
              {
!                parent.insert(cutNodes[i], parent.getIndex(selNode) + 1);
              }
              dtm.nodeStructureChanged(parent);
--- 850,856 ----
           {
              DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selNode.getParent();
!             for (int i = 0; i < cutNodes.size(); i++)
              {
!                parent.insert(cutNodes.get(i), parent.getIndex(selNode) + 1);
              }
              dtm.nodeStructureChanged(parent);
***************
*** 855,861 ****
           else
           {
!             for (int i = 0; i < cutNodes.length; i++)
              {
!                selNode.add(cutNodes[i]);
              }
              dtm.nodeStructureChanged(selNode);
--- 859,865 ----
           else
           {
!             for (int i = 0; i < cutNodes.size(); i++)
              {
!                selNode.add(cutNodes.get(i));
              }
              dtm.nodeStructureChanged(selNode);
***************
*** 863,870 ****
        }
  
!       TreePath[] newSelPaths = new TreePath[cutNodes.length];
        for (int i = 0; i < newSelPaths.length; i++)
        {
!          newSelPaths[i] = new TreePath(cutNodes[i].getPath());
        }
        _tree.setSelectionPaths(newSelPaths);
--- 867,874 ----
        }
  
!       TreePath[] newSelPaths = new TreePath[cutNodes.size()];
        for (int i = 0; i < newSelPaths.length; i++)
        {
!          newSelPaths[i] = new TreePath(cutNodes.get(i).getPath());
        }
        _tree.setSelectionPaths(newSelPaths);