Update of /var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/xmlbs
In directory james.mmbase.org:/tmp/cvs-serv25254/cmsc/richtext/src/java/xmlbs
Modified Files:
PropertiesDocumentStructure.java XMLBS.java
Log Message:
CMSC-852 Cleanup java files
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/java/xmlbs
See also: http://www.mmbase.org/jira/browse/CMSC-852
Index: PropertiesDocumentStructure.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/xmlbs/PropertiesDocumentStructure.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PropertiesDocumentStructure.java 26 Nov 2007 11:43:41 -0000 1.6
+++ PropertiesDocumentStructure.java 12 Apr 2008 14:26:07 -0000 1.7
@@ -95,8 +95,8 @@
// collect tag names
{
Set<Object> keys = prop.keySet();
- for (Iterator<Object> iter = keys.iterator(); iter.hasNext();) {
- String key = (String) iter.next();
+ for (Object object : keys) {
+ String key = (String) object;
if (!key.startsWith("_")) {
tagNames.add(key);
}
@@ -105,8 +105,7 @@
// create "master" map by resolving all includes
Map<String, List<String>> master = new HashMap<String, List<String>>();
- for (Iterator<String> it = tagNames.iterator(); it.hasNext();) {
- String key = it.next();
+ for (String key : tagNames) {
master.put(key, include(prop, key));
}
@@ -125,8 +124,7 @@
}
// create hierarchy map from master
- for (Iterator<String> it = tagNames.iterator(); it.hasNext();) {
- String key = it.next();
+ for (String key : tagNames) {
List<String> l = new ArrayList<String>(master.get(key));
// remove attribute info
for (Iterator<String> it0 = l.iterator(); it0.hasNext();) {
@@ -139,13 +137,11 @@
}
// create attribute map from master
- for (Iterator<String> it = tagNames.iterator(); it.hasNext();) {
- String key = it.next();
+ for (String key : tagNames) {
List<String> in = new ArrayList<String>(master.get(key));
List<String> l = new ArrayList<String>();
// copy attribute only info to list
- for (Iterator<String> it0 = in.iterator(); it0.hasNext();) {
- String key0 = it0.next();
+ for (String key0 : in) {
if (key0.startsWith("$")) {
l.add(key0.substring(1));
}
@@ -213,8 +209,7 @@
}
String in = name.toLowerCase();
- for (Iterator<String> it = tagNames.iterator(); it.hasNext();) {
- String n = it.next();
+ for (String n : tagNames) {
if (n.toLowerCase().equals(in)) {
return n;
}
@@ -243,8 +238,7 @@
// find a lower case match
String in = name.toLowerCase();
- for (Iterator<String> it = entityNames.iterator(); it.hasNext();) {
- String n = it.next();
+ for (String n : entityNames) {
if (n.toLowerCase().equals(in)) {
return n;
}
@@ -273,8 +267,7 @@
return attr;
}
String in = attr.toLowerCase();
- for (Iterator<String> it = names.iterator(); it.hasNext();) {
- String n = it.next();
+ for (String n : names) {
if (n.toLowerCase().equals(in)) {
return n;
}
Index: XMLBS.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/xmlbs/XMLBS.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- XMLBS.java 26 Nov 2007 11:43:41 -0000 1.5
+++ XMLBS.java 12 Apr 2008 14:26:07 -0000 1.6
@@ -151,8 +151,7 @@
throw new IllegalStateException();
}
- for (Iterator<Token> it = tokens.iterator(); it.hasNext();) {
- Token tok = it.next();
+ for (Token tok : tokens) {
out.write(tok.toString().getBytes());
}
out.flush();
@@ -432,8 +431,7 @@
// see if what's between last and this is whitespace
boolean allWhite = true;
List<Token> l = tokens.subList(lastPos + 1, i);
- for (Iterator<Token> it = l.iterator(); it.hasNext();) {
- Token t = it.next();
+ for (Token t : l) {
if (t instanceof CommentToken) {
continue;
}
@@ -561,8 +559,7 @@
* @return true if any parent open tag of given close tag
*/
public boolean hasOpenFor(TagToken tag) {
- for (Iterator<TagToken> it = trail.iterator(); it.hasNext();) {
- TagToken t = it.next();
+ for (TagToken t : trail) {
if (t.isSameTag(tag)) {
return true;
}
@@ -577,8 +574,7 @@
* @return true if any parent can contain given token
*/
public boolean hasContainerFor(Token tok) {
- for (Iterator<TagToken> it = trail.iterator(); it.hasNext();) {
- TagToken t = it.next();
+ for (TagToken t : trail) {
if (structure.canContain(t, tok)) {
return true;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
