[jboss-cvs] JBossAS SVN: r74491 - in projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins: context/file and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 12 11:51:59 EDT 2008
Author: alesj
Date: 2008-06-12 11:51:59 -0400 (Thu, 12 Jun 2008)
New Revision: 74491
Modified:
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/LinkHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractStructuredJarHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContext.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/helpers/PathTokenizer.java
Log:
Change PathTokenizer.getTokens to return List<String>.
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java 2008-06-12 15:48:57 UTC (rev 74490)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java 2008-06-12 15:51:59 UTC (rev 74491)
@@ -410,21 +410,21 @@
checkClosed();
// Parse the path
- String[] tokens = PathTokenizer.getTokens(path);
- if (tokens == null || tokens.length == 0)
+ List<String> tokens = PathTokenizer.getTokens(path);
+ if (tokens == null || tokens.size() == 0)
return this;
// Go through each context starting from ours
// check the parents are not leaves.
VirtualFileHandler current = this;
- for (int i = 0; i < tokens.length; ++i)
+ for (int i = 0; i < tokens.size(); ++i)
{
if (current == null || current.isLeaf())
return null;
- if (PathTokenizer.isCurrentToken(tokens[i]) == false)
+ if (PathTokenizer.isCurrentToken(tokens.get(i)) == false)
{
- if (PathTokenizer.isReverseToken(tokens[i]))
+ if (PathTokenizer.isReverseToken(tokens.get(i)))
{
VirtualFileHandler parent = current.getParent();
if (parent == null) // TODO - still IOE or null?
@@ -435,7 +435,7 @@
else if (current instanceof StructuredVirtualFileHandler)
{
StructuredVirtualFileHandler structured = (StructuredVirtualFileHandler) current;
- current = structured.createChildHandler(tokens[i]);
+ current = structured.createChildHandler(tokens.get(i));
}
else
{
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/LinkHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/LinkHandler.java 2008-06-12 15:48:57 UTC (rev 74490)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/LinkHandler.java 2008-06-12 15:51:59 UTC (rev 74491)
@@ -133,16 +133,16 @@
linkName = VFSUtils.getName(link.getLinkTarget());
if( linkName != null )
{
- String[] paths = PathTokenizer.getTokens(linkName);
+ List<String> paths = PathTokenizer.getTokens(linkName);
int n = 0;
VirtualFileHandler linkParent = this;
String atom;
// Look for an existing parent
VirtualFileHandler previous;
- for(; n < paths.length-1; n ++)
+ for(; n < paths.size()-1; n ++)
{
previous = linkParent;
- atom = paths[n];
+ atom = paths.get(n);
linkParent = previous.getChild(atom);
if (linkParent == null)
{
@@ -151,9 +151,9 @@
}
}
// Create any missing parents
- for(; n < paths.length-1; n ++)
+ for(; n < paths.size()-1; n ++)
{
- atom = paths[n];
+ atom = paths.get(n);
URL polURL = new URL(linkParent.toURI().toURL(), atom);
ParentOfLink pol = new ParentOfLink(this.getVFSContext(), linkParent, polURL, atom);
if( linkParent == this )
@@ -173,7 +173,7 @@
}
// Create the link handler
- atom = paths[n];
+ atom = paths.get(n);
VirtualFileHandler linkHandler = createLinkHandler(linkParent, atom, link.getLinkTarget());
if( linkParent == this )
{
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractStructuredJarHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractStructuredJarHandler.java 2008-06-12 15:48:57 UTC (rev 74490)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractStructuredJarHandler.java 2008-06-12 15:51:59 UTC (rev 74491)
@@ -217,7 +217,7 @@
throws IOException
{
VirtualFileHandler parent = this;
- String[] paths = PathTokenizer.getTokens(parentName);
+ List<String> paths = PathTokenizer.getTokens(parentName);
StringBuilder pathName = new StringBuilder();
for (String path : paths)
{
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContext.java 2008-06-12 15:48:57 UTC (rev 74490)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContext.java 2008-06-12 15:51:59 UTC (rev 74491)
@@ -27,6 +27,7 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.List;
import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.plugins.context.AbstractVFSContext;
@@ -76,8 +77,8 @@
{
try
{
- String[] tokens = PathTokenizer.getTokens(url.getPath());
- if (tokens == null || tokens.length == 0)
+ List<String> tokens = PathTokenizer.getTokens(url.getPath());
+ if (tokens == null || tokens.size() == 0)
{
return null;
}
@@ -86,16 +87,16 @@
String protocolAndHost = url.getProtocol() + "://" + url.getHost();
StringBuffer path = new StringBuffer(protocolAndHost);
MemoryContextHandler current = root;
- for (int i = 0 ; i < tokens.length ; i++)
+ for (int i = 0 ; i < tokens.size() ; i++)
{
path.append("/");
- path.append(tokens[i]);
+ path.append(tokens.get(i));
if (!definitelyNew)
{
try
{
- MemoryContextHandler child = current.getDirectChild(tokens[i]);
+ MemoryContextHandler child = current.getDirectChild(tokens.get(i));
if (child != null)
{
current = child;
@@ -113,7 +114,7 @@
{
throw new IllegalStateException("Cannot add a child to " + current + " it already has contents");
}
- current = new MemoryContextHandler(this, current, localUrl, tokens[i]);
+ current = new MemoryContextHandler(this, current, localUrl, tokens.get(i));
}
current.setContents(contents);
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/helpers/PathTokenizer.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/helpers/PathTokenizer.java 2008-06-12 15:48:57 UTC (rev 74490)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/helpers/PathTokenizer.java 2008-06-12 15:51:59 UTC (rev 74491)
@@ -28,8 +28,8 @@
/**
* PathTokenizer.
*
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@SuppressWarnings({"StringEquality"})
@@ -57,7 +57,7 @@
* @return the remaining path
* @throws IllegalArgumentException for null tokens or i is out of range
*/
- protected static String getRemainingPath(String[] tokens, int i, int end)
+ protected static String getRemainingPath(List<String> tokens, int i, int end)
{
if (tokens == null)
throw new IllegalArgumentException("Null tokens");
@@ -65,15 +65,15 @@
throw new IllegalArgumentException("i is not in the range of tokens: 0-" + (end-1));
if (i == end-1)
- return tokens[end-1];
+ return tokens.get(end-1);
StringBuilder buffer = new StringBuilder();
for (; i < end-1; ++i)
{
- buffer.append(tokens[i]);
+ buffer.append(tokens.get(i));
buffer.append("/");
}
- buffer.append(tokens[end-1]);
+ buffer.append(tokens.get(end-1));
return buffer.toString();
}
@@ -84,7 +84,7 @@
* @return the tokens or null if the path is empty
* @throws IllegalArgumentException if the path is null, it is empty or it is a relative path
*/
- public static String[] getTokens(String path)
+ public static List<String> getTokens(String path)
{
if (path == null)
throw new IllegalArgumentException("Null path");
@@ -142,7 +142,7 @@
else if (buffer.length() > 0)
list.add(buffer.toString());
- return list.toArray(new String[list.size()]);
+ return list;
}
/**
@@ -153,12 +153,12 @@
* @return the remaining path
* @throws IllegalArgumentException for null tokens or i is out of range
*/
- public static String getRemainingPath(String[] tokens, int i)
+ public static String getRemainingPath(List<String> tokens, int i)
{
if (tokens == null)
throw new IllegalArgumentException("Null tokens");
- return getRemainingPath(tokens, i, tokens.length);
+ return getRemainingPath(tokens, i, tokens.size());
}
/**
@@ -170,21 +170,21 @@
*/
public static String applySpecialPaths(String path) throws IOException
{
- String[] tokens = getTokens(path);
+ List<String> tokens = getTokens(path);
if (tokens == null)
return null;
int i = 0;
- for(int j = 0; j < tokens.length; j++)
+ for(int j = 0; j < tokens.size(); j++)
{
- String token = tokens[j];
+ String token = tokens.get(j);
if (isCurrentToken(token))
continue;
else if (isReverseToken(token))
i--;
else
- tokens[i++] = token;
+ tokens.set(i++, token);
if (i < 0)
throw new IOException("Using reverse path on top path: " + path);
More information about the jboss-cvs-commits
mailing list