You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/01/08 19:55:47 UTC
[1/2] git commit: WICKET-4956: implement compareTo as defined in its
contract
WICKET-4956: implement compareTo as defined in its contract
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bbdab9af
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bbdab9af
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bbdab9af
Branch: refs/heads/master
Commit: bbdab9af40e1e19118be9cf4cc842cb9f943bfeb
Parents: c2422b8
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Tue Jan 8 17:03:25 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Tue Jan 8 19:55:15 2013 +0100
----------------------------------------------------------------------
.../wicket/protocol/http/BufferedWebResponse.java | 28 +++++++++------
1 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bbdab9af/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
index 29d11d7..852eac2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
@@ -104,14 +104,23 @@ public class BufferedWebResponse extends WebResponse implements IMetaDataBufferi
}
}
+ private enum ActionType {
+ HEADER, NORMAL, DATA;
+ }
+
private static abstract class Action implements Comparable<Action>
{
protected abstract void invoke(WebResponse response);
+ protected ActionType getType()
+ {
+ return ActionType.NORMAL;
+ }
+
@Override
- public int compareTo(Action o)
+ public final int compareTo(Action o)
{
- return 0;
+ return getType().ordinal() - o.getType().ordinal();
}
}
@@ -123,10 +132,9 @@ public class BufferedWebResponse extends WebResponse implements IMetaDataBufferi
private static abstract class MetaDataAction extends Action
{
@Override
- public int compareTo(Action o)
+ protected ActionType getType()
{
- // write first in response
- return -1;
+ return ActionType.HEADER;
}
}
@@ -164,10 +172,9 @@ public class BufferedWebResponse extends WebResponse implements IMetaDataBufferi
}
@Override
- public int compareTo(Action o)
+ protected ActionType getType()
{
- // needs to be invoked after set header actions
- return 1;
+ return ActionType.DATA;
}
}
@@ -211,10 +218,9 @@ public class BufferedWebResponse extends WebResponse implements IMetaDataBufferi
}
@Override
- public int compareTo(Action o)
+ protected ActionType getType()
{
- // needs to be invoked after set header actions
- return 1;
+ return ActionType.DATA;
}
}