Author: ivaynberg
Date: Sat Aug 7 17:40:26 2010
New Revision: 983268
URL: http://svn.apache.org/viewvc?rev=983268&view=rev
Log:
java 5 compilation fixes
Modified:
wicket/branches/wicket-1.4.10/NOTICE
wicket/branches/wicket-1.4.10/archetypes/quickstart/pom.xml
wicket/branches/wicket-1.4.10/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
wicket/branches/wicket-1.4.10/pom.xml
wicket/branches/wicket-1.4.10/testing/wicket-threadtest/pom.xml
wicket/branches/wicket-1.4.10/wicket-auth-roles/pom.xml
wicket/branches/wicket-1.4.10/wicket-datetime/pom.xml
wicket/branches/wicket-1.4.10/wicket-devutils/pom.xml
wicket/branches/wicket-1.4.10/wicket-examples/pom.xml
wicket/branches/wicket-1.4.10/wicket-extensions/pom.xml
wicket/branches/wicket-1.4.10/wicket-guice/pom.xml
wicket/branches/wicket-1.4.10/wicket-ioc/pom.xml
wicket/branches/wicket-1.4.10/wicket-jmx/pom.xml
wicket/branches/wicket-1.4.10/wicket-objectssizeof-agent/pom.xml
wicket/branches/wicket-1.4.10/wicket-quickstart/pom.xml
wicket/branches/wicket-1.4.10/wicket-spring/pom.xml
wicket/branches/wicket-1.4.10/wicket-velocity/pom.xml
wicket/branches/wicket-1.4.10/wicket/pom.xml
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Modified: wicket/branches/wicket-1.4.10/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/NOTICE?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/NOTICE (original)
+++ wicket/branches/wicket-1.4.10/NOTICE Sat Aug 7 17:40:26 2010
@@ -12,9 +12,9 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUT
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket-jmx
+src/./wicket-auth-roles
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Auth Roles
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -41,16 +41,7 @@ src/./wicket-spring
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/./wicket-quickstart/NOTICE
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/./wicket-ioc
+src/./wicket-jmx
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -59,23 +50,6 @@ src/./wicket-ioc
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/./wicket-datetime
----------------------------------------------------------------------------
- Apache Wicket Date Time
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Contains code of the Yahoo User Interface library (version: 0.12.2),
- released under the BSD License:
- http://developer.yahoo.net/yui/license.txt
- Copyright (c) 2006, Yahoo!
-
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-
----------------------------------------------------------------------------
src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
@@ -119,6 +93,15 @@ src/./wicket-examples
which is released under CDDL 1.0 license
(http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
+src/./wicket-quickstart/NOTICE
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
src/./wicket-extensions
---------------------------------------------------------------------------
Apache Wicket Extensions
@@ -132,6 +115,32 @@ src/./wicket-extensions
(c) 2001-2005
---------------------------------------------------------------------------
+src/./wicket-ioc
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
+src/./wicket-datetime
+---------------------------------------------------------------------------
+ Apache Wicket Date Time
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Contains code of the Yahoo User Interface library (version: 0.12.2),
+ released under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ Copyright (c) 2006, Yahoo!
+
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
+---------------------------------------------------------------------------
src/./wicket-objectssizeof-agent
---------------------------------------------------------------------------
Apache Wicket
@@ -205,12 +214,3 @@ src/./wicket
'neal'"
[1]:
http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
----------------------------------------------------------------------------
-src/./wicket-auth-roles
----------------------------------------------------------------------------
- Apache Wicket Auth Roles
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
Modified: wicket/branches/wicket-1.4.10/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/archetypes/quickstart/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/archetypes/quickstart/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/archetypes/quickstart/pom.xml Sat Aug 7
17:40:26 2010
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified:
wicket/branches/wicket-1.4.10/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.10/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
(original)
+++
wicket/branches/wicket-1.4.10/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
Sat Aug 7 17:40:26 2010
@@ -127,7 +127,7 @@
</plugins>
</build>
<properties>
- <wicket.version>1.4-SNAPSHOT</wicket.version>
+ <wicket.version>1.4.10</wicket.version>
<jetty.version>6.1.4</jetty.version>
</properties>
#end
Modified: wicket/branches/wicket-1.4.10/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/pom.xml Sat Aug 7 17:40:26 2010
@@ -26,7 +26,7 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<packaging>pom</packaging>
<name>Wicket Parent</name>
<description>Wicket is a Java-based open source component web
application framework.</description>
@@ -285,9 +285,9 @@
<url>http://wicketstuff.org/bamboo</url>
</ciManagement>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/wicket/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/wicket/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/wicket/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.10</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.10</developerConnection>
+
<url>http://svn.apache.org/viewvc/wicket/releases/wicket-1.4.10</url>
</scm>
<mailingLists>
<mailingList>
Modified: wicket/branches/wicket-1.4.10/testing/wicket-threadtest/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/testing/wicket-threadtest/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/testing/wicket-threadtest/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/testing/wicket-threadtest/pom.xml Sat Aug 7
17:40:26 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-auth-roles/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-auth-roles/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-auth-roles/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-auth-roles/pom.xml Sat Aug 7 17:40:26
2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-datetime/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-datetime/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-datetime/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-datetime/pom.xml Sat Aug 7 17:40:26
2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-datetime</artifactId>
Modified: wicket/branches/wicket-1.4.10/wicket-devutils/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-devutils/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-devutils/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-devutils/pom.xml Sat Aug 7 17:40:26
2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-examples/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-examples/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-examples/pom.xml Sat Aug 7 17:40:26
2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-examples</artifactId>
Modified: wicket/branches/wicket-1.4.10/wicket-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-extensions/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-extensions/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-extensions/pom.xml Sat Aug 7 17:40:26
2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-guice/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-guice/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-guice/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-guice/pom.xml Sat Aug 7 17:40:26 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-ioc/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-ioc/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-ioc/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-ioc/pom.xml Sat Aug 7 17:40:26 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-jmx/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-jmx/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-jmx/pom.xml Sat Aug 7 17:40:26 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-objectssizeof-agent/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-objectssizeof-agent/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-objectssizeof-agent/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-objectssizeof-agent/pom.xml Sat Aug 7
17:40:26 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-quickstart/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-quickstart/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-quickstart/pom.xml Sat Aug 7 17:40:26
2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-spring/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-spring/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-spring/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-spring/pom.xml Sat Aug 7 17:40:26 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket-velocity/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket-velocity/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket-velocity/pom.xml Sat Aug 7 17:40:26
2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: wicket/branches/wicket-1.4.10/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket/pom.xml?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.10/wicket/pom.xml (original)
+++ wicket/branches/wicket-1.4.10/wicket/pom.xml Sat Aug 7 17:40:26 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4.10</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified:
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
(original)
+++
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
Sat Aug 7 17:40:26 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.10/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=983268&r1=983267&r2=983268&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
(original)
+++
wicket/branches/wicket-1.4.10/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Sat Aug 7 17:40:26 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)
{
