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 11:07:51 UTC
[1/6] git commit: Fix formatting placeholders
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 40c05201a -> e565893a2
Fix formatting placeholders
(cherry picked from commit 93ce371191bfabf953f9a3d4f5196ca867320cb5)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/83ee2bd3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/83ee2bd3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/83ee2bd3
Branch: refs/heads/wicket-6.x
Commit: 83ee2bd33ee91eb24f8f97002875dd73ebae6f2a
Parents: 40c0520
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:28:31 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/83ee2bd3/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 81e96da..da7b532 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);
}
}
}
[6/6] 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
(cherry picked from commit 900d5a806550d7674a356c866521d6648bff3c5d)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e565893a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e565893a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e565893a
Branch: refs/heads/wicket-6.x
Commit: e565893a21976ea357752be4affe5ff540633458
Parents: 634d9e2
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 12:05:27 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/e565893a/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
+}
[3/6] 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)
(cherry picked from commit 51d88673a7c67de5270ff3a8fe14f70691bf89fa)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e84b6671
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e84b6671
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e84b6671
Branch: refs/heads/wicket-6.x
Commit: e84b66715e8701b6416f7ab7a6e57a2565ae3519
Parents: 5513930
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 12:01:50 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/e84b6671/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/e84b6671/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);
- }
-
}
[5/6] 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[]
(cherry picked from commit 4f1fd55b437322b8719052ed0abe24cc35a82f08)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/634d9e29
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/634d9e29
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/634d9e29
Branch: refs/heads/wicket-6.x
Commit: 634d9e294b6628e92ce0529b45c99a0dab985e03
Parents: f70579a
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 12:05:07 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/634d9e29/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 e7a770b..40e93c8 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
@@ -118,7 +118,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
[4/6] git commit: Fix formatting placeholders
Posted by mg...@apache.org.
Fix formatting placeholders
(cherry picked from commit 93ce371191bfabf953f9a3d4f5196ca867320cb5)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f70579a0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f70579a0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f70579a0
Branch: refs/heads/wicket-6.x
Commit: f70579a0e3eeedf0c83689dd790d52c27ad6399e
Parents: e84b667
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 5 16:27:57 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 12:03:43 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: Add a reference to JSONObject#quote(String)
Posted by mg...@apache.org.
Add a reference to JSONObject#quote(String)
(cherry picked from commit 9575f0d93901b7163a46c2ea38f43f135ecd7d50)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5513930c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5513930c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5513930c
Branch: refs/heads/wicket-6.x
Commit: 5513930c6cef0a309ade24081ecd1d52e8c7bc52
Parents: 83ee2bd
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 12:01:38 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/5513930c/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)
{