[Jsxe-cvs] SF.net SVN: jsxe: [979] trunk/treeview

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

Revision: 979
Author:   ian_lewis
Date:     2006-06-25 10:23:01 -0700 (Sun, 25 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/jsxe/?rev=979&view=rev

Log Message:
-----------
Feature Request 1494444: updated so that if no attributes are defined then the edit node dialog is not displayed

Modified Paths:
--------------
    trunk/treeview/Changelog
    trunk/treeview/src/treeview/action/AddNodeAction.java
Modified: trunk/treeview/Changelog
===================================================================
--- trunk/treeview/Changelog	2006-06-23 19:44:35 UTC (rev 978)
+++ trunk/treeview/Changelog	2006-06-25 17:23:01 UTC (rev 979)
@@ -1,3 +1,9 @@
+06/25/2006  Ian Lewis   <Ian...@me...>
+
+    * Feature Request 1494444: Updated the tree view so that if no attributes
+      are defined in the Schema/DTD for the element then the Edit Node dialog
+      will not be displayed.
+
 06/23/2006  Ian Lewis   <Ian...@me...>
 
     * Added back rudimentary key bindings using Swing Actions so they get

Modified: trunk/treeview/src/treeview/action/AddNodeAction.java
===================================================================
--- trunk/treeview/src/treeview/action/AddNodeAction.java	2006-06-23 19:44:35 UTC (rev 978)
+++ trunk/treeview/src/treeview/action/AddNodeAction.java	2006-06-25 17:23:01 UTC (rev 979)
@@ -117,15 +117,19 @@
             if (selectedNode != null) {
                 try {
                     if (m_element != null) {
-                        EditTagDialog dialog = new EditTagDialog(jsXe.getActiveView(),
-                                                                 m_element,
-                                                                 new HashMap(),
-                                                                 m_element.empty,
-                                                                 m_element.completionInfo.getEntityHash(),
-                                                                 new ArrayList(), //don't support IDs for now.
-                                                                 selectedNode.getOwnerDocument());
-                        dialog.show();
-                        addedNode = selectedNode.addAdapterNode(dialog.getNewNode());
+                        if (m_element.getAttributes().size() > 0) {
+                            EditTagDialog dialog = new EditTagDialog(jsXe.getActiveView(),
+                                                                     m_element,
+                                                                     new HashMap(),
+                                                                     m_element.empty,
+                                                                     m_element.completionInfo.getEntityHash(),
+                                                                     new ArrayList(), //don't support IDs for now.
+                                                                     selectedNode.getOwnerDocument());
+                            dialog.show();
+                            addedNode = selectedNode.addAdapterNode(dialog.getNewNode());
+                        } else {
+                            addedNode = selectedNode.addAdapterNode(m_element.name, null, AdapterNode.ELEMENT_NODE, selectedNode.childCount());
+                        }
                     } else {
                         //add the node of the correct type to the end of the children of this node
                         addedNode = selectedNode.addAdapterNode(m_name, m_value, m_nodeType, selectedNode.childCount());


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