You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/03/06 09:33:18 UTC
[01/19] git commit: Fix formatting placeholders
Repository: wicket
Updated Branches:
refs/heads/master c55143172 -> e059351fb
Fix formatting placeholders
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/93ce3711
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/93ce3711
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/93ce3711
Branch: refs/heads/master
Commit: 93ce371191bfabf953f9a3d4f5196ca867320cb5
Parents: c551431
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 5 16:27:57 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 5 16:27:57 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/util/string/Strings.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/93ce3711/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
index 6a73031..f3ebe1b 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
@@ -1554,7 +1554,7 @@ public final class Strings
catch (Exception e)
{
throw new StringValueConversionException(
- String.format("Cannot convert '{}' to enum constant of type '{}'.", value, enumClass), e);
+ String.format("Cannot convert '%s' to enum constant of type '%s'.", value, enumClass), e);
}
}
}
[12/19] git commit: Small simplification - 'result' cannot be null at
that stage
Posted by mg...@apache.org.
Small simplification - 'result' cannot be null at that stage
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6971f879
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6971f879
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6971f879
Branch: refs/heads/master
Commit: 6971f879e64ea96b7612184b1dea910e90a9dd0c
Parents: d84c337
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:12:01 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:12:01 2014 +0200
----------------------------------------------------------------------
.../apache/wicket/examples/requestmapper/LocaleHelper.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6971f879/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java
index 64b0230..d120233 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java
@@ -32,7 +32,7 @@ public class LocaleHelper
static Locale parseLocale(final String localeAsString, final Locale defaultLocale)
{
- Locale result = null;
+ Locale result;
final int idxOfUnderbar = localeAsString.indexOf('_');
if (idxOfUnderbar > 0)
@@ -48,12 +48,6 @@ public class LocaleHelper
result = new Locale(lang);
}
-
- if (result == null)
- {
- result = defaultLocale;
- }
-
return result;
}
[16/19] git commit: Use AtomicInteger instead of a volatile int.
Posted by mg...@apache.org.
Use AtomicInteger instead of a volatile int.
++ operation is not atomic and it may fail with 'int'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/90fa7ed0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/90fa7ed0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/90fa7ed0
Branch: refs/heads/master
Commit: 90fa7ed0f228a66d8867dd741fb56e743cd55f61
Parents: d6e1da8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:15:20 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:15:20 2014 +0200
----------------------------------------------------------------------
.../wicket/util/collections/IntHashMap.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/90fa7ed0/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
index 139c814..7b377fc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* This is an integer hashmap that has the exact same features and interface as a normal Map except
@@ -88,7 +89,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
* structure (e.g., rehash). This field is used to make iterators on Collection-views of the
* HashMap fail-fast. (See ConcurrentModificationException).
*/
- transient volatile int modCount;
+ transient AtomicInteger modCount = new AtomicInteger(0);
/**
* Constructs an empty <tt>HashMap</tt> with the specified initial capacity and load factor.
@@ -299,7 +300,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
}
}
- modCount++;
+ modCount.incrementAndGet();
addEntry(key, value, i);
return null;
}
@@ -478,7 +479,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
Entry<V> next = e.next;
if (key == e.key)
{
- modCount++;
+ modCount.incrementAndGet();
size--;
if (prev == e)
{
@@ -522,7 +523,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
Entry<V> next = e.next;
if ((e.key == key) && e.equals(entry))
{
- modCount++;
+ modCount.incrementAndGet();
size--;
if (prev == e)
{
@@ -546,7 +547,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
*/
public void clear()
{
- modCount++;
+ modCount.incrementAndGet();
Entry<V> tab[] = table;
for (int i = 0; i < tab.length; i++)
{
@@ -619,7 +620,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
result = (IntHashMap<V>)super.clone();
result.table = new Entry[table.length];
result.entrySet = null;
- result.modCount = 0;
+ result.modCount.set(0);
result.size = 0;
result.init();
result.putAllForCreate(this);
@@ -773,7 +774,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
HashIterator()
{
- expectedModCount = modCount;
+ expectedModCount = modCount.get();
Entry<V>[] t = table;
int i = t.length;
Entry<V> n = null;
@@ -799,7 +800,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
Entry<V> nextEntry()
{
- if (modCount != expectedModCount)
+ if (!modCount.compareAndSet(expectedModCount, expectedModCount))
{
throw new ConcurrentModificationException();
}
@@ -831,14 +832,14 @@ public class IntHashMap<V> implements Cloneable, Serializable
{
throw new IllegalStateException();
}
- if (modCount != expectedModCount)
+ if (!modCount.compareAndSet(expectedModCount, expectedModCount))
{
throw new ConcurrentModificationException();
}
int k = current.key;
current = null;
removeEntryForKey(k);
- expectedModCount = modCount;
+ expectedModCount = modCount.get();
}
}
@@ -1175,4 +1176,4 @@ public class IntHashMap<V> implements Cloneable, Serializable
{
return loadFactor;
}
-}
\ No newline at end of file
+}
[11/19] git commit: Make inner classes static where possible
Posted by mg...@apache.org.
Make inner classes static where possible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d84c3371
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d84c3371
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d84c3371
Branch: refs/heads/master
Commit: d84c3371f682b1999c81677091a906b92605d837
Parents: e48853d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:11:04 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:11:04 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/devutils/inspector/EnhancedPageView.java | 2 +-
.../wicket/extensions/requestlogger/JsonRequestLogger.java | 4 ++--
.../main/java/org/apache/wicket/guice/GuiceInjectorHolder.java | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d84c3371/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
index 6398ce6..0687f75 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
@@ -361,7 +361,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
* Tree node representing either a <code>Page</code>, a <code>Component</code> or a
* <code>Behavior</code>
*/
- private class TreeNode
+ private static class TreeNode
{
public IClusterable node;
public TreeNode parent;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d84c3371/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
index 3188794..5e3ce4a 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
@@ -57,7 +57,7 @@ public class JsonRequestLogger extends AbstractRequestLogger
* Specify that the 'default' filter should be used for serialization. This filter will prevent
* jackson from serializing the request handlers.
*/
- private final class FilteredIntrospector extends JacksonAnnotationIntrospector
+ private static final class FilteredIntrospector extends JacksonAnnotationIntrospector
{
@Override
public Object findFilterId(AnnotatedClass ac)
@@ -69,7 +69,7 @@ public class JsonRequestLogger extends AbstractRequestLogger
/**
* A simple tuple for request and session.
*/
- private final class RequestSessionTuple implements Serializable
+ private static final class RequestSessionTuple implements Serializable
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d84c3371/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
index 1f9d2e3..a7c3873 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
@@ -34,11 +34,9 @@ public class GuiceInjectorHolder implements IClusterable
/**
* Metadata key used to store Injector holder in application's metadata
*/
- public static MetaDataKey<GuiceInjectorHolder> INJECTOR_KEY = new MetaDataKey<GuiceInjectorHolder>()
+ public static final MetaDataKey<GuiceInjectorHolder> INJECTOR_KEY = new MetaDataKey<GuiceInjectorHolder>()
{
-
private static final long serialVersionUID = 1L;
-
};
private final Injector injector;
[06/19] git commit: Remove a check for null when it is known that the
returned value is always non-null
Posted by mg...@apache.org.
Remove a check for null when it is known that the returned value is always non-null
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/63d529ae
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/63d529ae
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/63d529ae
Branch: refs/heads/master
Commit: 63d529ae752c0f9c1ad8006bf6740cd5c8229bfc
Parents: 8f998ce
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:03:41 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:03:41 2014 +0200
----------------------------------------------------------------------
.../wicket/core/request/mapper/AbstractBookmarkableMapper.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/63d529ae/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
index a1cb05f..e9ad89c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -418,8 +418,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
(!pageMustHaveBeenCreatedBookmarkable() || page.wasCreatedBookmarkable()))
{
PageInfo info = getPageInfo(handler);
- PageComponentInfo pageComponentInfo = info != null ? new PageComponentInfo(info,
- null) : null;
+ PageComponentInfo pageComponentInfo = new PageComponentInfo(info, null);
UrlInfo urlInfo = new UrlInfo(pageComponentInfo, page.getClass(),
handler.getPageParameters());
[15/19] git commit: Return null instead of throwing null.
Posted by mg...@apache.org.
Return null instead of throwing null.
org.springframework.context.ApplicationContext#getId javadoc says:
/**
* Return the unique id of this application context.
* @return the unique id of the context, or {@code null} if none
*/
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d6e1da82
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d6e1da82
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d6e1da82
Branch: refs/heads/master
Commit: d6e1da82486e8e0ef15ffe1965589a8579fa4a73
Parents: 4f1fd55
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:14:04 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:14:04 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/spring/test/ApplicationContextMock.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d6e1da82/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index 27a27a3..b6f2ebd 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -446,8 +446,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
@Override
public String getId()
{
- throw null;
-
+ return null;
}
@Override
[14/19] git commit: Fix transformation of an Enumeration to Array -
we need to pass the type of the array we want to be constructed,
otherwise it will be Object[]
Posted by mg...@apache.org.
Fix transformation of an Enumeration to Array - we need to pass the type of the array we want to be constructed, otherwise it will be Object[]
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4f1fd55b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4f1fd55b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4f1fd55b
Branch: refs/heads/master
Commit: 4f1fd55b437322b8719052ed0abe24cc35a82f08
Parents: 971abda
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:13:09 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:13:09 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f1fd55b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
index f591c8d..6423ab2 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java
@@ -117,7 +117,7 @@ public class HttpSessionCopy implements HttpSession
@Override
public String[] getValueNames()
{
- return (String[])Collections.list(attributes.keys()).toArray();
+ return Collections.list(attributes.keys()).toArray(new String[attributes.size()]);
}
@Override
[10/19] git commit: Java 7 diamonds
Posted by mg...@apache.org.
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e48853d3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e48853d3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e48853d3
Branch: refs/heads/master
Commit: e48853d33717aa4a0f103fec6a8946999ccb8ec9
Parents: e208c0b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:10:20 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:10:20 2014 +0200
----------------------------------------------------------------------
.../markup/html/image/resource/DefaultButtonImageResource.java | 2 +-
.../main/java/org/apache/wicket/pageStore/memory/PageTable.java | 4 ++--
.../java/org/apache/wicket/protocol/http/IRequestLogger.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e48853d3/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
index b39331f..34190be 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
@@ -212,7 +212,7 @@ public class DefaultButtonImageResource extends RenderedDynamicImageResource
*/
public synchronized void setFont(Font font)
{
- fontAttributes = new HashMap<TextAttribute, Object>(font.getAttributes());
+ fontAttributes = new HashMap<>(font.getAttributes());
invalidate();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e48853d3/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
index f49e9ee..87c40c9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
@@ -54,8 +54,8 @@ public class PageTable implements IClusterable
public PageTable()
{
- pages = new ConcurrentHashMap<Integer, byte[]>();
- index = new ConcurrentLinkedQueue<Integer>();
+ pages = new ConcurrentHashMap<>();
+ index = new ConcurrentLinkedQueue<>();
}
public void storePage(Integer pageId, byte[] pageAsBytes)
http://git-wip-us.apache.org/repos/asf/wicket/blob/e48853d3/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
index f712e92..df99e4f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
@@ -303,7 +303,7 @@ public interface IRequestLogger
private long startDate;
private long timeTaken;
- private final List<String> entries = new ArrayList<String>(5);
+ private final List<String> entries = new ArrayList<>(5);
private String requestedUrl;
private IRequestHandler eventTarget;
private IRequestHandler responseTarget;
[13/19] git commit: User Args#notNull()
Posted by mg...@apache.org.
User Args#notNull()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/971abdad
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/971abdad
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/971abdad
Branch: refs/heads/master
Commit: 971abdadf6972bb55b93c78bde2869326e4b2399
Parents: 6971f87
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:12:26 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:12:26 2014 +0200
----------------------------------------------------------------------
.../html/repeater/data/table/filter/FilterToolbar.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/971abdad/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
index 6a205e9..c27b6fd 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
@@ -62,14 +63,8 @@ public class FilterToolbar extends AbstractToolbar
{
super(table);
- if (table == null)
- {
- throw new IllegalArgumentException("argument [table] cannot be null");
- }
- if (stateLocator == null)
- {
- throw new IllegalArgumentException("argument [stateLocator] cannot be null");
- }
+ Args.notNull(table, "table");
+ Args.notNull(stateLocator, "stateLocator");
IModel<List<IColumn<T, S>>> model = new AbstractReadOnlyModel<List<IColumn<T,S>>>() {
private static final long serialVersionUID = 1L;
[17/19] git commit: Synchronize the getter. The setter is already
synchronized
Posted by mg...@apache.org.
Synchronize the getter. The setter is already synchronized
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58f650eb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58f650eb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58f650eb
Branch: refs/heads/master
Commit: 58f650eb0cad40563555d3703e3f7fe79034b4d0
Parents: 90fa7ed
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:16:21 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:16:21 2014 +0200
----------------------------------------------------------------------
wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/58f650eb/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java b/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
index 1d05b22..ce3603c 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/thread/Task.java
@@ -224,7 +224,7 @@ public final class Task
*
* @return the log
*/
- protected Logger getLog()
+ protected synchronized Logger getLog()
{
if (log == null)
{
[04/19] git commit: Remove unused variable (dead store)
Posted by mg...@apache.org.
Remove unused variable (dead store)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/91c5ab12
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/91c5ab12
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/91c5ab12
Branch: refs/heads/master
Commit: 91c5ab120aa4ab24d9756bf9b743a85ab9ece6aa
Parents: d4a6c2e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:01:57 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:01:57 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/91c5ab12/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index babbf8e..9d0b85e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -1196,7 +1196,7 @@ public abstract class Component
FeedbackMessages feedback = getMetaData(FEEDBACK_KEY);
if (feedback != null)
{
- final int removed = feedback.clear(getApplication().getApplicationSettings()
+ feedback.clear(getApplication().getApplicationSettings()
.getFeedbackMessageCleanupFilter());
if (feedback.isEmpty())
[07/19] git commit: Add a reference to JSONObject#quote(String)
Posted by mg...@apache.org.
Add a reference to JSONObject#quote(String)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9575f0d9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9575f0d9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9575f0d9
Branch: refs/heads/master
Commit: 9575f0d93901b7163a46c2ea38f43f135ecd7d50
Parents: 63d529a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:04:15 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:04:15 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/core/util/string/JavaScriptUtils.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9575f0d9/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java
index c4862aa..098efed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptUtils.java
@@ -83,6 +83,7 @@ public class JavaScriptUtils
* @param input
* the JavaScript which needs to be escaped
* @return Escaped version of the input
+ * @see org.apache.wicket.ajax.json.JSONObject#quote(String)
*/
public static CharSequence escapeQuotes(final CharSequence input)
{
[18/19] git commit: Add override of hashCode(). There is such for
#equals(Object) already
Posted by mg...@apache.org.
Add override of hashCode(). There is such for #equals(Object) already
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/900d5a80
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/900d5a80
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/900d5a80
Branch: refs/heads/master
Commit: 900d5a806550d7674a356c866521d6648bff3c5d
Parents: 58f650e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:16:47 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:16:47 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/util/value/CopyOnWriteValueMap.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/900d5a80/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
index ebe4c7b..4becf35 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java
@@ -114,6 +114,12 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
return wrapped.equals(o);
}
+ @Override
+ public int hashCode()
+ {
+ return wrapped.hashCode();
+ }
+
/**
* @see java.util.Map#get(Object)
*/
@@ -493,4 +499,4 @@ public class CopyOnWriteValueMap implements IValueMap, Serializable
{
return wrapped.getAsEnum(key, eClass, defaultValue);
}
-}
\ No newline at end of file
+}
[19/19] git commit: Improve usage of concurrent map - no need of
synchronization.
Posted by mg...@apache.org.
Improve usage of concurrent map - no need of synchronization.
Add javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e059351f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e059351f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e059351f
Branch: refs/heads/master
Commit: e059351fb80cf3fadd446f6c73240396f577e0c5
Parents: 900d5a8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:28:41 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:28:41 2014 +0200
----------------------------------------------------------------------
.../registry/SimpleWebSocketConnectionRegistry.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e059351f/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
index 8e6d46d..7ead116 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
@@ -65,7 +65,8 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
* Returns a collection of currently active websockets. The connections might close at any time.
*
* @param application
- * @return
+ * The application
+ * @return a collection of currently active websockets
*/
public Collection<IWebSocketConnection> getConnections(Application application)
{
@@ -107,13 +108,14 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
ConcurrentMap<IKey, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);
if (connectionsByPage == null && connection != null)
{
- synchronized (connectionsBySession)
+ connectionsByPage = connectionsBySession.get(sessionId);
+ if (connectionsByPage == null)
{
- connectionsByPage = connectionsBySession.get(sessionId);
- if (connectionsByPage == null)
+ connectionsByPage = Generics.newConcurrentHashMap();
+ ConcurrentMap<IKey, IWebSocketConnection> old = connectionsBySession.putIfAbsent(sessionId, connectionsByPage);
+ if (old != null)
{
- connectionsByPage = Generics.newConcurrentHashMap();
- connectionsBySession.put(sessionId, connectionsByPage);
+ connectionsByPage = old;
}
}
}
[02/19] git commit: Remove usage of JSR305 annotations (@Nullable)
and no-op override of #equals(Object)
Posted by mg...@apache.org.
Remove usage of JSR305 annotations (@Nullable) and no-op override of #equals(Object)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/51d88673
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/51d88673
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/51d88673
Branch: refs/heads/master
Commit: 51d88673a7c67de5270ff3a8fe14f70691bf89fa
Parents: 93ce371
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 09:59:23 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 09:59:23 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/atmosphere/EventFilter.java | 10 +---------
.../org/apache/wicket/atmosphere/NoFilterPredicate.java | 11 +----------
2 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/51d88673/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java
index 76f6085..7bbb62e 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.atmosphere;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
/**
@@ -41,14 +39,8 @@ public class EventFilter implements Predicate<EventSubscription>
}
@Override
- public boolean apply(@Nullable EventSubscription input)
+ public boolean apply(EventSubscription input)
{
return input.getFilter().apply(event);
}
-
- @Override
- public boolean equals(@Nullable Object other)
- {
- return super.equals(other);
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/51d88673/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java
index ec17fd0..cce9420 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.atmosphere;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
/**
@@ -28,15 +26,8 @@ import com.google.common.base.Predicate;
public class NoFilterPredicate implements Predicate<AtmosphereEvent>
{
@Override
- public boolean apply(@Nullable AtmosphereEvent input)
+ public boolean apply(AtmosphereEvent input)
{
return true;
}
-
- @Override
- public boolean equals(@Nullable Object other)
- {
- return super.equals(other);
- }
-
}
[05/19] git commit: Remove meaningless identity check,
fix typo in error message and remove a check for null when it is
known to not be null.
Posted by mg...@apache.org.
Remove meaningless identity check, fix typo in error message and remove a check for null when it is known to not be null.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8f998ce6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8f998ce6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8f998ce6
Branch: refs/heads/master
Commit: 8f998ce6a8003b9fd29c016b1eb682c569e2dee6
Parents: 91c5ab1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:02:23 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:02:23 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8f998ce6/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index d588112..ddf89ca 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -666,7 +666,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
// Check for required open tag name
ComponentTag associatedMarkupOpenTag = (ComponentTag)elem;
- if (!((associatedMarkupOpenTag != null) && associatedMarkupOpenTag.isOpen() && (associatedMarkupOpenTag instanceof WicketTag)))
+ if (!(associatedMarkupOpenTag.isOpen() && (associatedMarkupOpenTag instanceof WicketTag)))
{
associatedMarkupStream.throwMarkupException(exceptionMessage);
}
@@ -1055,13 +1055,9 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
if (index != 0)
{
throw new ArrayIndexOutOfBoundsException("index " + index +
- " is greater then 0");
+ " is greater than 0");
}
component = children;
- if (children != component)
- {
- children = component;
- }
}
else
{
[03/19] git commit: Synchronize Application#getMetaData.
#setMetaData() is already synchronized
Posted by mg...@apache.org.
Synchronize Application#getMetaData. #setMetaData() is already synchronized
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d4a6c2e4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d4a6c2e4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d4a6c2e4
Branch: refs/heads/master
Commit: d4a6c2e4a005a253c3f47526a76b1ce7b3a6ba4d
Parents: 51d8867
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:01:06 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:01:06 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Application.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d4a6c2e4/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index de75abd..bb57878 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -403,7 +403,7 @@ public abstract class Application implements UnboundListener, IEventSink
* @return The metadata
* @see MetaDataKey
*/
- public final <T> T getMetaData(final MetaDataKey<T> key)
+ public final synchronized <T> T getMetaData(final MetaDataKey<T> key)
{
return key.get(metaData);
}
[08/19] git commit: Move the try/catch just around the
'validator.validate()' call. Otherwise the construction of the error message
will fail with NPE because 'validator' my be null
Posted by mg...@apache.org.
Move the try/catch just around the 'validator.validate()' call. Otherwise the construction of the error message will fail with NPE because 'validator' my be null
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/59b3e318
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/59b3e318
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/59b3e318
Branch: refs/heads/master
Commit: 59b3e318762733adea00cfe3b31c5dd25e4d2147
Parents: 9575f0d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:07:21 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:07:21 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/form/FormComponent.java | 42 ++++++++++----------
1 file changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/59b3e318/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
index 2b2ae49..660cf53 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
@@ -1503,38 +1503,38 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme
IValidator<T> validator = null;
- try
+ for (Behavior behavior : getBehaviors())
{
- for (Behavior behavior : getBehaviors())
+ validator = null;
+ if (behavior instanceof ValidatorAdapter)
{
- validator = null;
- if (behavior instanceof ValidatorAdapter)
- {
- validator = ((ValidatorAdapter<T>)behavior).getValidator();
- }
- else if (behavior instanceof IValidator)
- {
- validator = (IValidator<T>)behavior;
- }
- if (validator != null)
+ validator = ((ValidatorAdapter<T>)behavior).getValidator();
+ }
+ else if (behavior instanceof IValidator)
+ {
+ validator = (IValidator<T>)behavior;
+ }
+ if (validator != null)
+ {
+ if (isNull == false || validator instanceof INullAcceptingValidator<?>)
{
- if (isNull == false || validator instanceof INullAcceptingValidator<?>)
+ try
{
validator.validate(validatable);
}
- if (!isValid())
+ catch (Exception e)
{
- break;
+ throw new WicketRuntimeException("Exception '" + e.getMessage() +
+ "' occurred during validation " + validator.getClass().getName() +
+ " on component " + getPath(), e);
}
}
+ if (!isValid())
+ {
+ break;
+ }
}
}
- catch (Exception e)
- {
- throw new WicketRuntimeException("Exception '" + e.getMessage() +
- "' occurred during validation " + validator.getClass().getName() +
- " on component " + getPath(), e);
- }
}
/**
[09/19] git commit: Append a character instead of a String when
possible
Posted by mg...@apache.org.
Append a character instead of a String when possible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e208c0b9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e208c0b9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e208c0b9
Branch: refs/heads/master
Commit: e208c0b9f2d3f6023dde0e7d413eec2d9e5a2d8c
Parents: 59b3e31
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:08:31 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:08:31 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/link/ClientSideImageMap.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e208c0b9/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java
index 77a1e29..9941c13 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java
@@ -101,10 +101,10 @@ public class ClientSideImageMap extends Panel
case PathIterator.SEG_MOVETO :
if (sb.length() != 0)
{
- sb.append(",");
+ sb.append(',');
}
sb.append(Math.round(coords[0]));
- sb.append(",");
+ sb.append(',');
sb.append(Math.round(coords[1]));
lastMove[0] = coords[0];
lastMove[1] = coords[1];
@@ -112,19 +112,19 @@ public class ClientSideImageMap extends Panel
case PathIterator.SEG_LINETO :
if (sb.length() != 0)
{
- sb.append(",");
+ sb.append(',');
}
sb.append(Math.round(coords[0]));
- sb.append(",");
+ sb.append(',');
sb.append(Math.round(coords[1]));
break;
case PathIterator.SEG_CLOSE :
if (sb.length() != 0)
{
- sb.append(",");
+ sb.append(',');
}
sb.append(Math.round(lastMove[0]));
- sb.append(",");
+ sb.append(',');
sb.append(Math.round(lastMove[1]));
break;
}