You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2008/05/06 21:37:57 UTC

svn commit: r653890 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file: Folder.java IResourceFinder.java Path.java WebApplicationPath.java

Author: gseitz
Date: Tue May  6 12:37:56 2008
New Revision: 653890

URL: http://svn.apache.org/viewvc?rev=653890&view=rev
Log:
generics

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Folder.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Folder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Folder.java?rev=653890&r1=653889&r2=653890&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Folder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Folder.java Tue May  6 12:37:56 2008
@@ -172,14 +172,14 @@
 	 */
 	public File[] getNestedFiles(final FileFilter filter)
 	{
-		final List files = new ArrayList();
+		final List<File> files = new ArrayList<File>();
 		files.addAll(Arrays.asList(getFiles(filter)));
 		final Folder[] folders = getFolders();
 		for (int i = 0; i < folders.length; i++)
 		{
 			files.addAll(Arrays.asList(folders[i].getNestedFiles(filter)));
 		}
-		return (File[])files.toArray(new File[files.size()]);
+		return files.toArray(new File[files.size()]);
 	}
 
 	/**
@@ -269,6 +269,7 @@
 	 * 
 	 * @return True if the folder was successfully removed
 	 */
+	@Override
 	public boolean remove()
 	{
 		return remove(this);

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java?rev=653890&r1=653889&r2=653890&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/IResourceFinder.java Tue May  6 12:37:56 2008
@@ -34,5 +34,5 @@
 	 *            The filename with possible path
 	 * @return The resource stream
 	 */
-	IResourceStream find(final Class clazz, final String pathname);
+	IResourceStream find(final Class< ? > clazz, final String pathname);
 }

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java?rev=653890&r1=653889&r2=653890&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/Path.java Tue May  6 12:37:56 2008
@@ -32,7 +32,7 @@
 public final class Path implements IResourcePath
 {
 	/** The list of folders in the path */
-	private final List folders = new ArrayList();
+	private final List<Folder> folders = new ArrayList<Folder>();
 
 	/**
 	 * Constructor
@@ -97,11 +97,11 @@
 	 * 
 	 * @see org.apache.wicket.util.file.IResourceFinder#find(Class, String)
 	 */
-	public IResourceStream find(final Class clazz, final String pathname)
+	public IResourceStream find(final Class< ? > clazz, final String pathname)
 	{
 		for (int i = 0; i < folders.size(); i++)
 		{
-			Folder folder = (Folder)folders.get(i);
+			Folder folder = folders.get(i);
 			final File file = new File(folder, pathname);
 
 			if (file.exists())
@@ -116,7 +116,7 @@
 	/**
 	 * @return Returns the folders.
 	 */
-	public List getFolders()
+	public List<Folder> getFolders()
 	{
 		return folders;
 	}
@@ -132,6 +132,7 @@
 	/**
 	 * @see java.lang.Object#toString()
 	 */
+	@Override
 	public String toString()
 	{
 		return "[folders = " + StringList.valueOf(folders) + "]";

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java?rev=653890&r1=653889&r2=653890&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java Tue May  6 12:37:56 2008
@@ -42,10 +42,10 @@
 	private final static Logger log = LoggerFactory.getLogger(WebApplicationPath.class);
 
 	/** The list of urls in the path */
-	private final List webappPaths = new ArrayList();
+	private final List<String> webappPaths = new ArrayList<String>();
 
 	/** The list of folders in the path */
-	private final List folders = new ArrayList();
+	private final List<Folder> folders = new ArrayList<Folder>();
 
 	/** The web apps servlet context */
 	private final ServletContext servletContext;
@@ -90,12 +90,12 @@
 	 * 
 	 * @see org.apache.wicket.util.file.IResourceFinder#find(Class, String)
 	 */
-	public IResourceStream find(final Class clazz, final String pathname)
+	public IResourceStream find(final Class< ? > clazz, final String pathname)
 	{
-		Iterator iter = folders.iterator();
-		while (iter.hasNext())
+		Iterator<Folder> foldersIter = folders.iterator();
+		while (foldersIter.hasNext())
 		{
-			Folder folder = (Folder)iter.next();
+			Folder folder = foldersIter.next();
 			final File file = new File(folder, pathname);
 			if (file.exists())
 			{
@@ -103,10 +103,10 @@
 			}
 		}
 
-		iter = webappPaths.iterator();
-		while (iter.hasNext())
+		Iterator<String> webappPathsIter = webappPaths.iterator();
+		while (webappPathsIter.hasNext())
 		{
-			String path = (String)iter.next();
+			String path = webappPathsIter.next();
 			try
 			{
 				final URL url = servletContext.getResource(path + pathname);
@@ -127,9 +127,10 @@
 	/**
 	 * @see java.lang.Object#toString()
 	 */
+	@Override
 	public String toString()
 	{
 		return "[folders = " + StringList.valueOf(folders) + ", webapppaths: " +
-				StringList.valueOf(webappPaths) + "]";
+			StringList.valueOf(webappPaths) + "]";
 	}
 }