Author: ivaynberg
Date: Thu Jan 20 07:54:06 2011
New Revision: 1061148
URL: http://svn.apache.org/viewvc?rev=1061148&view=rev
Log:
findbugs cleanup
Issue: WICKET-3349
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=1061148&r1=1061147&r2=1061148&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
Thu Jan 20 07:54:06 2011
@@ -208,9 +208,6 @@ public class AjaxEditableChoiceLabel<T>
final String saveCall = "{wicketAjaxGet('" +
getCallbackUrl() +
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
- final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl() +
- "&save=false'); return false;}";
-
tag.put("onchange", saveCall);
}
});
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java?rev=1061148&r1=1061147&r2=1061148&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
Thu Jan 20 07:54:06 2011
@@ -40,7 +40,6 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -197,10 +196,14 @@ public class KittenCaptchaPanel extends
// Instead of reload entire image just
change the src
// attribute, this reduces the flicker
final StringBuilder javascript = new
StringBuilder();
-
javascript.append("Wicket.$('").append(image.getMarkupId()).append("').src =
'");
+ javascript.append("Wicket.$('")
+ .append(image.getMarkupId())
+ .append("').src = '");
CharSequence url =
image.urlFor(IResourceListener.INTERFACE);
javascript.append(url);
-
javascript.append(url.toString().indexOf('?') > -1 ? "&" :
"?").append("rand=").append(Math.random());
+
javascript.append(url.toString().indexOf('?') > -1 ? "&" : "?")
+ .append("rand=")
+ .append(Math.random());
javascript.append("'");
target.appendJavaScript(javascript.toString());
}
@@ -373,7 +376,7 @@ public class KittenCaptchaPanel extends
/**
* Resource which renders the actual captcha image
*/
- private class CaptchaImageResource extends DynamicImageResource
+ private static class CaptchaImageResource extends DynamicImageResource
{
private static final long serialVersionUID =
-1560784998742404278L;
@@ -472,7 +475,7 @@ public class KittenCaptchaPanel extends
/**
* An animal that has a location
*/
- private class PlacedAnimal implements Serializable
+ private static class PlacedAnimal implements Serializable
{
private static final long serialVersionUID =
-6703909440564862486L;
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java?rev=1061148&r1=1061147&r2=1061148&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
Thu Jan 20 07:54:06 2011
@@ -115,9 +115,13 @@ public abstract class AbstractOptions<T>
Map<String, String> additionalAttributesMap =
getAdditionalAttributes(choice);
if (additionalAttributesMap != null)
{
- for (String s :
additionalAttributesMap.keySet())
+ for (Map.Entry<String, String> entry :
additionalAttributesMap.entrySet())
{
- buffer.append(" " + s + "=\"" +
additionalAttributesMap.get(s) + "\"");
+ buffer.append(' ')
+ .append(entry.getKey())
+ .append("=\"")
+ .append(entry.getValue())
+ .append("\"");
}
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?rev=1061148&r1=1061147&r2=1061148&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Thu Jan 20 07:54:06 2011
@@ -45,7 +45,7 @@ public class NavigatorLabel extends Labe
"Showing ${from} to ${to} of ${of}"));
}
- private class LabelModelObject implements IClusterable
+ private static class LabelModelObject implements IClusterable
{
private static final long serialVersionUID = 1L;
private final IPageableItems pageable;
