You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/10/27 16:26:23 UTC

git commit: WICKET-5396 use Integer comparison to quite Eclipse compiler

Updated Branches:
  refs/heads/master 92461f552 -> c45d2bc0f


WICKET-5396 use Integer comparison to quite Eclipse compiler

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c45d2bc0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c45d2bc0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c45d2bc0

Branch: refs/heads/master
Commit: c45d2bc0ff37c9aa708e778db9656e0ac67d6dc9
Parents: 92461f5
Author: svenmeier <sv...@meiers.net>
Authored: Sun Oct 27 16:25:56 2013 +0100
Committer: svenmeier <sv...@meiers.net>
Committed: Sun Oct 27 16:25:56 2013 +0100

----------------------------------------------------------------------
 .../wicket/protocol/http/ClientProperties.java       |  6 +++---
 .../wicket/protocol/http/ClientPropertiesTest.java   | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c45d2bc0/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
index ff50ac4..5977a22 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
@@ -22,10 +22,10 @@ import java.util.TimeZone;
 
 import javax.servlet.http.Cookie;
 
-import org.apache.wicket.util.io.IClusterable;
 import org.apache.wicket.markup.html.pages.BrowserInfoPage;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.util.io.IClusterable;
 import org.apache.wicket.util.string.AppendingStringBuffer;
 
 
@@ -709,7 +709,7 @@ public class ClientProperties implements IClusterable
 	@Override
 	public String toString()
 	{
-	 StringBuilder b = new StringBuilder();
+		StringBuilder b = new StringBuilder();
 
 		Field[] fields = ClientProperties.class.getDeclaredFields();
 
@@ -739,7 +739,7 @@ public class ClientProperties implements IClusterable
 
 				if (field.getType().equals(Integer.TYPE))
 				{
-					if (value == -1)
+					if (Integer.valueOf(-1).equals(value))
 					{
 						value = null;
 					}

http://git-wip-us.apache.org/repos/asf/wicket/blob/c45d2bc0/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
index 7412f34..560c9e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
@@ -118,4 +118,19 @@ public class ClientPropertiesTest extends Assert
 
 		assertEquals(TimeZone.getTimeZone("GMT-3:00"), props.getTimeZone());
 	}
+
+	/**
+	 * WICKET-5396.
+	 */
+	@Test
+	public void integerToString()
+	{
+		ClientProperties props = new ClientProperties();
+
+		assertFalse(props.toString().contains("browserHeight"));
+
+		props.setBrowserHeight(666);
+
+		assertTrue(props.toString().contains("browserHeight=666"));
+	}
 }