Author: nextgens
Date: 2008-08-15 12:20:53 +0000 (Fri, 15 Aug 2008)
New Revision: 21898
Modified:
trunk/freenet/src/freenet/support/HTMLNode.java
Log:
Simplify the logic
Modified: trunk/freenet/src/freenet/support/HTMLNode.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLNode.java 2008-08-15 12:18:25 UTC
(rev 21897)
+++ trunk/freenet/src/freenet/support/HTMLNode.java 2008-08-15 12:20:53 UTC
(rev 21898)
@@ -161,8 +161,16 @@
}
public StringBuilder generate(StringBuilder tagBuffer) {
- if ("#".equals(name) && (content != null)) {
- HTMLEncoder.encodeToBuffer(content, tagBuffer);
+ if("#".equals(name)) {
+ if(content != null) {
+ HTMLEncoder.encodeToBuffer(content, tagBuffer);
+ return tagBuffer;
+ }
+
+ for(int childIndex = 0, childCount = children.size();
childIndex < childCount; childIndex++) {
+ HTMLNode childNode = children.get(childIndex);
+ childNode.generate(tagBuffer);
+ }
return tagBuffer;
}
// Perhaps this should be something else, but since I don't
know if '#' was not just arbitrary chosen, I'll just pick '%'
@@ -171,13 +179,6 @@
tagBuffer.append(content);
return tagBuffer;
}
- if ("#".equals(name)) {
- for (int childIndex = 0, childCount = children.size();
childIndex < childCount; childIndex++) {
- HTMLNode childNode = children.get(childIndex);
- childNode.generate(tagBuffer);
- }
- return tagBuffer;
- }
tagBuffer.append('<').append(name);
Set attributeSet = attributes.entrySet();
for (Iterator attributeIterator = attributeSet.iterator();
attributeIterator.hasNext();) {
