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 2012/03/27 11:41:03 UTC
[3/6] git commit: Make two new implementations of Comparator
serializable. Just in case they are used by someone in a collection which is
supposed to be serialized.
Make two new implementations of Comparator serializable.
Just in case they are used by someone in a collection which is supposed to be serialized.
suggested-by: findbugs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/152e8b1a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/152e8b1a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/152e8b1a
Branch: refs/heads/master
Commit: 152e8b1af359284ec680e3799f019cc20411cc15
Parents: 47b3f5b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 27 11:10:46 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 27 11:10:46 2012 +0200
----------------------------------------------------------------------
.../markup/head/PriorityFirstComparator.java | 7 ++++---
.../collections/UrlExternalFormComparator.java | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/152e8b1a/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityFirstComparator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityFirstComparator.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityFirstComparator.java
index bab6285..3e70228 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityFirstComparator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityFirstComparator.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.head;
+import java.io.Serializable;
import java.util.Comparator;
import org.apache.wicket.Page;
@@ -30,13 +31,13 @@ import org.apache.wicket.markup.head.ResourceAggregator.RecordedHeaderItemLocati
*
* @author papegaaij
*/
-public class PriorityFirstComparator implements Comparator<RecordedHeaderItem>
+public class PriorityFirstComparator implements Comparator<RecordedHeaderItem>, Serializable
{
- protected enum HeaderItemType {
+ protected static enum HeaderItemType {
PRIORITY, PAGE, COMPONENT;
}
- private boolean renderPageFirst = false;
+ private final boolean renderPageFirst;
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/152e8b1a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
index d79e2d8..a973ce5 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/UrlExternalFormComparator.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.collections;
+import java.io.Serializable;
import java.net.URL;
import java.util.Comparator;
@@ -29,7 +30,7 @@ import java.util.Comparator;
*
* @since 1.5.6
*/
-public class UrlExternalFormComparator implements Comparator<URL>
+public class UrlExternalFormComparator implements Comparator<URL>, Serializable
{
public int compare(URL url1, URL url2)
{