Author: pete
Date: Wed Nov 24 01:15:34 2010
New Revision: 1038417
URL: http://svn.apache.org/viewvc?rev=1038417&view=rev
Log:
more java 5 goodness... where appropriate:
- replace String.indexOf() with String.contains()
- replace while with for-each
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/MarkupContainerTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
Wed Nov 24 01:15:34 2010
@@ -20,7 +20,6 @@ package org.apache.wicket.examples.libra
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -98,10 +97,8 @@ public final class Book implements IClus
private void add(final Book book)
{
boolean hit = false;
- final Iterator<Book> iter = idToBook.values().iterator();
- while (iter.hasNext())
+ for (Book value : idToBook.values())
{
- final Book value = iter.next();
if (value.toString().equals(book.toString()))
{
book.id = value.id;
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
Wed Nov 24 01:15:34 2010
@@ -134,10 +134,8 @@ public class MultiUploadPage extends Wic
@Override
protected void onSubmit()
{
- Iterator<FileUpload> it = uploads.iterator();
- while (it.hasNext())
+ for (FileUpload upload : uploads)
{
- final FileUpload upload = it.next();
// Create a new file
File newFile = new File(getUploadFolder(),
upload.getClientFileName());
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Wed Nov 24 01:15:34 2010
@@ -652,7 +652,7 @@ public class ModalWindow extends Panel
*/
public ModalWindow setCookieName(String cookieName)
{
- if (cookieName != null && cookieName.indexOf(",") != -1 &&
cookieName.indexOf("|") != -1)
+ if (cookieName != null && cookieName.contains(",") &&
cookieName.contains("|"))
{
throw new IllegalArgumentException("Cookie name may not
contain ',' or '|' characters.");
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
Wed Nov 24 01:15:34 2010
@@ -60,10 +60,8 @@ public class LinkParser implements ILink
}
String work = text;
- Iterator<String> iter = renderStrategies.keySet().iterator();
- while (iter.hasNext())
+ for (String pattern : renderStrategies.keySet())
{
- String pattern = iter.next();
ILinkRenderStrategy strategy =
renderStrategies.get(pattern);
Matcher matcher = Pattern.compile(pattern,
Pattern.DOTALL).matcher(work);
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
Wed Nov 24 01:15:34 2010
@@ -179,10 +179,8 @@ public class Recorder<T> extends HiddenF
}
List<T> unselected = new ArrayList<T>(Math.max(1,
choices.size() - ids.length));
- Iterator<? extends T> it = choices.iterator();
- while (it.hasNext())
+ for (T choice : choices)
{
- final T choice = it.next();
final String choiceId = renderer.getIdValue(choice, 0);
boolean selected = false;
for (String id : ids)
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
Wed Nov 24 01:15:34 2010
@@ -25,7 +25,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.WildcardCollectionModel;
import java.util.Collection;
-import java.util.Iterator;
/**
@@ -110,9 +109,8 @@ public class SelectOptions<T> extends Re
}
// iterator over model objects for SelectOption
components
- Iterator<? extends T> it =
modelObject.iterator();
- while (it.hasNext())
+ for (T value : modelObject)
{
// we need a container to represent a
row in repeater
WebMarkupContainer row = new
WebMarkupContainer(newChildId());
@@ -120,7 +118,6 @@ public class SelectOptions<T> extends Re
add(row);
// we add our actual SelectOption
component to the row
- T value = it.next();
String text =
renderer.getDisplayValue(value);
IModel<T> model =
renderer.getModel(value);
row.add(newOption(text, model));
Modified:
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
(original)
+++
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
Wed Nov 24 01:15:34 2010
@@ -107,10 +107,8 @@ public class CompoundFieldValueFactory i
*/
public Object getFieldValue(Field field, Object fieldOwner)
{
- Iterator<IFieldValueFactory> it = delegates.iterator();
- while (it.hasNext())
+ for (IFieldValueFactory factory : delegates)
{
- final IFieldValueFactory factory = it.next();
Object object = factory.getFieldValue(field,
fieldOwner);
if (object != null)
{
@@ -125,10 +123,8 @@ public class CompoundFieldValueFactory i
*/
public boolean supportsField(Field field)
{
- Iterator<IFieldValueFactory> it = delegates.iterator();
- while (it.hasNext())
+ for (IFieldValueFactory factory : delegates)
{
- final IFieldValueFactory factory = it.next();
if (factory.supportsField(field))
{
return true;
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
Wed Nov 24 01:15:34 2010
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@@ -53,7 +52,7 @@ public class ApplicationContextMock impl
{
private static final long serialVersionUID = 1L;
- private final Map beans = new HashMap();
+ private final Map<String, Object> beans = new HashMap<String, Object>();
/**
* puts bean with the given name into the context
@@ -114,10 +113,8 @@ public class ApplicationContextMock impl
{
Map found = new HashMap();
- Iterator it = beans.entrySet().iterator();
- while (it.hasNext())
+ for (Entry entry : beans.entrySet())
{
- final Map.Entry entry = (Entry)it.next();
if (type.isAssignableFrom(entry.getValue().getClass()))
{
found.put(entry.getKey(), entry.getValue());
@@ -192,16 +189,13 @@ public class ApplicationContextMock impl
public String[] getBeanNamesForType(Class type)
{
ArrayList names = new ArrayList();
- Iterator entries = beans.entrySet().iterator();
- while (entries.hasNext())
+ for (Entry<String, Object> entry : beans.entrySet())
{
- Entry entry = (Entry)entries.next();
Object bean = entry.getValue();
if (type.isAssignableFrom(bean.getClass()))
{
- String name = (String)entry.getKey();
- names.add(name);
+ names.add(entry.getKey());
}
}
return (String[])names.toArray(new String[names.size()]);
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
Wed Nov 24 01:15:34 2010
@@ -52,7 +52,6 @@ package org.apache.wicket.util.diff;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
/**
@@ -277,10 +276,9 @@ public class Chunk extends ToString
*/
public void applyAdd(int start, List<Object> target)
{
- Iterator<Object> i = chunk.iterator();
- while (i.hasNext())
+ for (Object aChunk : chunk)
{
- target.add(start++, i.next());
+ target.add(start++, aChunk);
}
}
@@ -310,11 +308,10 @@ public class Chunk extends ToString
{
if (chunk != null)
{
- Iterator<?> i = chunk.iterator();
- while (i.hasNext())
+ for (Object aChunk : chunk)
{
s.append(prefix);
- s.append(i.next());
+ s.append(aChunk);
s.append(postfix);
}
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
Wed Nov 24 01:15:34 2010
@@ -188,10 +188,9 @@ public class Revision extends ToString
@Override
public synchronized void toString(StringBuilder s)
{
- Iterator<Delta> i = deltas_.iterator();
- while (i.hasNext())
+ for (Delta delta : deltas_)
{
- (i.next()).toString(s);
+ delta.toString(s);
}
}
@@ -206,10 +205,9 @@ public class Revision extends ToString
*/
public synchronized void toRCSString(StringBuilder s, String EOL)
{
- Iterator<Delta> i = deltas_.iterator();
- while (i.hasNext())
+ for (Delta deltas : deltas_)
{
- (i.next()).toRCSString(s, EOL);
+ deltas.toRCSString(s, EOL);
}
}
@@ -259,10 +257,9 @@ public class Revision extends ToString
public void accept(RevisionVisitor visitor)
{
visitor.visit(this);
- Iterator<Delta> iter = deltas_.iterator();
- while (iter.hasNext())
+ for (Delta delta : deltas_)
{
- (iter.next()).accept(visitor);
+ delta.accept(visitor);
}
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
Wed Nov 24 01:15:34 2010
@@ -103,11 +103,11 @@ class JavaLicenseHeaderHandler extends A
String header = extractLicenseHeader(file, 0, 20);
// Check for some of the known license types:
- if (header.indexOf("Apache License, Version 2.0") != -1)
+ if (header.contains("Apache License, Version 2.0"))
{
licenseType = "ASL2";
}
- else if (header.indexOf("The Apache Software License, Version
1.1") != -1)
+ else if (header.contains("The Apache Software License, Version
1.1"))
{
licenseType = "ASL1.1";
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
Wed Nov 24 01:15:34 2010
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -83,10 +82,8 @@ public class XSLTResourceStream extends
Map<Object, Object> parameters = getParameters();
if (parameters != null)
{
- Iterator<Entry<Object, Object>> it =
parameters.entrySet().iterator();
- while (it.hasNext())
+ for (Entry<Object, Object> e :
parameters.entrySet())
{
- Entry<Object, Object> e = it.next();
trans.setParameter(e.getKey().toString(), e.getValue().toString());
}
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java
Wed Nov 24 01:15:34 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.util.watch;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -147,11 +146,8 @@ public class ModificationWatcher impleme
{
public void run(final Logger log)
{
- Iterator<Entry> iter =
modifiableToEntry.values().iterator();
- while (iter.hasNext())
+ for (Entry entry : modifiableToEntry.values())
{
- final Entry entry = iter.next();
-
// If the modifiable has been modified
after the last known
// modification time
final Time modifiableLastModified =
entry.modifiable.lastModifiedTime();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
Wed Nov 24 01:15:34 2010
@@ -86,10 +86,8 @@ public class ReloadingClassLoader extend
{
// See if it matches include patterns
tryHere = false;
- Iterator<String> includesIterator = patterns.iterator();
- while (includesIterator.hasNext())
+ for (String rawpattern : patterns)
{
- String rawpattern = includesIterator.next();
if (rawpattern.length() <= 1)
{
continue;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
Wed Nov 24 01:15:34 2010
@@ -688,10 +688,8 @@ public class ComponentTag extends Markup
if (getAttributes().size() > 0)
{
- final Iterator<String> iterator =
getAttributes().keySet().iterator();
- while (iterator.hasNext())
+ for (String key : getAttributes().keySet())
{
- final String key = iterator.next();
if (key == null)
{
continue;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java Wed
Nov 24 01:15:34 2010
@@ -211,10 +211,9 @@ public class Markup implements IMarkupFr
buf.append("\n");
}
- final Iterator<MarkupElement> iter = markupElements.iterator();
- while (iter.hasNext())
+ for (MarkupElement markupElement : markupElements)
{
- buf.append(iter.next());
+ buf.append(markupElement);
}
return buf.toString();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
Wed Nov 24 01:15:34 2010
@@ -38,7 +38,6 @@ import org.apache.wicket.util.upload.Fil
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -234,12 +233,10 @@ public class MultiFileUploadField extend
{
// retrieve the filename->FileItem map from
request
final Map<String, FileItem> itemNameToItem =
((IMultipartWebRequest)request).getFiles();
- Iterator<Entry<String, FileItem>> it =
itemNameToItem.entrySet().iterator();
- while (it.hasNext())
+ for (Entry<String, FileItem> entry :
itemNameToItem.entrySet())
{
// iterate over the map and build the
list of filenames
- final Entry<String, FileItem> entry =
it.next();
final String name = entry.getKey();
final FileItem item = entry.getValue();
@@ -334,10 +331,8 @@ public class MultiFileUploadField extend
Collection<FileUpload> uploads = getConvertedInput();
if (uploads != null)
{
- Iterator<FileUpload> it = uploads.iterator();
- while (it.hasNext())
+ for (FileUpload upload : uploads)
{
- final FileUpload upload = it.next();
upload.closeStreams();
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
Wed Nov 24 01:15:34 2010
@@ -253,7 +253,7 @@ public class Image extends WebComponent
protected final void addAntiCacheParameter(final ComponentTag tag)
{
String url = tag.getAttributes().getString("src");
- url = url + ((url.indexOf("?") >= 0) ? "&" : "?");
+ url = url + (url.contains("?") ? "&" : "?");
url = url + "wicket:antiCache=" + System.currentTimeMillis();
tag.put("src", url);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/TagAttributes.java
Wed Nov 24 01:15:34 2010
@@ -93,10 +93,9 @@ public class TagAttributes extends Value
@Override
public final void putAll(Map map)
{
- Iterator<?> iter = map.keySet().iterator();
- while (iter.hasNext())
+ for (Object o : map.keySet())
{
- String key = (String)iter.next();
+ String key = (String)o;
checkIdAttribute(key);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
Wed Nov 24 01:15:34 2010
@@ -98,10 +98,8 @@ public final class HtmlProblemFinder ext
// Some people are using a dot "wicket.xxx" instead of a colon
// "wicket:xxx"
- Iterator<String> iter = tag.getAttributes().keySet().iterator();
- while (iter.hasNext())
+ for (String key : tag.getAttributes().keySet())
{
- String key = iter.next();
if (key != null)
{
key = key.toLowerCase();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
Wed Nov 24 01:15:34 2010
@@ -84,7 +84,7 @@ public final class RelativePathPrefixHan
String attrValue =
tag.getAttributes().getString(attrName);
if ((attrValue != null) &&
(attrValue.startsWith("/") == false) &&
- (attrValue.indexOf(":") < 0) &&
!(attrValue.startsWith("#")))
+ (!attrValue.contains(":")) &&
!(attrValue.startsWith("#")))
{
tag.getAttributes().put(attrName,
UrlUtils.rewriteToContextRelative(attrValue, RequestCycle.get()));
@@ -117,7 +117,7 @@ public final class RelativePathPrefixHan
{
String attrValue =
tag.getAttributes().getString(attrName);
if ((attrValue != null) && (attrValue.startsWith("/")
== false) &&
- (attrValue.indexOf(":") < 0) &&
!(attrValue.startsWith("#")))
+ (!attrValue.contains(":")) &&
!(attrValue.startsWith("#")))
{
if (tag.getId() == null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
Wed Nov 24 01:15:34 2010
@@ -198,7 +198,7 @@ public class WicketLinkTagHandler extend
*/
private final boolean checkRef(String ref)
{
- return (ref != null) && (ref.indexOf(":") == -1);
+ return (ref != null) && (!ref.contains(":"));
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
Wed Nov 24 01:15:34 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.parser.filter;
import java.text.ParseException;
-import java.util.Iterator;
import java.util.Map;
import org.apache.wicket.Application;
@@ -87,11 +86,8 @@ public final class WicketNamespaceHandle
{
// For all tags attributes
final IValueMap attributes = tag.getAttributes();
- final Iterator<Map.Entry<String, Object>> it =
attributes.entrySet().iterator();
- while (it.hasNext())
+ for (Map.Entry<String, Object> entry : attributes.entrySet())
{
- final Map.Entry<String, Object> entry = it.next();
-
// Find attributes with namespace "xmlns"
final String attributeName = entry.getKey();
if (attributeName.startsWith(XMLNS))
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
Wed Nov 24 01:15:34 2010
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.parser.
import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
@@ -157,10 +156,8 @@ public final class WicketTagIdentifier e
*/
private boolean isWellKnown(final XmlTag xmlTag)
{
- final Iterator<String> iterator = wellKnownTagNames.iterator();
- while (iterator.hasNext())
+ for (String name : wellKnownTagNames)
{
- final String name = iterator.next();
if (xmlTag.getName().equalsIgnoreCase(name))
{
return true;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
Wed Nov 24 01:15:34 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.resolver;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.wicket.Application;
@@ -329,10 +328,8 @@ public class WicketMessageResolver imple
getResponse().write(text);
// Make sure all of the children were rendered
- Iterator<String> iter = childTags.keySet().iterator();
- while (iter.hasNext())
+ for (String id : childTags.keySet())
{
- String id = iter.next();
if (variablesReplaced.containsKey(id) == false)
{
String msg = "The <wicket:message
key=\"" + key +
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
Wed Nov 24 01:15:34 2010
@@ -130,7 +130,7 @@ public class WebClientInfo extends Clien
}
else
{
- if (remoteAddr.indexOf(",") != -1)
+ if (remoteAddr.contains(","))
{
// sometimes the header is of form client
ip,proxy 1 ip,proxy 2 ip,...,proxy n ip,
// we just want the client
@@ -147,9 +147,9 @@ public class WebClientInfo extends Clien
{
String userAgent = (getUserAgent() != null) ?
getUserAgent().toLowerCase() : "";
- boolean browserChrome = userAgent.indexOf("chrome") != -1;
- boolean browserOpera = userAgent.indexOf("opera") != -1;
- boolean browserKonqueror = userAgent.indexOf("konqueror") != -1;
+ boolean browserChrome = userAgent.contains("chrome");
+ boolean browserOpera = userAgent.contains("opera");
+ boolean browserKonqueror = userAgent.contains("konqueror");
// Note deceptive user agent fields:
// - Konqueror and Chrome UA fields contain "like Gecko"
@@ -157,14 +157,14 @@ public class WebClientInfo extends Clien
// - Chrome UA field contains "Safari"
boolean deceptiveUserAgent = browserOpera || browserKonqueror
|| browserChrome;
- boolean browserSafari = !deceptiveUserAgent &&
userAgent.indexOf("safari") != -1;
+ boolean browserSafari = !deceptiveUserAgent &&
userAgent.contains("safari");
// -Safari UA fields contain "like Gecko"
deceptiveUserAgent = deceptiveUserAgent || browserSafari;
- boolean browserMozilla = !deceptiveUserAgent &&
userAgent.indexOf("gecko") != -1;
- boolean browserFireFox = userAgent.indexOf("firefox") != -1;
- boolean browserInternetExplorer = !deceptiveUserAgent &&
userAgent.indexOf("msie") != -1;
+ boolean browserMozilla = !deceptiveUserAgent &&
userAgent.contains("gecko");
+ boolean browserFireFox = userAgent.contains("firefox");
+ boolean browserInternetExplorer = !deceptiveUserAgent &&
userAgent.contains("msie");
int majorVersion = -1, minorVersion = -1;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
Wed Nov 24 01:15:34 2010
@@ -469,7 +469,7 @@ public abstract class AbstractResource i
String mimeType = data.getContentType();
String encoding = null;
- if (mimeType != null && mimeType.indexOf("text") != -1)
+ if (mimeType != null && mimeType.contains("text"))
{
encoding = data.getTextEncoding();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
Wed Nov 24 01:15:34 2010
@@ -290,10 +290,8 @@ public class PropertiesFactory implement
clearCache();
// Inform all listeners
- Iterator<IPropertiesChangeListener> iter =
afterReloadListeners.iterator();
- while (iter.hasNext())
+ for (IPropertiesChangeListener listener :
afterReloadListeners)
{
- IPropertiesChangeListener listener =
iter.next();
try
{
listener.propertiesChanged(path);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
Wed Nov 24 01:15:34 2010
@@ -18,7 +18,6 @@ package org.apache.wicket.util.file;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.servlet.ServletContext;
@@ -92,10 +91,8 @@ public final class WebApplicationPath im
*/
public IResourceStream find(final Class<?> clazz, final String pathname)
{
- Iterator<Folder> foldersIter = folders.iterator();
- while (foldersIter.hasNext())
+ for (Folder folder : folders)
{
- Folder folder = foldersIter.next();
final File file = new File(folder, pathname);
if (file.exists())
{
@@ -103,10 +100,8 @@ public final class WebApplicationPath im
}
}
- Iterator<String> webappPathsIter = webappPaths.iterator();
- while (webappPathsIter.hasNext())
+ for (String path : webappPaths)
{
- String path = webappPathsIter.next();
try
{
final URL url = servletContext.getResource(path
+ pathname);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
Wed Nov 24 01:15:34 2010
@@ -139,7 +139,7 @@ public class UrlResourceStream extends A
*/
private void testContentType()
{
- if (contentType == null || contentType.indexOf("unknown") != -1)
+ if (contentType == null || contentType.contains("unknown"))
{
Application application = Application.get();
if (application instanceof WebApplication)
@@ -232,7 +232,7 @@ public class UrlResourceStream extends A
}
catch (IOException e)
{
- if (url.toString().indexOf(".jar!") >= 0)
+ if (url.toString().contains(".jar!"))
{
if (log.isDebugEnabled())
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
Wed Nov 24 01:15:34 2010
@@ -82,7 +82,7 @@ public class ComponentStrings
if (!(traceString.startsWith("sun.reflect.") && i > 1))
{
// filter out reflection API calls from the
stack trace
- if (traceString.indexOf("java.lang.reflect") <
0)
+ if (!traceString.contains("java.lang.reflect"))
{
sb.append(" at ");
sb.append(traceString);
@@ -102,7 +102,7 @@ public class ComponentStrings
{
for (String filter : filters)
{
- if (text.indexOf(filter) >= 0)
+ if (text.contains(filter))
{
return true;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolator.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolator.java
Wed Nov 24 01:15:34 2010
@@ -66,7 +66,7 @@ public final class PropertyVariableInter
public static String interpolate(final String string, final Object
object)
{
// If there's any reason to go to the expense of property
expressions
- if (string.indexOf("${") != -1)
+ if (string.contains("${"))
{
// Do property expression interpolation
return new PropertyVariableInterpolator(string,
object).toString();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
Wed Nov 24 01:15:34 2010
@@ -169,7 +169,7 @@ public class TagTester
if (value != null)
{
- if (value.indexOf(partialValue) > -1)
+ if (value.contains(partialValue))
{
contains = true;
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/MarkupContainerTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MarkupContainerTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/MarkupContainerTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/MarkupContainerTest.java
Wed Nov 24 01:15:34 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket;
-import java.util.Iterator;
-
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -49,10 +47,8 @@ public class MarkupContainerTest extends
container.add(new WebComponent(Integer.toString(i)));
}
int i = 0;
- Iterator iter = container.iterator();
- while (iter.hasNext())
+ for (Component component : container)
{
- Component component = (Component)iter.next();
assertEquals(Integer.toString(i++), component.getId());
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
Wed Nov 24 01:15:34 2010
@@ -228,8 +228,8 @@ public class SimplePageTest extends Wick
hit = true;
assertNotNull(mex.getMarkupStream());
- assertTrue(mex.getMessage().indexOf("<span>") != -1);
-
assertTrue(mex.getMessage().indexOf("SimplePage_4.html") != -1);
+ assertTrue(mex.getMessage().contains("<span>"));
+
assertTrue(mex.getMessage().contains("SimplePage_4.html"));
}
assertTrue("Did expect a MarkupException", hit);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
Wed Nov 24 01:15:34 2010
@@ -222,8 +222,7 @@ public class CheckGroupTest extends Wick
}
catch (WicketRuntimeException e)
{
- if (e.getMessage().indexOf(
- "Check component [4:form:check2] cannot find
its parent CheckGroup") < 0)
+ if (!e.getMessage().contains("Check component
[4:form:check2] cannot find its parent CheckGroup"))
{
fail("failed with wrong exception");
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
Wed Nov 24 01:15:34 2010
@@ -199,8 +199,7 @@ public class RadioGroupTest extends Wick
}
catch (WicketRuntimeException e)
{
- if (e.getMessage().indexOf(
- "Radio component [1:form:radio2] cannot find
its parent RadioGroup") < 0)
+ if (!e.getMessage().contains("Radio component
[1:form:radio2] cannot find its parent RadioGroup"))
{
fail("failed with wrong exception");
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Wed Nov 24 01:15:34 2010
@@ -57,8 +57,8 @@ public class PanelTest extends WicketTes
hit = true;
assertNotNull(mex.getMarkupStream());
- assertTrue(mex.getMessage().indexOf("does not have a
close tag") != -1);
-
assertTrue(mex.getMessage().indexOf("SimplePanel_1.html") != -1);
+ assertTrue(mex.getMessage().contains("does not have a
close tag"));
+
assertTrue(mex.getMessage().contains("SimplePanel_1.html"));
}
assertTrue("Did expect a MarkupException", hit);
}
@@ -77,8 +77,8 @@ public class PanelTest extends WicketTes
{
hit = true;
- assertTrue(mex.getMessage().indexOf("Expected to find
<wicket:panel>") != -1);
-
assertTrue(mex.getMessage().indexOf("SimplePanel_2.html") != -1);
+ assertTrue(mex.getMessage().contains("Expected to find
<wicket:panel>"));
+
assertTrue(mex.getMessage().contains("SimplePanel_2.html"));
}
assertTrue("Did expect a MarkupException", hit);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/XmlFilePropertiesLoaderTest.java
Wed Nov 24 01:15:34 2010
@@ -18,7 +18,6 @@ package org.apache.wicket.resource;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -48,10 +47,8 @@ public class XmlFilePropertiesLoaderTest
WicketTester tester = new WicketTester();
- Iterator<Locale> iterator =
EXPECTED_LOCALIZATIONS.keySet().iterator();
- while (iterator.hasNext())
+ for (Locale locale : EXPECTED_LOCALIZATIONS.keySet())
{
- Locale locale = iterator.next();
tester.getSession().setLocale(locale);
tester.startPage(PageWithXmlProperties.class);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java?rev=1038417&r1=1038416&r2=1038417&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
Wed Nov 24 01:15:34 2010
@@ -446,7 +446,7 @@ public final class StringsTest extends T
WicketRuntimeException wre = new WicketRuntimeException("null
test", np);
String exceptionString = Strings.toString(wre);
assertTrue(exceptionString.length() > 1);
- assertTrue(exceptionString.indexOf("WicketRuntimeException") !=
-1);
+ assertTrue(exceptionString.contains("WicketRuntimeException"));
}
/**
