Author: ivaynberg
Date: Sat Aug 7 17:39:47 2010
New Revision: 983267
URL: http://svn.apache.org/viewvc?rev=983267&view=rev
Log:
java 5 compilation fixes
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java?rev=983267&r1=983266&r2=983267&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
Sat Aug 7 17:39:47 2010
@@ -17,6 +17,7 @@
package org.apache.wicket.protocol.http.request.urlcompressing;
import java.io.IOException;
+import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.Iterator;
@@ -124,8 +125,14 @@ public class UrlCompressor implements IC
public ComponentAndInterface getComponentAndInterfaceForUID(String
uidString)
{
IntKeyWeakReference ref = null;
- while ((ref = (IntKeyWeakReference)queue.poll()) != null)
+ while (true)
{
+ Reference temp = queue.poll(); // make it work with
javac 5
+ ref = (IntKeyWeakReference)temp;
+ if (ref == null)
+ {
+ break;
+ }
directComponentRefs.remove(ref.uid);
}
try
@@ -206,8 +213,14 @@ public class UrlCompressor implements IC
private void writeObject(java.io.ObjectOutputStream s) throws
IOException
{
IntKeyWeakReference ref = null;
- while ((ref = (IntKeyWeakReference)queue.poll()) != null)
+ while (true)
{
+ Reference temp=queue.poll(); // make java 5 compiler
happy
+ ref = (IntKeyWeakReference)temp;
+ if (ref==null)
+ {
+ break;
+ }
directComponentRefs.remove(ref.uid);
}
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=983267&r1=983266&r2=983267&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Sat Aug 7 17:39:47 2010
@@ -380,7 +380,7 @@ public class FormTester
{
@SuppressWarnings("unchecked")
@Override
- public void onFormComponent(final FormComponent<?>
formComponent)
+ public void onFormComponent(final FormComponent
formComponent)
{
// do nothing for invisible or disabled
component -- the browser would not send any parameter
// for a disabled component
@@ -636,7 +636,7 @@ public class FormTester
{
checkClosed();
- FormComponent<?> formComponent =
(FormComponent<?>)workingForm.get(formComponentId);
+ FormComponent formComponent =
(FormComponent)workingForm.get(formComponentId);
if (formComponent instanceof FileUploadField == false)
{
