Author: jcompagner
Date: Sun Dec 16 09:37:56 2007
New Revision: 604660
URL: http://svn.apache.org/viewvc?rev=604660&view=rev
Log:
code cleanup: WICKET-830
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java?rev=604660&r1=604659&r2=604660&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
Sun Dec 16 09:37:56 2007
@@ -477,17 +477,17 @@
*/
public void putAll(final Map map)
{
- for (final Iterator iterator = map.keySet().iterator();
iterator.hasNext();)
+ for (final Iterator iterator = map.entrySet().iterator();
iterator.hasNext();)
{
- final String key = (String)iterator.next();
- Object value = map.get(key);
- put(key, (value != null) ? value.toString() : null);
+ final Map.Entry entry = (Map.Entry) iterator.next();
+ Object value = entry.getValue();
+ put((String) entry.getKey(), (value != null) ?
value.toString() : null);
}
}
/**
* Removes an attribute.
- *
+ *
* @param key
* The key to remove
*/
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java?rev=604660&r1=604659&r2=604660&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
Sun Dec 16 09:37:56 2007
@@ -407,10 +407,11 @@
Map actualAttributes =
parser.getAttributes();
Map expectedAttributes =
workingTag.getExpectedAttributes();
- for (Iterator it =
expectedAttributes.keySet().iterator(); it.hasNext();)
+ for (Iterator it =
expectedAttributes.entrySet().iterator(); it.hasNext();)
{
- String name = (String)it.next();
- String pattern =
(String)expectedAttributes.get(name);
+ Map.Entry entry = (Map.Entry)
it.next();
+ String name = (String)
entry.getKey();
+ String pattern =
(String)entry.getValue();
if
(!actualAttributes.containsKey(name))
{
log.error("Tag <" +
workingTag.getTag() + "> was expected to have a '" +
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java?rev=604660&r1=604659&r2=604660&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
Sun Dec 16 09:37:56 2007
@@ -261,17 +261,19 @@
{
StringBuffer failString = new StringBuffer();
- for (Iterator iter = files.keySet().iterator();
iter.hasNext();)
+ for (Iterator iter = files.entrySet().iterator();
iter.hasNext();)
{
- ILicenseHeaderHandler licenseHeaderHandler =
(ILicenseHeaderHandler)iter.next();
+ Map.Entry entry = (Map.Entry) iter.next();
+
+ ILicenseHeaderHandler licenseHeaderHandler =
(ILicenseHeaderHandler) entry.getKey();
+ List/* <File> */fileList = (List)
entry.getValue();
failString.append("\n");
failString.append(licenseHeaderHandler.getClass().getName());
failString.append(" failed. The following
files(");
-
failString.append(((List)files.get(licenseHeaderHandler)).size());
+ failString.append(fileList.size());
failString.append(") didn't have correct
license header:\n");
- List/* <File> */fileList =
(List)files.get(licenseHeaderHandler);
for (Iterator iterator = fileList.iterator();
iterator.hasNext();)
{
File file = (File)iterator.next();
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java?rev=604660&r1=604659&r2=604660&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
Sun Dec 16 09:37:56 2007
@@ -17,6 +17,7 @@
package org.apache.wicket.util.tester;
import java.util.Iterator;
+import java.util.Map;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.MarkupElement;
@@ -382,11 +383,13 @@
{
IValueMap attributeMap
= xmlTag.getAttributes();
- for (Iterator iter =
attributeMap.keySet().iterator(); iter.hasNext();)
+ for (Iterator iter =
attributeMap.entrySet().iterator(); iter.hasNext();)
{
- String attr =
(String)iter.next();
+ Map.Entry entry
= (Map.Entry) iter.next();
- if
(attr.equals(attribute) && value.equals(attributeMap.get(attr)))
+ String attr =
(String) entry.getKey();
+
+ if
(attr.equals(attribute) && value.equals(entry.getValue()))
{
if
(xmlTag.isOpen())
{
