You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/11/24 00:08:10 UTC
svn commit: r1038371 [1/2] - in /wicket/trunk:
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/bu...
Author: pete
Date: Tue Nov 23 23:08:06 2010
New Revision: 1038371
URL: http://svn.apache.org/viewvc?rev=1038371&view=rev
Log:
replace loops, iterators, etc. with java 1.5 for-each where applicable
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.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/Select.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/CompoundFieldValueFactory.java
wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Path.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/MetaDataKey.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.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/Check.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.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/parser/XmlTag.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/WicketMessageTagHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/ComponentStrings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/ValidationError.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/pageStore/PageAccessSynchronizerTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/StringsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Tue Nov 23 23:08:06 2010
@@ -420,22 +420,22 @@ public class DatePicker extends Abstract
* Filter all empty elements (workaround for {@link DateFormatSymbols} returning arrays with
* empty elements).
*
- * @param array
+ * @param stringArray
* array to filter
* @return filtered array (without null or empty string elements)
*/
- protected final String[] filterEmpty(String[] array)
+ protected final String[] filterEmpty(String[] stringArray)
{
- if (array == null)
+ if (stringArray == null)
{
return null;
}
- List<String> l = new ArrayList<String>(array.length);
- for (int i = 0; i < array.length; i++)
+ List<String> l = new ArrayList<String>(stringArray.length);
+ for (String string : stringArray)
{
- if (!Strings.isEmpty(array[i]))
+ if (!Strings.isEmpty(string))
{
- l.add(array[i]);
+ l.add(string);
}
}
return l.toArray(new String[l.size()]);
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java Tue Nov 23 23:08:06 2010
@@ -92,9 +92,8 @@ public class RequestsPage extends DevUti
if (sessionData != null)
{
ArrayList<RequestData> returnValues = new ArrayList<RequestData>();
- for (int i = 0; i < requests.size(); i++)
+ for (RequestData data : requests)
{
- RequestData data = requests.get(i);
if (sessionData.getSessionId().equals(data.getSessionId()))
{
returnValues.add(data);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java Tue Nov 23 23:08:06 2010
@@ -43,9 +43,8 @@ public class OnChangeAjaxBehaviorPage ex
Locale[] locales = Locale.getAvailableLocales();
- for (int i = 0; i < locales.length; i++)
+ for (final Locale locale : locales)
{
- final Locale locale = locales[i];
final String country = locale.getDisplayCountry();
if (country.toUpperCase().startsWith(input.toUpperCase()))
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java Tue Nov 23 23:08:06 2010
@@ -141,20 +141,19 @@ public abstract class BaseTreePage exten
private void add(DefaultMutableTreeNode parent, List<Object> sub)
{
- for (Iterator<Object> i = sub.iterator(); i.hasNext();)
+ for (Object obj : sub)
{
- Object o = i.next();
- if (o instanceof List)
+ if (obj instanceof List)
{
DefaultMutableTreeNode child = new DefaultMutableTreeNode(new ModelBean(
- "subtree..."));
+ "subtree..."));
parent.add(child);
- add(child, (List<Object>)o);
+ add(child, (List<Object>) obj);
}
else
{
DefaultMutableTreeNode child = new DefaultMutableTreeNode(new ModelBean(
- o.toString()));
+ obj.toString()));
parent.add(child);
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Tue Nov 23 23:08:06 2010
@@ -117,18 +117,17 @@ public class Home extends WicketExampleP
@SuppressWarnings("unchecked")
private void add(DefaultMutableTreeNode parent, List<Object> sub)
{
- for (Iterator<Object> i = sub.iterator(); i.hasNext();)
+ for (Object obj : sub)
{
- Object o = i.next();
- if (o instanceof List)
+ if (obj instanceof List)
{
- DefaultMutableTreeNode child = new DefaultMutableTreeNode(o);
+ DefaultMutableTreeNode child = new DefaultMutableTreeNode(obj);
parent.add(child);
- add(child, (List<Object>)o);
+ add(child, (List<Object>) obj);
}
else
{
- DefaultMutableTreeNode child = new DefaultMutableTreeNode(o);
+ DefaultMutableTreeNode child = new DefaultMutableTreeNode(obj);
parent.add(child);
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Tue Nov 23 23:08:06 2010
@@ -250,9 +250,8 @@ public class SourcesPage extends WebPage
final AppendingStringBuffer relativePath, final File dir)
{
File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++)
+ for (File file : files)
{
- File file = files[i];
if (file.isDirectory())
{
addResources(scope,
@@ -267,7 +266,6 @@ public class SourcesPage extends WebPage
{
resources.add(relativePath + name);
}
-
}
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java Tue Nov 23 23:08:06 2010
@@ -276,7 +276,7 @@ public final class CaptchaImageResource
TextLayout text;
AffineTransform textAt;
Shape shape;
- for (int i = 0; i < chars.length; i++)
+ for (char ch : chars)
{
String fontName = fontNames.get(randomInt(0, fontNames.size()));
double rotation = Math.toRadians(randomInt(-35, 35));
@@ -284,19 +284,17 @@ public final class CaptchaImageResource
Random ran = new Random();
double shearX = ran.nextDouble() * 0.2;
double shearY = ran.nextDouble() * 0.2;
- CharAttributes cf = new CharAttributes(chars[i], fontName, rotation, rise, shearX,
- shearY);
+ CharAttributes cf = new CharAttributes(ch, fontName, rotation, rise, shearX, shearY);
charAttsList.add(cf);
- text = new TextLayout(chars[i] + "", getFont(fontName), new FontRenderContext(null,
- false, false));
+ text = new TextLayout(ch + "", getFont(fontName), new FontRenderContext(null, false, false));
textAt = new AffineTransform();
textAt.rotate(rotation);
textAt.shear(shearX, shearY);
shape = text.getOutline(textAt);
- width += (int)shape.getBounds2D().getWidth();
- if (height < (int)shape.getBounds2D().getHeight() + rise)
+ width += (int) shape.getBounds2D().getWidth();
+ if (height < (int) shape.getBounds2D().getHeight() + rise)
{
- height = (int)shape.getBounds2D().getHeight() + rise;
+ height = (int) shape.getBounds2D().getHeight() + rise;
}
}
while (true)
@@ -305,11 +303,9 @@ public final class CaptchaImageResource
Graphics2D gfx = (Graphics2D)image.getGraphics();
gfx.setBackground(Color.WHITE);
int curWidth = margin;
- for (int i = 0; i < charAttsList.size(); i++)
+ for (CharAttributes cf : charAttsList)
{
- CharAttributes cf = charAttsList.get(i);
- text = new TextLayout(cf.getChar() + "", getFont(cf.getName()),
- gfx.getFontRenderContext());
+ text = new TextLayout(cf.getChar() + "", getFont(cf.getName()), gfx.getFontRenderContext());
textAt = new AffineTransform();
textAt.translate(curWidth, height - cf.getRise());
textAt.rotate(cf.getRotation());
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -151,13 +151,11 @@ public class Recorder<T> extends HiddenF
}
List<T> selected = new ArrayList<T>(ids.length);
- for (int i = 0; i < ids.length; i++)
+ for (String id : ids)
{
- Iterator<? extends T> it = getPalette().getChoices().iterator();
- while (it.hasNext())
+ for (T choice : getPalette().getChoices())
{
- final T choice = it.next();
- if (renderer.getIdValue(choice, 0).equals(ids[i]))
+ if (renderer.getIdValue(choice, 0).equals(id))
{
selected.add(choice);
break;
@@ -187,9 +185,9 @@ public class Recorder<T> extends HiddenF
final T choice = it.next();
final String choiceId = renderer.getIdValue(choice, 0);
boolean selected = false;
- for (int i = 0; i < ids.length; i++)
+ for (String id : ids)
{
- if (ids[i].equals(choiceId))
+ if (id.equals(choiceId))
{
selected = true;
break;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java Tue Nov 23 23:08:06 2010
@@ -121,9 +121,8 @@ public class Select extends FormComponen
* if the input is null we do not need to do anything since the model collection has already
* been cleared
*/
- for (int i = 0; i < paths.length; i++)
+ for (String path : paths)
{
- String path = paths[i];
if (!Strings.isEmpty(path))
{
/*
@@ -133,7 +132,7 @@ public class Select extends FormComponen
path = path.substring(getPath().length() + 1);
// retrieve the selected option component
- SelectOption option = (SelectOption)get(path);
+ SelectOption option = (SelectOption) get(path);
if (option == null)
{
@@ -148,7 +147,6 @@ public class Select extends FormComponen
}
converted.add(option.getDefaultModelObject());
}
-
}
if (converted.isEmpty())
@@ -212,9 +210,8 @@ public class Select extends FormComponen
String[] paths = getInputAsArray();
if (paths != null && paths.length > 0)
{
- for (int i = 0; i < paths.length; i++)
+ for (String path : paths)
{
- String path = paths[i];
if (path.equals(option.getPath()))
{
return true;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java Tue Nov 23 23:08:06 2010
@@ -159,9 +159,9 @@ public abstract class AbstractDataGridVi
super.onDetach();
if (populators != null)
{
- for (int i = 0; i < populators.length; i++)
+ for (ICellPopulator<T> populator : populators)
{
- populators[i].detach();
+ populator.detach();
}
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Tue Nov 23 23:08:06 2010
@@ -372,9 +372,9 @@ public class DataTable<T> extends Panel
super.onDetach();
if (columns != null)
{
- for (int i = 0; i < columns.length; i++)
+ for (IColumn<?> column : columns)
{
- columns[i].detach();
+ column.detach();
}
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java Tue Nov 23 23:08:06 2010
@@ -69,17 +69,16 @@ public class FilterToolbar extends Abstr
add(filters);
IColumn<?>[] cols = table.getColumns();
- for (int i = 0; i < cols.length; i++)
+ for (IColumn<?> col : cols)
{
WebMarkupContainer item = new WebMarkupContainer(filters.newChildId());
item.setRenderBodyOnly(true);
- IColumn<?> col = cols[i];
Component filter = null;
if (col instanceof IFilteredColumn)
{
- IFilteredColumn<?> filteredCol = (IFilteredColumn<?>)col;
+ IFilteredColumn<?> filteredCol = (IFilteredColumn<?>) col;
filter = filteredCol.getFilter(id, form);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java Tue Nov 23 23:08:06 2010
@@ -108,9 +108,8 @@ final class MiddleColumnsView extends We
// go over all columns, check their alignment and count sum of their
// weights
- for (Iterator<IColumn> i = columns.iterator(); i.hasNext();)
+ for (IColumn column : columns)
{
- IColumn column = i.next();
// check if the unit is right
if (column.getLocation().getUnit() != Unit.PROPORTIONAL)
{
@@ -127,9 +126,8 @@ final class MiddleColumnsView extends We
int spanLeft = 0; // over how many columns does the spanning column
// span
- for (Iterator<IColumn> i = columns.iterator(); i.hasNext();)
+ for (IColumn column : columns)
{
- IColumn column = i.next();
int ix = index; // to which column should we append the size
if (spanLeft > 0) // is there a column spanning over current
// column?
@@ -164,9 +162,9 @@ final class MiddleColumnsView extends We
// count the sum
double together = 0d;
- for (int i = 0; i < result.length; i++)
+ for (double value : result)
{
- together += result[i];
+ together += value;
}
// is it bigger than 99.8? that can cause layout problems in IE
Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java (original)
+++ wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java Tue Nov 23 23:08:06 2010
@@ -39,9 +39,8 @@ public class RfcCompliantEmailValidatorT
"firstname.middlename@lastname.dk", "buy@something.nu", "user@post.inet.tele.dk",
"read@my.info", "my @email.com", "my@ email.com", "\"John Doe\"@email.com",
"no@domain", "german@m�dchen.de", "another.german@�m��l.com" };
- for (int i = 0; i < validEmails.length; i++)
+ for (String emailAddress : validEmails)
{
- String emailAddress = validEmails[i];
Validatable validatable = new Validatable(emailAddress);
validator.validate(validatable);
assertTrue(emailAddress + " wasn't valid but should be", validatable.isValid());
@@ -60,9 +59,8 @@ public class RfcCompliantEmailValidatorT
".dot.in.the.beginning.is.not.good@wicketframework.org", " space@front.com",
"space@back.com ", "\ttab@front.com", "tab@back.com\t" };
- for (int i = 0; i < inValidEmails.length; i++)
+ for (String emailAddress : inValidEmails)
{
- String emailAddress = inValidEmails[i];
Validatable validatable = new Validatable(emailAddress);
validator.validate(validatable);
assertFalse(emailAddress + " was valid but shouldn't be", validatable.isValid());
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -47,9 +47,9 @@ public class CompoundFieldValueFactory i
throw new IllegalArgumentException("argument [factories] cannot be null");
}
- for (int i = 0; i < factories.length; i++)
+ for (IFieldValueFactory factory : factories)
{
- delegates.add(factories[i]);
+ delegates.add(factory);
}
}
Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/injection/Injector.java Tue Nov 23 23:08:06 2010
@@ -96,10 +96,8 @@ public abstract class Injector
cache.put(clazz, fields);
}
- for (int i = 0; i < fields.length; i++)
+ for (final Field field : fields)
{
- final Field field = fields[i];
-
if (!field.isAccessible())
{
field.setAccessible(true);
@@ -145,10 +143,8 @@ public abstract class Injector
while (clazz != null)
{
Field[] fields = clazz.getDeclaredFields();
- for (int i = 0; i < fields.length; i++)
+ for (final Field field : fields)
{
- final Field field = fields[i];
-
if (factory.supportsField(field))
{
matched.add(field);
Modified: wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java (original)
+++ wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java Tue Nov 23 23:08:06 2010
@@ -101,9 +101,9 @@ public class ResourceSettings implements
if (loaders != null)
{
List list = new ArrayList();
- for (Iterator iter = loaders.iterator(); iter.hasNext();)
+ for (Object loader : loaders)
{
- list.add(iter.next().toString());
+ list.add(loader.toString());
}
return (String[])list.toArray(new String[loaders.size()]);
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java Tue Nov 23 23:08:06 2010
@@ -372,10 +372,10 @@ public class UrlEncoder
{
throw new RuntimeException(e);
}
- for (int j = 0; j < ba.length; j++)
+ for (byte b : ba)
{
out.append('%');
- char ch = Character.forDigit((ba[j] >> 4) & 0xF, 16);
+ char ch = Character.forDigit((b >> 4) & 0xF, 16);
// converting to use uppercase letter as part of
// the hex value if ch is a letter.
if (Character.isLetter(ch))
@@ -383,7 +383,7 @@ public class UrlEncoder
ch -= caseDiff;
}
out.append(ch);
- ch = Character.forDigit(ba[j] & 0xF, 16);
+ ch = Character.forDigit(b & 0xF, 16);
if (Character.isLetter(ch))
{
ch -= caseDiff;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java Tue Nov 23 23:08:06 2010
@@ -199,9 +199,9 @@ public class ConcurrentHashSet<E> extend
s.defaultWriteObject();
s.writeInt(map.size());
- for (Iterator<E> i = map.keySet().iterator(); i.hasNext();)
+ for (E key : map.keySet())
{
- s.writeObject(i.next());
+ s.writeObject(key);
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java Tue Nov 23 23:08:06 2010
@@ -335,10 +335,9 @@ public class IntHashMap<V> implements Cl
void putAllForCreate(IntHashMap<V> m)
{
- for (Iterator<Entry<V>> i = m.entrySet().iterator(); i.hasNext();)
+ for (Entry<V> entry : m.entrySet())
{
- Entry<V> e = i.next();
- putForCreate(e.getKey(), e.getValue());
+ putForCreate(entry.getKey(), entry.getValue());
}
}
@@ -440,10 +439,9 @@ public class IntHashMap<V> implements Cl
}
}
- for (Iterator<Entry<V>> i = m.entrySet().iterator(); i.hasNext();)
+ for (Entry<V> entry : m.entrySet())
{
- Entry<V> e = i.next();
- put(e.getKey(), e.getValue());
+ put(entry.getKey(), entry.getValue());
}
}
@@ -571,10 +569,9 @@ public class IntHashMap<V> implements Cl
return containsNullValue();
}
- Entry<V> tab[] = table;
- for (int i = 0; i < tab.length; i++)
+ for (Entry<V> entry : table)
{
- for (Entry<V> e = tab[i]; e != null; e = e.next)
+ for (Entry<V> e = entry; e != null; e = e.next)
{
if (value.equals(e.value))
{
@@ -593,9 +590,9 @@ public class IntHashMap<V> implements Cl
private boolean containsNullValue()
{
Entry<V> tab[] = table;
- for (int i = 0; i < tab.length; i++)
+ for (Entry<V> tabEntry : tab)
{
- for (Entry<V> e = tab[i]; e != null; e = e.next)
+ for (Entry<V> e = tabEntry; e != null; e = e.next)
{
if (e.value == null)
{
@@ -1123,11 +1120,10 @@ public class IntHashMap<V> implements Cl
s.writeInt(size);
// Write out keys and values (alternating)
- for (Iterator<Entry<V>> i = entrySet().iterator(); i.hasNext();)
+ for (Entry<V> entry : entrySet())
{
- Entry<V> e = i.next();
- s.writeInt(e.getKey());
- s.writeObject(e.getValue());
+ s.writeInt(entry.getKey());
+ s.writeObject(entry.getValue());
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/MiniMap.java Tue Nov 23 23:08:06 2010
@@ -199,11 +199,9 @@ public class MiniMap<K, V> implements Ma
*/
public void putAll(Map<? extends K, ? extends V> map)
{
- for (final Iterator<? extends Entry<? extends K, ? extends V>> iterator = map.entrySet()
- .iterator(); iterator.hasNext();)
+ for (final Entry<? extends K, ? extends V> entry : map.entrySet())
{
- final Map.Entry<? extends K, ? extends V> e = iterator.next();
- put(e.getKey(), e.getValue());
+ put(entry.getKey(), entry.getValue());
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/crypt/Base64.java Tue Nov 23 23:08:06 2010
@@ -664,9 +664,9 @@ public class Base64
*/
public static boolean isArrayByteBase64(byte[] arrayOctet)
{
- for (int i = 0; i < arrayOctet.length; i++)
+ for (byte octet : arrayOctet)
{
- if (!isBase64(arrayOctet[i]) && !isWhiteSpace(arrayOctet[i]))
+ if (!isBase64(octet) && !isWhiteSpace(octet))
{
return false;
}
@@ -685,9 +685,9 @@ public class Base64
*/
private static boolean containsBase64Byte(byte[] arrayOctet)
{
- for (int i = 0; i < arrayOctet.length; i++)
+ for (byte octet : arrayOctet)
{
- if (isBase64(arrayOctet[i]))
+ if (isBase64(octet))
{
return true;
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java Tue Nov 23 23:08:06 2010
@@ -185,9 +185,9 @@ public class Folder extends File
final List<File> files = new ArrayList<File>();
files.addAll(Arrays.asList(getFiles(filter)));
final Folder[] folders = getFolders();
- for (int i = 0; i < folders.length; i++)
+ for (Folder folder : folders)
{
- files.addAll(Arrays.asList(folders[i].getNestedFiles(filter)));
+ files.addAll(Arrays.asList(folder.getNestedFiles(filter)));
}
return files.toArray(new File[files.size()]);
}
@@ -294,9 +294,9 @@ public class Folder extends File
{
final File[] files = getFiles();
boolean success = true;
- for (int i = 0; i < files.length; i++)
+ for (File file : files)
{
- success = files[i].remove() && success;
+ success = file.remove() && success;
}
return success;
}
@@ -312,9 +312,9 @@ public class Folder extends File
{
final Folder[] folders = getFolders();
boolean success = true;
- for (int i = 0; i < folders.length; i++)
+ for (Folder subfolder : folders)
{
- success = folders[i].remove() && success;
+ success = subfolder.remove() && success;
}
success = removeFiles() && success;
return folder.delete() && success;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Path.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Path.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Path.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Path.java Tue Nov 23 23:08:06 2010
@@ -62,9 +62,9 @@ public final class Path implements IReso
{
if (folders != null)
{
- for (int i = 0; i < folders.length; i++)
+ for (Folder folder : folders)
{
- add(folders[i]);
+ add(folder);
}
}
}
@@ -99,9 +99,8 @@ public final class Path implements IReso
*/
public IResourceStream find(final Class<?> clazz, final String pathname)
{
- for (int i = 0; i < folders.size(); i++)
+ for (Folder folder : folders)
{
- Folder folder = folders.get(i);
final File file = new File(folder, pathname);
if (file.exists())
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java Tue Nov 23 23:08:06 2010
@@ -91,12 +91,11 @@ public abstract class EnumeratedType ext
List<EnumeratedType> values = getValues(getClass());
if (values != null)
{
- for (Iterator<EnumeratedType> i = values.iterator(); i.hasNext();)
+ for (EnumeratedType value : values)
{
- EnumeratedType type = i.next();
- if (type.toString() != null && type.toString().equals(this.toString()))
+ if (value.toString() != null && value.toString().equals(this.toString()))
{
- result = type;
+ result = value;
break;
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java Tue Nov 23 23:08:06 2010
@@ -76,10 +76,8 @@ public abstract class ApacheLicenseHeade
{
if (ignoreFile(pathname) == false)
{
- for (int i = 0; i < suffixes.size(); i++)
+ for (String suffix : suffixes)
{
- String suffix = suffixes.get(i);
-
if (pathname.getName().endsWith("." + suffix))
{
accept = true;
@@ -111,12 +109,10 @@ public abstract class ApacheLicenseHeade
baseDirectory.getAbsolutePath() + System.getProperty("file.separator"), "")
.toString();
- for (int i = 0; i < ignoreFiles.size(); i++)
+ for (String ignorePath : ignoreFiles)
{
- String ignorePath = ignoreFiles.get(i);
// Will convert '/'s to '\\'s on Windows
- ignorePath = Strings.replaceAll(ignorePath, "/",
- System.getProperty("file.separator")).toString();
+ ignorePath = Strings.replaceAll(ignorePath, "/", System.getProperty("file.separator")).toString();
File ignoreFile = new File(baseDirectory, ignorePath);
// Directory ignore
@@ -166,9 +162,8 @@ public abstract class ApacheLicenseHeade
if (relativePathname.equals("target") == false)
{
boolean found = false;
- for (int i = 0; i < ignoreDirectory.length; i++)
+ for (String ignore : ignoreDirectory)
{
- String ignore = ignoreDirectory[i];
if (pathname.getName().equals(ignore))
{
found = true;
@@ -354,9 +349,8 @@ public abstract class ApacheLicenseHeade
if (files != null)
{
- for (int i = 0; i < files.length; i++)
+ for (File file : files)
{
- File file = files[i];
fileVisitor.visitFile(file);
}
}
@@ -366,9 +360,8 @@ public abstract class ApacheLicenseHeade
if (files != null)
{
- for (int i = 0; i < files.length; i++)
+ for (File childDirectory : files)
{
- File childDirectory = files[i];
visitDirectory(suffixes, ignoreFiles, childDirectory, fileVisitor);
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java Tue Nov 23 23:08:06 2010
@@ -326,9 +326,9 @@ public class MetaPattern implements IClu
else
{
final StringBuilder buffer = new StringBuilder();
- for (int i = 0; i < patterns.size(); i++)
+ for (MetaPattern metaPattern : patterns)
{
- buffer.append(patterns.get(i));
+ buffer.append(metaPattern);
}
return buffer.toString();
}
@@ -367,9 +367,9 @@ public class MetaPattern implements IClu
if (patterns != null)
{
- for (int i = 0; i < patterns.size(); i++)
+ for (MetaPattern metaPattern : patterns)
{
- group = (patterns.get(i)).bind(group);
+ group = metaPattern.bind(group);
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java Tue Nov 23 23:08:06 2010
@@ -125,14 +125,14 @@ public class ZipResourceStream extends A
BufferedInputStream origin = null;
byte data[] = new byte[BUFFER];
- for (int i = 0; i < files.length; i++)
+ for (String file : files)
{
if (log.isDebugEnabled())
{
- log.debug("Adding: " + files[i]);
+ log.debug("Adding: " + file);
}
- File f = new File(dir, files[i]);
+ File f = new File(dir, file);
if (f.isDirectory())
{
if (recursive == true)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java Tue Nov 23 23:08:06 2010
@@ -67,9 +67,9 @@ public final class TimeMap implements Se
*/
public Object get(final Time time)
{
- for (final Iterator<ITimeFrameSource> iterator = sources.keySet().iterator(); iterator.hasNext();)
+ for (ITimeFrameSource source : sources.keySet())
{
- final TimeFrame current = iterator.next().getTimeFrame();
+ final TimeFrame current = source.getTimeFrame();
if (current.contains(time))
{
return sources.get(current);
@@ -93,14 +93,13 @@ public final class TimeMap implements Se
{
final TimeFrame timeframe = source.getTimeFrame();
- for (final Iterator<ITimeFrameSource> iterator = sources.keySet().iterator(); iterator.hasNext();)
+ for (ITimeFrameSource tfs : sources.keySet())
{
- final TimeFrame current = iterator.next().getTimeFrame();
+ final TimeFrame current = tfs.getTimeFrame();
if (timeframe.overlaps(current))
{
- throw new IllegalArgumentException("Timeframe " + timeframe +
- " overlaps timeframe " + current);
+ throw new IllegalArgumentException("Timeframe " + timeframe + " overlaps timeframe " + current);
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java Tue Nov 23 23:08:06 2010
@@ -352,9 +352,8 @@ public abstract class FileUploadBase
}
catch (IOException e)
{
- for (int i = 0; i < items.size(); i++)
+ for (FileItem item : items)
{
- FileItem item = items.get(i);
item.delete();
}
throw new FileUploadException("Processing of " + MULTIPART_FORM_DATA +
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java Tue Nov 23 23:08:06 2010
@@ -132,9 +132,9 @@ public class ParameterParser
private boolean isOneOf(char ch, final char[] charray)
{
boolean result = false;
- for (int i = 0; i < charray.length; i++)
+ for (char character : charray)
{
- if (ch == charray[i])
+ if (ch == character)
{
result = true;
break;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java Tue Nov 23 23:08:06 2010
@@ -127,11 +127,9 @@ public class Visits
}
// Iterate through children of this container
- for (final Iterator<?> children = container.iterator(); children.hasNext();)
+ for (final Object child : container)
{
// Get next child component
- final Object child = children.next();
-
// Is the child of the correct class (or was no class specified)?
if (filter.visitObject(child))
{
@@ -139,7 +137,7 @@ public class Visits
// Call visitor
@SuppressWarnings("unchecked")
- S s = (S)child;
+ S s = (S) child;
visitor.component(s, childTraversal);
if (childTraversal.isStopped())
@@ -158,7 +156,7 @@ public class Visits
filter.visitChildren(child))
{
// visit the children in the container
- visitChildren((Iterable<? super S>)child, visitor, filter, visit);
+ visitChildren((Iterable<? super S>) child, visitor, filter, visit);
if (visit.isStopped())
{
@@ -261,9 +259,8 @@ public class Visits
if (filter.visitChildren(container))
{
Visit<R> childTraversal = new Visit<R>();
- for (final Iterator<?> iterator = ((Iterable<?>)component).iterator(); iterator.hasNext();)
+ for (final Object child : ((Iterable<?>) component))
{
- final Object child = iterator.next();
visitPostOrderHelper(child, visitor, filter, childTraversal);
if (childTraversal.isStopped())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Tue Nov 23 23:08:06 2010
@@ -2223,9 +2223,9 @@ public abstract class Component
List<Component> feedbacks = getRequestCycle().getMetaData(FEEDBACK_LIST);
if (feedbacks != null)
{
- for (int i = 0; i < feedbacks.size(); i++)
+ for (Component feedback : feedbacks)
{
- feedbacks.get(i).internalBeforeRender();
+ feedback.internalBeforeRender();
}
}
getRequestCycle().setMetaData(FEEDBACK_LIST, null);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Tue Nov 23 23:08:06 2010
@@ -1737,11 +1737,9 @@ public abstract class MarkupContainer ex
try
{
// Loop through child components
- for (int i = 0; i < children.length; i++)
+ for (final Component child : children)
{
// Get next child
- final Component child = children[i];
-
// Call begin request on the child
// We need to check whether the child's wasn't removed from the
// component in the meanwhile (e.g. from another's child
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/MetaDataKey.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/MetaDataKey.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/MetaDataKey.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/MetaDataKey.java Tue Nov 23 23:08:06 2010
@@ -66,12 +66,11 @@ public abstract class MetaDataKey<T> imp
{
if (metaData != null)
{
- for (int i = 0; i < metaData.length; i++)
+ for (MetaDataEntry entry : metaData)
{
- MetaDataEntry m = metaData[i];
- if (equals(m.key))
+ if (equals(entry.key))
{
- return (T)m.object;
+ return (T) entry.object;
}
}
}
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -201,9 +201,9 @@ public class ReloadingClassLoader extend
// probably doubles from this class, but just in case
addClassLoaderUrls(parent);
- for (Iterator<URL> iter = urls.iterator(); iter.hasNext();)
+ for (URL url : urls)
{
- addURL(iter.next());
+ addURL(url);
}
watcher = new ModificationWatcher(pollFrequency);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java Tue Nov 23 23:08:06 2010
@@ -249,9 +249,8 @@ public final class FeedbackMessages impl
*/
public final FeedbackMessage messageForComponent(final Component component)
{
- for (Iterator<FeedbackMessage> iterator = messages.iterator(); iterator.hasNext();)
+ for (FeedbackMessage message : messages)
{
- FeedbackMessage message = iterator.next();
if (message.getReporter() == component)
{
return message;
@@ -275,9 +274,8 @@ public final class FeedbackMessages impl
}
final List<FeedbackMessage> list = new ArrayList<FeedbackMessage>();
- for (final Iterator<FeedbackMessage> iterator = messages.iterator(); iterator.hasNext();)
+ for (final FeedbackMessage message : messages)
{
- final FeedbackMessage message = iterator.next();
if (filter == null || filter.accept(message))
{
list.add(message);
@@ -307,9 +305,8 @@ public final class FeedbackMessages impl
public final int size(final IFeedbackMessageFilter filter)
{
int count = 0;
- for (final Iterator<FeedbackMessage> iterator = messages.iterator(); iterator.hasNext();)
+ for (final FeedbackMessage message : messages)
{
- final FeedbackMessage message = iterator.next();
if (filter == null || filter.accept(message))
{
count++;
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -138,13 +138,12 @@ public class Markup implements IMarkupFr
*/
final public void makeImmutable()
{
- for (int i = 0; i < markupElements.size(); i++)
+ for (MarkupElement markupElement : markupElements)
{
- MarkupElement elem = markupElements.get(i);
- if (elem instanceof ComponentTag)
+ if (markupElement instanceof ComponentTag)
{
// Make the tag immutable
- ((ComponentTag)elem).makeImmutable();
+ ((ComponentTag) markupElement).makeImmutable();
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java Tue Nov 23 23:08:06 2010
@@ -175,13 +175,13 @@ public class Check<T> extends LabeledWeb
if (group.hasRawInput())
{
- final String[] input = group.getInputAsArray();
+ final String[] inputArray = group.getInputAsArray();
- if (input != null)
+ if (inputArray != null)
{
- for (int i = 0; i < input.length; i++)
+ for (String input : inputArray)
{
- if (uuid.equals(input[i]))
+ if (uuid.equals(input))
{
tag.put("checked", "checked");
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java Tue Nov 23 23:08:06 2010
@@ -112,10 +112,8 @@ public class CheckGroup<T> extends FormC
if (values != null && values.length > 0)
{
- for (int i = 0; i < values.length; i++)
+ for (final String value : values)
{
- final String value = values[i];
-
if (value != null)
{
Check<T> checkbox = visitChildren(Check.class,
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Tue Nov 23 23:08:06 2010
@@ -1685,9 +1685,9 @@ public class Form<T> extends WebMarkupCo
*/
protected void writeParamsAsHiddenFields(String[] params, AppendingStringBuffer buffer)
{
- for (int j = 0; j < params.length; j++)
+ for (String param : params)
{
- String[] pair = params[j].split("=");
+ String[] pair = param.split("=");
buffer.append("<input type=\"hidden\" name=\"")
.append(recode(pair[0]))
@@ -1880,9 +1880,8 @@ public class Form<T> extends WebMarkupCo
if (dependents != null)
{
- for (int j = 0; j < dependents.length; j++)
+ for (final FormComponent<?> dependent : dependents)
{
- final FormComponent<?> dependent = dependents[j];
// check if the dependent component is valid
if (!dependent.isValid())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Tue Nov 23 23:08:06 2010
@@ -291,13 +291,13 @@ public class ListMultipleChoice<T> exten
final List<? extends T> choices = getChoices();
// Loop through selected indices
- for (int i = 0; i < ids.length; i++)
+ for (String id : ids)
{
for (int index = 0; index < choices.size(); index++)
{
// Get next choice
final T choice = choices.get(index);
- if (getChoiceRenderer().getIdValue(choice, index).equals(ids[i]))
+ if (getChoiceRenderer().getIdValue(choice, index).equals(id))
{
selectedValues.add(choice);
break;
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -284,9 +284,9 @@ public class MultiFileUploadField extend
uploads = new ArrayList<FileUpload>(filenames.length);
- for (int i = 0; i < filenames.length; i++)
+ for (String filename : filenames)
{
- uploads.add(new FileUpload(request.getFile(filenames[i])));
+ uploads.add(new FileUpload(request.getFile(filename)));
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java Tue Nov 23 23:08:06 2010
@@ -484,9 +484,8 @@ public class XmlTag extends MarkupElemen
*/
public void putAll(final Map<String, Object> map)
{
- for (final Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator(); iterator.hasNext();)
+ for (final Map.Entry<String, Object> entry : map.entrySet())
{
- final Map.Entry<String, Object> entry = iterator.next();
Object value = entry.getValue();
put(entry.getKey(), (value != null) ? value.toString() : null);
}
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -79,12 +79,10 @@ public final class RelativePathPrefixHan
public void onComponentTag(Component component, ComponentTag tag)
{
// Modify all relevant attributes
- for (int i = 0; i < attributeNames.length; i++)
+ for (String attrName : attributeNames)
{
- String attrName = attributeNames[i];
String attrValue = tag.getAttributes().getString(attrName);
-
if ((attrValue != null) && (attrValue.startsWith("/") == false) &&
(attrValue.indexOf(":") < 0) && !(attrValue.startsWith("#")))
{
@@ -115,9 +113,8 @@ public final class RelativePathPrefixHan
// Work out whether we have any attributes that require us to add a
// behavior that prepends the relative path.
- for (int i = 0; i < attributeNames.length; i++)
+ for (String attrName : attributeNames)
{
- String attrName = attributeNames[i];
String attrValue = tag.getAttributes().getString(attrName);
if ((attrValue != null) && (attrValue.startsWith("/") == false) &&
(attrValue.indexOf(":") < 0) && !(attrValue.startsWith("#")))
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Tue Nov 23 23:08:06 2010
@@ -122,9 +122,8 @@ public final class WicketMessageTagHandl
String[] attrsAndKeys = expr.split(",");
- for (int i = 0; i < attrsAndKeys.length; i++)
+ for (String attrAndKey : attrsAndKeys)
{
- String attrAndKey = attrsAndKeys[i];
int colon = attrAndKey.lastIndexOf(":");
// make sure the attribute-key pair is valid
if (attrAndKey.length() < 3 || colon < 1 || colon > attrAndKey.length() - 2)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java Tue Nov 23 23:08:06 2010
@@ -152,9 +152,8 @@ public abstract class AbstractHeaderRend
if (renderHeadListeners != null)
{
- for (Iterator<IHeaderContributor> iter = renderHeadListeners.iterator(); iter.hasNext();)
+ for (IHeaderContributor listener : renderHeadListeners)
{
- IHeaderContributor listener = iter.next();
listener.renderHead(headerContainer.getHeaderResponse());
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Tue Nov 23 23:08:06 2010
@@ -211,10 +211,8 @@ public final class AutoComponentResolver
}
// Get all remaining attributes and invoke the component's setters
- Iterator<Map.Entry<String, Object>> iter = tag.getAttributes().entrySet().iterator();
- while (iter.hasNext())
+ for (Map.Entry<String, Object> entry : tag.getAttributes().entrySet())
{
- final Map.Entry<String, Object> entry = iter.next();
final String key = entry.getKey();
final String value = entry.getValue().toString();
@@ -253,11 +251,11 @@ public final class AutoComponentResolver
final String methodName = "set" + name;
final Method[] methods = object.getClass().getMethods();
Method method = null;
- for (int i = 0; i < methods.length; i++)
+ for (Method methodTested : methods)
{
- if (methods[i].getName().equalsIgnoreCase(methodName))
+ if (methodTested.getName().equalsIgnoreCase(methodName))
{
- method = methods[i];
+ method = methodTested;
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java Tue Nov 23 23:08:06 2010
@@ -307,9 +307,8 @@ public class FileChannelPool
public synchronized void destroy()
{
log.debug("Destroying FileChannel pool");
- for (Iterator<FileChannel> i = channelToName.keySet().iterator(); i.hasNext();)
+ for (FileChannel channel : channelToName.keySet())
{
- FileChannel channel = i.next();
try
{
channel.close();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java Tue Nov 23 23:08:06 2010
@@ -323,9 +323,9 @@ public class ClientProperties implements
{
int dstSaving = dstTimeZone.getRawOffset() - timeZone.getRawOffset();
String[] availableIDs = TimeZone.getAvailableIDs(timeZone.getRawOffset());
- for (int i = 0; i < availableIDs.length; i++)
+ for (String availableID : availableIDs)
{
- TimeZone zone = TimeZone.getTimeZone(availableIDs[i]);
+ TimeZone zone = TimeZone.getTimeZone(availableID);
if (zone.getDSTSavings() == dstSaving)
{
// this is a best guess... still the start and end of the DST should
@@ -1100,10 +1100,8 @@ public class ClientProperties implements
Field[] fields = ClientProperties.class.getDeclaredFields();
- for (int i = 0; i < fields.length; i++)
+ for (Field field : fields)
{
- Field field = fields[i];
-
// Ignore these fields
if (field.getName().equals("serialVersionUID") == false &&
field.getName().startsWith("class$") == false &&
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java Tue Nov 23 23:08:06 2010
@@ -160,9 +160,9 @@ public class HtmlDocumentParser
attributeString = Strings.replaceAll(attributeString.trim(), "\t", " ").toString();
attributeString = Strings.replaceAll(attributeString, " = ", "=").toString();
String[] attributeElements = attributeString.split(" ");
- for (int i = 0; i < attributeElements.length; i++)
+ for (String attributeElement : attributeElements)
{
- String[] bits = attributeElements[i].split("=");
+ String[] bits = attributeElement.split("=");
if (bits.length == 1)
{
m.put(bits[0].trim().toLowerCase(), "");
@@ -170,7 +170,7 @@ public class HtmlDocumentParser
else
{
bits[0] = bits[0].trim();
- StringBuilder value = new StringBuilder();
+ StringBuilder value = new StringBuilder();
for (int j = 1; j < bits.length; j++)
{
value.append(bits[j]);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java Tue Nov 23 23:08:06 2010
@@ -411,10 +411,8 @@ public class HtmlDocumentValidator
Map<String, String> actualAttributes = parser.getAttributes();
Map<String, String> expectedAttributes = workingTag.getExpectedAttributes();
- for (Iterator<Map.Entry<String, String>> it = expectedAttributes.entrySet()
- .iterator(); it.hasNext();)
+ for (Map.Entry<String, String> entry : expectedAttributes.entrySet())
{
- Map.Entry<String, String> entry = it.next();
String name = entry.getKey();
String pattern = entry.getValue();
if (!actualAttributes.containsKey(name))
@@ -443,9 +441,8 @@ public class HtmlDocumentValidator
}
}
- for (Iterator<String> it = workingTag.getIllegalAttributes().iterator(); it.hasNext();)
+ for (String name : workingTag.getIllegalAttributes())
{
- String name = it.next();
if (actualAttributes.containsKey(name))
{
log.error("Tag <" + workingTag.getTag() +
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java Tue Nov 23 23:08:06 2010
@@ -55,6 +55,7 @@ import org.apache.wicket.request.UrlDeco
import org.apache.wicket.request.UrlEncoder;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.io.IOUtils;
+import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.upload.FileUploadBase;
import org.apache.wicket.util.value.ValueMap;
import org.slf4j.Logger;
@@ -1124,9 +1125,9 @@ public class MockHttpServletRequest impl
public void setCookies(final Cookie[] theCookies)
{
cookies.clear();
- for (int i = 0; i < theCookies.length; i++)
+ for (Cookie cookie : theCookies)
{
- cookies.add(theCookies[i]);
+ cookies.add(cookie);
}
}
@@ -1449,13 +1450,12 @@ public class MockHttpServletRequest impl
return "".getBytes();
}
Url url = new Url();
- for (Iterator<String> iterator = post.getParameterNames().iterator(); iterator.hasNext();)
+ for (final String parameterName : post.getParameterNames())
{
- final String name = iterator.next();
- List<org.apache.wicket.util.string.StringValue> values = post.getParameterValues(name);
- for (org.apache.wicket.util.string.StringValue value : values)
+ List<StringValue> values = post.getParameterValues(parameterName);
+ for (StringValue value : values)
{
- url.addQueryParameter(name, value.toString());
+ url.addQueryParameter(parameterName, value.toString());
}
}
String body = url.toString().substring(1);
@@ -1469,31 +1469,27 @@ public class MockHttpServletRequest impl
ByteArrayOutputStream out = new ByteArrayOutputStream();
// Add parameters
- for (Iterator<String> iterator = post.getParameterNames().iterator(); iterator.hasNext();)
+ for (final String parameterName : post.getParameterNames())
{
- final String name = iterator.next();
- List<org.apache.wicket.util.string.StringValue> values = post.getParameterValues(name);
- for (org.apache.wicket.util.string.StringValue value : values)
+ List<StringValue> values = post.getParameterValues(parameterName);
+ for (StringValue value : values)
{
newAttachment(out);
out.write("; name=\"".getBytes());
- out.write(name.getBytes());
+ out.write(parameterName.getBytes());
out.write("\"".getBytes());
out.write(crlf.getBytes());
out.write(crlf.getBytes());
- out.write(post.getParameterValue(name).toString().getBytes());
+ out.write(post.getParameterValue(parameterName).toString().getBytes());
out.write(crlf.getBytes());
}
-
}
// Add files
if (uploadedFiles != null)
{
- for (Iterator<String> iterator = uploadedFiles.keySet().iterator(); iterator.hasNext();)
+ for (String fieldName : uploadedFiles.keySet())
{
- String fieldName = iterator.next();
-
UploadedFile uf = uploadedFiles.get(fieldName);
newAttachment(out);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java Tue Nov 23 23:08:06 2010
@@ -407,15 +407,15 @@ public class MockServletContext implemen
}
File current = webappRoot;
- for (int i = 0; i < elements.length; i++)
+ for (String element : elements)
{
File[] files = current.listFiles();
boolean match = false;
- for (int f = 0; f < files.length; f++)
+ for (File file : files)
{
- if (files[f].getName().equals(elements[i]) && files[f].isDirectory())
+ if (file.getName().equals(element) && file.isDirectory())
{
- current = files[f];
+ current = file;
match = true;
break;
}
@@ -429,10 +429,10 @@ public class MockServletContext implemen
File[] files = current.listFiles();
Set<String> result = new HashSet<String>();
int stripLength = webappRoot.getPath().length();
- for (int f = 0; f < files.length; f++)
+ for (File file : files)
{
- String s = files[f].getPath().substring(stripLength).replace('\\', '/');
- if (files[f].isDirectory())
+ String s = file.getPath().substring(stripLength).replace('\\', '/');
+ if (file.isDirectory())
{
s = s + "/";
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java Tue Nov 23 23:08:06 2010
@@ -161,11 +161,9 @@ public class MultipartServletWebRequestI
}
// Loop through items
- for (Iterator<FileItem> i = items.iterator(); i.hasNext();)
+ for (final FileItem item : items)
{
// Get next item
- final FileItem item = i.next();
-
// If item is a form field
if (item.isFormField())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/ClassStreamHandler.java Tue Nov 23 23:08:06 2010
@@ -56,14 +56,14 @@ public final class ClassStreamHandler
try
{
Class<?>[] classes = ObjectStreamClass.class.getDeclaredClasses();
- for (int i = 0; i < classes.length; i++)
+ for (Class<?> clazz : classes)
{
- if (classes[i].getName().equals("java.io.ObjectStreamClass$FieldReflector"))
+ if (clazz.getName().equals("java.io.ObjectStreamClass$FieldReflector"))
{
- Field unsafeField = classes[i].getDeclaredField("unsafe");
+ Field unsafeField = clazz.getDeclaredField("unsafe");
unsafeField.setAccessible(true);
- unsafe = (Unsafe)unsafeField.get(null);
+ unsafe = (Unsafe) unsafeField.get(null);
break;
}
}
@@ -316,12 +316,11 @@ public final class ClassStreamHandler
return;
}
Field[] fields = cls.getDeclaredFields();
- for (int i = 0; i < fields.length; i++)
+ for (Field field : fields)
{
- Field field = fields[i];
field.setAccessible(true);
if (!Modifier.isStatic(field.getModifiers()) &&
- !Modifier.isTransient(field.getModifiers()))
+ !Modifier.isTransient(field.getModifiers()))
{
FieldAndIndex fai = null;
Class<?> clz = field.getType();
@@ -415,9 +414,9 @@ public final class ClassStreamHandler
FieldAndIndex fai = null;
try
{
- for (int i = 0; i < fields.size(); i++)
+ for (FieldAndIndex field : fields)
{
- fai = fields.get(i);
+ fai = field;
fai.readField(object, wois);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java Tue Nov 23 23:08:06 2010
@@ -546,14 +546,14 @@ public final class SerializableChecker e
{
throw new RuntimeException(e);
}
- for (int i = 0; i < slots.length; i++)
+ for (Object slot : slots)
{
ObjectStreamClass slotDesc;
try
{
- Field descField = slots[i].getClass().getDeclaredField("desc");
+ Field descField = slot.getClass().getDeclaredField("desc");
descField.setAccessible(true);
- slotDesc = (ObjectStreamClass)descField.get(slots[i]);
+ slotDesc = (ObjectStreamClass) descField.get(slot);
}
catch (Exception e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java Tue Nov 23 23:08:06 2010
@@ -530,12 +530,12 @@ public final class PropertyResolver
while (tmp != null && tmp != Object.class)
{
Field[] fields = tmp.getDeclaredFields();
- for (int i = 0; i < fields.length; i++)
+ for (Field aField : fields)
{
- if (fields[i].getName().equals(expression))
+ if (aField.getName().equals(expression))
{
- fields[i].setAccessible(true);
- return fields[i];
+ aField.setAccessible(true);
+ return aField;
}
}
tmp = tmp.getSuperclass();
@@ -1226,16 +1226,16 @@ public final class PropertyResolver
catch (NoSuchMethodException e)
{
Method[] methods = clz.getMethods();
- for (int i = 0; i < methods.length; i++)
+ for (Method method : methods)
{
- if (methods[i].getName().equals(name))
+ if (method.getName().equals(name))
{
- Class<?>[] parameterTypes = methods[i].getParameterTypes();
+ Class<?>[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length == 1)
{
if (parameterTypes[0].isAssignableFrom(getMethod.getReturnType()))
{
- return methods[i];
+ return method;
}
}
}
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -100,9 +100,9 @@ public class ComponentStrings
private static boolean shouldSkip(String text, String[] filters)
{
- for (int i = 0; i < filters.length; i++)
+ for (String filter : filters)
{
- if (text.indexOf(filters[i]) >= 0)
+ if (text.indexOf(filter) >= 0)
{
return true;
}
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=1038371&r1=1038370&r2=1038371&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 Tue Nov 23 23:08:06 2010
@@ -121,10 +121,8 @@ public class TagTester
if (attributeMap != null)
{
- for (Iterator<String> iter = attributeMap.keySet().iterator(); iter.hasNext();)
+ for (String attr : attributeMap.keySet())
{
- String attr = iter.next();
-
if (attr.equalsIgnoreCase(attribute))
{
value = attributeMap.getString(attr);
@@ -385,10 +383,8 @@ public class TagTester
{
IValueMap attributeMap = xmlTag.getAttributes();
- for (Iterator<Map.Entry<String, Object>> iter = attributeMap.entrySet()
- .iterator(); iter.hasNext();)
+ for (Map.Entry<String, Object> entry : attributeMap.entrySet())
{
- Map.Entry<String, Object> entry = iter.next();
String attr = entry.getKey();
if (attr.equals(attribute) && value.equals(entry.getValue()))
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/ValidationError.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/ValidationError.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/ValidationError.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/ValidationError.java Tue Nov 23 23:08:06 2010
@@ -152,9 +152,9 @@ public class ValidationError implements
String errorMessage = null;
// try any message keys ...
- for (Iterator<String> iterator = keys.iterator(); iterator.hasNext();)
+ for (String key : keys)
{
- errorMessage = messageSource.getMessage(iterator.next());
+ errorMessage = messageSource.getMessage(key);
if (errorMessage != null)
{
break;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java?rev=1038371&r1=1038370&r2=1038371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java Tue Nov 23 23:08:06 2010
@@ -386,9 +386,9 @@ public class UrlValidator extends Abstra
// VALIDATOR-203
char[] chars = hostIP.toCharArray();
int size = 1;
- for (int i = 0; i < chars.length; i++)
+ for (char ch : chars)
{
- if (chars[i] == '.')
+ if (ch == '.')
{
size++;
}