svn commit: r707503 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java

[hlship]

Author: hlship
Date: Thu Oct 23 16:35:29 2008
New Revision: 707503

URL: http://svn.apache.org/viewvc?rev=707503&view=rev
Log:
TAP5-290: Namespace error when partial-updating a zone with a block

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java?rev=707503&r1=707502&r2=707503&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
 Thu Oct 23 16:35:29 2008
@@ -302,41 +302,35 @@
 
         builder.append("<").append(prefixedElementName);
 
-        if (attributes != null)
-        {
-            List<String> keys = InternalUtils.sortedKeys(attributes);
+        List<String> keys = InternalUtils.sortedKeys(attributes);
 
-            for (String key : keys)
-            {
-                Attribute attribute = attributes.get(key);
+        for (String key : keys)
+        {
+            Attribute attribute = attributes.get(key);
 
-                attribute.render(markupModel, builder, namespaceToPrefixMap);
-            }
+            attribute.render(markupModel, builder, namespaceToPrefixMap);
         }
 
         // Next, emit namespace declarations for each namespace.
 
-        if (namespaceToPrefix != null)
-        {
-            List<String> namespaces = 
InternalUtils.sortedKeys(namespaceToPrefix);
+        List<String> namespaces = InternalUtils.sortedKeys(namespaceToPrefix);
 
-            for (String namespace : namespaces)
-            {
-                String prefix = namespaceToPrefix.get(namespace);
+        for (String namespace : namespaces)
+        {
+            String prefix = namespaceToPrefix.get(namespace);
 
-                builder.append(" xmlns");
+            builder.append(" xmlns");
 
-                if (!prefix.equals(""))
-                {
-                    builder.append(":").append(prefix);
-                }
+            if (!prefix.equals(""))
+            {
+                builder.append(":").append(prefix);
+            }
 
-                builder.append("=\"");
+            builder.append("=\"");
 
-                markupModel.encodeQuoted(namespace, builder);
+            markupModel.encodeQuoted(namespace, builder);
 
-                builder.append('"');
-            }
+            builder.append('"');
         }
 
         EndTagStyle style = markupModel.getEndTagStyle(name);
@@ -602,7 +596,7 @@
 
     private void addMappingIfNeeded(Map<String, String> masterURItoPrefixMap, 
String namespace)
     {
-        if (namespace == null) return;
+        if (InternalUtils.isBlank(namespace)) return;
 
         if (masterURItoPrefixMap.containsKey(namespace)) return;