[Jsxe-cvs] SF.net SVN: jsxe: [1209] tags/05pre3/treeview

[<ian...@us...>]

Revision: 1209
          http://svn.sourceforge.net/jsxe/?rev=1209&view=rev
Author:   ian_lewis
Date:     2006-08-30 20:18:53 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Merge from trunk rev. 1208

Modified Paths:
--------------
    tags/05pre3/treeview/Changelog
    tags/05pre3/treeview/dependency.props
    tags/05pre3/treeview/src/treeview/TreeViewTree.java
    tags/05pre3/treeview/src/treeview/action/CutNodeAction.java

Modified: tags/05pre3/treeview/Changelog
===================================================================
--- tags/05pre3/treeview/Changelog	2006-08-30 18:26:35 UTC (rev 1208)
+++ tags/05pre3/treeview/Changelog	2006-08-31 03:18:53 UTC (rev 1209)
@@ -1,3 +1,12 @@
+08/30/2006  Ian Lewis   <Ian...@me...>
+
+    * Fixed null pointer exception when trying to cut a node that can't be
+      cut.
+
+08/29/2006  Ian Lewis   <Ian...@me...>
+
+    * Updated japanese translation
+
 08/21/2006  Ian Lewis   <Ian...@me...>
 
     * Updated russian translation.

Modified: tags/05pre3/treeview/dependency.props
===================================================================
--- tags/05pre3/treeview/dependency.props	2006-08-30 18:26:35 UTC (rev 1208)
+++ tags/05pre3/treeview/dependency.props	2006-08-31 03:18:53 UTC (rev 1209)
@@ -1 +1 @@
-dependency.0=jsxe 00.05.03.00
+dependency.0=jsxe 00.05.04.00

Modified: tags/05pre3/treeview/src/treeview/TreeViewTree.java
===================================================================
--- tags/05pre3/treeview/src/treeview/TreeViewTree.java	2006-08-30 18:26:35 UTC (rev 1208)
+++ tags/05pre3/treeview/src/treeview/TreeViewTree.java	2006-08-31 03:18:53 UTC (rev 1209)
@@ -196,8 +196,8 @@
         Clipboard clipBoard = getToolkit().getSystemClipboard();
         if (selectedNode != null) {
             try {
-                clipBoard.setContents(new TransferableNode(selectedNode), this);
                 selectedNode.getParentNode().remove(selectedNode);
+                clipBoard.setContents(new TransferableNode(selectedNode), this);
                 updateUI();
                 return true;
             } catch (IllegalStateException e) {
@@ -205,7 +205,6 @@
             } catch (HeadlessException e) {
                 Log.log(Log.ERROR, this, e);
             } catch (DOMException e) {
-                clipBoard.setContents(null, this);
                 throw e;
             }
         }

Modified: tags/05pre3/treeview/src/treeview/action/CutNodeAction.java
===================================================================
--- tags/05pre3/treeview/src/treeview/action/CutNodeAction.java	2006-08-30 18:26:35 UTC (rev 1208)
+++ tags/05pre3/treeview/src/treeview/action/CutNodeAction.java	2006-08-31 03:18:53 UTC (rev 1209)
@@ -29,10 +29,7 @@
 import treeview.*;
 
 //{{{ AWT classes
-import java.awt.datatransfer.Clipboard;
 import java.awt.event.ActionEvent;
-import java.awt.Toolkit;
-import java.awt.HeadlessException;
 //}}}
 
 //{{{ Swing classes
@@ -52,6 +49,7 @@
 import net.sourceforge.jsxe.gui.DocumentView;
 import net.sourceforge.jsxe.gui.Messages;
 import net.sourceforge.jsxe.gui.TabbedView;
+import net.sourceforge.jsxe.gui.GUIUtilities;
 import net.sourceforge.jsxe.dom.AdapterNode;
 import net.sourceforge.jsxe.util.Log;
 //}}}
@@ -91,7 +89,7 @@
             try {
                 tree.cut();
             } catch (DOMException dome) {
-                JOptionPane.showMessageDialog(tree, dome, "XML Error", JOptionPane.WARNING_MESSAGE);
+                GUIUtilities.error(tree, "XML.Error", new Object[] { dome });
             }
         }
     }//}}}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.