You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/07 21:16:48 UTC
svn commit: r983290 - in /wicket/branches/wicket-1.5-M1: NOTICE
wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Author: ivaynberg
Date: Sat Aug 7 19:16:48 2010
New Revision: 983290
URL: http://svn.apache.org/viewvc?rev=983290&view=rev
Log:
appease the sun compiler
Modified:
wicket/branches/wicket-1.5-M1/NOTICE
wicket/branches/wicket-1.5-M1/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Modified: wicket/branches/wicket-1.5-M1/NOTICE
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M1/NOTICE?rev=983290&r1=983289&r2=983290&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M1/NOTICE (original)
+++ wicket/branches/wicket-1.5-M1/NOTICE Sat Aug 7 19:16:48 2010
@@ -12,95 +12,43 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUT
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket
+src/./wicket-auth-roles
---------------------------------------------------------------------------
- Apache Wicket
- Copyright 2006 The Apache Software Foundation
+ Apache Wicket Auth Roles
+ Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
- This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license
- Copyright (c) 2004-2007 QOS.ch
-
- Contains Diff library from Mavens JRCS, released under
- The Apache Software License, Version 1.1.
- (c) 1999-2003
-
- org.apache.wicket.util.upload contains parts of Apache Jakarta Commons FileUpload,
- released under the Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
- under the Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.io.ThresholdingOutputStream is taken from
- Apache Jakarta Commons IO, released under the
- Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.crypt contains Base64 which is taken from
- Apache Jakarta Commons Codec, released under the
- Apache Software License, Version 2.0. Base64UrlSafe
- is derived from Base64.
- (c) 2001-2005
-
- org.apache.wicket.util.concurrent is taken from [1], which states the following:
- "All classes are released to the public domain and may be used for
- any purpose whatsoever without permission or acknowledgment.
- Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
- classes are adapted from Sun JDK source code. These are copyright
- of Sun Microsystems, Inc, and are used with their kind permission,
- as described in this license[2]."
- [1]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
- [2]: licenses/sun-u.c.license.pdf
-
- org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
- and has the following notice:
- "Licence:
- Use this however/wherever you like, just don't blame me if it breaks
- anything.
-
- Credit:
- If you're nice, you'll leave this bit:
+---------------------------------------------------------------------------
+src/./wicket-guice
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
- Class by Stickman -- http://www.the-stickman.com
- with thanks to:
- [for Safari fixes]
- Luis Torrefranca -- http://www.law.pitt.edu
- and
- Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
- [for duplicate name bug]
- 'neal'"
- [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+ This product includes Guice, developed at Google, and licensed
+ under the Apache License 2.0. (http://code.google.com/p/google-guice/).
---------------------------------------------------------------------------
-src/./wicket-auth-roles
+src/./wicket-spring
---------------------------------------------------------------------------
- Apache Wicket Auth Roles
+ 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
+src/./wicket-jmx
---------------------------------------------------------------------------
- Apache Wicket Date Time
+ Apache Wicket
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
---------------------------------------------------------------------------
@@ -145,29 +93,27 @@ src/./wicket-examples
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
-src/./wicket-extensions
+src/./wicket-quickstart/NOTICE
---------------------------------------------------------------------------
- Apache Wicket Extensions
+ Apache Wicket
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
- Contains software developed in Apache Turbine, released
- under the Apache Software License, Version 2.0.
- (c) 2001-2005
-
---------------------------------------------------------------------------
-src/./wicket-guice
+src/./wicket-extensions
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Extensions
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
- This product includes Guice, developed at Google, and licensed
- under the Apache License 2.0. (http://code.google.com/p/google-guice/).
+ Contains software developed in Apache Turbine, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2005
+
---------------------------------------------------------------------------
src/./wicket-ioc
---------------------------------------------------------------------------
@@ -178,14 +124,22 @@ src/./wicket-ioc
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/./wicket-jmx
+src/./wicket-datetime
---------------------------------------------------------------------------
- Apache Wicket
+ 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
---------------------------------------------------------------------------
@@ -197,20 +151,66 @@ src/./wicket-objectssizeof-agent
---------------------------------------------------------------------------
-src/./wicket-quickstart/NOTICE
+src/./wicket
---------------------------------------------------------------------------
Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ Copyright 2006 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
----------------------------------------------------------------------------
-src/./wicket-spring
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license
+ Copyright (c) 2004-2007 QOS.ch
+
+ Contains Diff library from Mavens JRCS, released under
+ The Apache Software License, Version 1.1.
+ (c) 1999-2003
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ org.apache.wicket.util.upload contains parts of Apache Jakarta Commons FileUpload,
+ released under the Apache Software License, Version 2.0.
+ (c) 2001-2004
+
+ org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2004
+
+ org.apache.wicket.util.io.ThresholdingOutputStream is taken from
+ Apache Jakarta Commons IO, released under the
+ Apache Software License, Version 2.0.
+ (c) 2001-2004
+
+ org.apache.wicket.util.crypt contains Base64 which is taken from
+ Apache Jakarta Commons Codec, released under the
+ Apache Software License, Version 2.0. Base64UrlSafe
+ is derived from Base64.
+ (c) 2001-2005
+
+ org.apache.wicket.util.concurrent is taken from [1], which states the following:
+ "All classes are released to the public domain and may be used for
+ any purpose whatsoever without permission or acknowledgment.
+ Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
+ classes are adapted from Sun JDK source code. These are copyright
+ of Sun Microsystems, Inc, and are used with their kind permission,
+ as described in this license[2]."
+ [1]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ [2]: licenses/sun-u.c.license.pdf
+
+ org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
+ and has the following notice:
+ "Licence:
+ Use this however/wherever you like, just don't blame me if it breaks
+ anything.
+
+ Credit:
+ If you're nice, you'll leave this bit:
+
+ Class by Stickman -- http://www.the-stickman.com
+ with thanks to:
+ [for Safari fixes]
+ Luis Torrefranca -- http://www.law.pitt.edu
+ and
+ Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
+ [for duplicate name bug]
+ 'neal'"
+ [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
Modified: wicket/branches/wicket-1.5-M1/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M1/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=983290&r1=983289&r2=983290&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M1/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java (original)
+++ wicket/branches/wicket-1.5-M1/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java Sat Aug 7 19:16:48 2010
@@ -377,7 +377,7 @@ public class FormTester
{
@SuppressWarnings("unchecked")
@Override
- public void onFormComponent(final FormComponent<?> formComponent, IVisit<Void> visit)
+ public void onFormComponent(final FormComponent formComponent, IVisit<Void> visit)
{
// do nothing for invisible component
if (!formComponent.isVisibleInHierarchy())
@@ -635,7 +635,7 @@ public class FormTester
{
checkClosed();
- FormComponent<?> formComponent = (FormComponent<?>)workingForm.get(formComponentId);
+ FormComponent formComponent = (FormComponent)workingForm.get(formComponentId);
if (formComponent instanceof FileUploadField == false)
{