You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/04/17 18:27:46 UTC
svn commit: r1094169 - in
/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util:
file/File.java upload/DiskFileItemFactory.java upload/FileItem.java
visit/Visits.java xml/CustomEntityResolver.java
Author: jdonnerstag
Date: Sun Apr 17 16:27:45 2011
New Revision: 1094169
URL: http://svn.apache.org/viewvc?rev=1094169&view=rev
Log:
eclipse cleanup and few minor non-functional changes
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java?rev=1094169&r1=1094168&r2=1094169&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/File.java Sun Apr 17 16:27:45 2011
@@ -269,7 +269,7 @@ public class File extends java.io.File i
*
* @param file
* The file to copy
- * @returns number of bytes written
+ * @return number of bytes written
* @throws IOException
*/
public int write(final File file) throws IOException
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java?rev=1094169&r1=1094168&r2=1094169&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItemFactory.java Sun Apr 17 16:27:45 2011
@@ -86,6 +86,8 @@ public class DiskFileItemFactory impleme
/**
* Constructs an unconfigured instance of this class. The resulting factory may be configured by
* calling the appropriate setter methods.
+ *
+ * @param fileUploadCleaner
*/
public DiskFileItemFactory(final IFileUploadCleaner fileUploadCleaner)
{
@@ -102,6 +104,7 @@ public class DiskFileItemFactory impleme
* @param repository
* The data repository, which is the directory in which files will be created, should
* the item size exceed the threshold.
+ * @param fileUploadCleaner
*/
public DiskFileItemFactory(final int sizeThreshold, final File repository,
final IFileUploadCleaner fileUploadCleaner)
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java?rev=1094169&r1=1094168&r2=1094169&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java Sun Apr 17 16:27:45 2011
@@ -149,8 +149,7 @@ public interface FileItem extends IClust
*
* @param file
* The <code>File</code> into which the uploaded item should be stored.
- *
- * @throws Exception
+ * @throws IOException
* if an error occurs.
*/
void write(File file) throws IOException;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java?rev=1094169&r1=1094168&r2=1094169&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java Sun Apr 17 16:27:45 2011
@@ -19,6 +19,8 @@ package org.apache.wicket.util.visit;
import java.util.Collections;
import java.util.Iterator;
+import org.apache.wicket.util.lang.Args;
+
/**
* Utility class that contains visitor/traversal related code
*/
@@ -61,6 +63,7 @@ public class Visits
* the visitor
* @return return value from the {@code visitor} or {@code null} if none
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static final <S, R> R visit(final Iterable<? super S> container,
final IVisitor<S, R> visitor)
{
@@ -86,6 +89,7 @@ public class Visits
* filter used to limit the types of objects that will be visited
* @return return value from the {@code visitor} or {@code null} if none
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static final <S, R> R visit(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter)
{
@@ -119,6 +123,7 @@ public class Visits
return visit.getResult();
}
+ @SuppressWarnings("unchecked")
private static final <S, R> void visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter, final Visit<R> visit)
{
@@ -137,7 +142,6 @@ public class Visits
Visit<R> childTraversal = new Visit<R>();
// Call visitor
- @SuppressWarnings("unchecked")
S s = (S)child;
visitor.component(s, childTraversal);
@@ -237,21 +241,18 @@ public class Visits
public static final <S, R> R visitPostOrder(final Object root,
final org.apache.wicket.util.visit.IVisitor<S, R> visitor, final IVisitFilter filter)
{
- if (visitor == null)
- {
- throw new IllegalArgumentException("Argument `visitor` cannot be null");
- }
+ Args.notNull(visitor, "visitor");
Visit<R> visit = new Visit<R>();
visitPostOrderHelper(root, visitor, filter, visit);
return visit.getResult();
}
+ @SuppressWarnings("unchecked")
private static final <S, R> void visitPostOrderHelper(final Object component,
final org.apache.wicket.util.visit.IVisitor<S, R> visitor, final IVisitFilter filter,
final Visit<R> visit)
{
-
if (component instanceof Iterable<?>)
{
final Iterable<?> container = (Iterable<?>)component;
@@ -269,6 +270,7 @@ public class Visits
}
}
}
+
if (filter.visitObject(component))
{
visitor.component((S)component, visit);
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java?rev=1094169&r1=1094168&r2=1094169&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java Sun Apr 17 16:27:45 2011
@@ -140,7 +140,7 @@ public class CustomEntityResolver implem
public static interface EntityLocator
{
/**
- * @return
+ * @return input source
* @throws SAXException
* @throws IOException
*/