[portal-commits] JBoss Portal SVN: r6265 - trunk/common/src/main/org/jboss/portal/common/net/jar.
Author: chris.laprun(a)jboss.com
Date: 2007-02-14 01:48:32 -0500 (Wed, 14 Feb 2007)
New Revision: 6265
Modified:
trunk/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java
Log:
Minor improvement in error message.
Modified:
trunk/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java
===================================================================
---
trunk/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java 2007-02-14
06:14:20 UTC (rev 6264)
+++
trunk/common/src/main/org/jboss/portal/common/net/jar/JarURLNavigationProvider.java 2007-02-14
06:48:32 UTC (rev 6265)
@@ -26,17 +26,17 @@
import org.jboss.portal.common.net.URLVisitor;
import org.jboss.portal.common.util.Jar;
-import java.net.URL;
+import java.io.IOException;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import java.io.IOException;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -53,7 +53,7 @@
}
if (!"jar".equals(url.getProtocol()))
{
- throw new IllegalArgumentException("Only jar URL are accepted not " +
url.getProtocol());
+ throw new IllegalArgumentException("Only jar URL are accepted, not " +
url.getProtocol());
}
JarURLConnection conn = (JarURLConnection)url.openConnection();
visit(conn, visitor);
@@ -80,7 +80,7 @@
entries.add(root);
// Add all the other entries under the root to the list
- for (Iterator i = Jar.iterator(jarFile);i.hasNext();)
+ for (Iterator i = Jar.iterator(jarFile); i.hasNext();)
{
Jar.EntryInfo current = (Jar.EntryInfo)i.next();
if (current.isDescendantOf(root))
@@ -163,27 +163,31 @@
this.root = root;
this.atoms = new LinkedList();
}
+
int size()
{
return atoms.size();
}
+
void push(String atom)
{
atoms.addLast(atom);
}
+
String pop()
{
return (String)atoms.removeLast();
}
+
URL getURL(boolean dir) throws MalformedURLException
{
StringBuffer tmp = new StringBuffer(jarURL.toString()).append("!");
- for (int i = 0;i < root.size() - 1;i++)
+ for (int i = 0; i < root.size() - 1; i++)
{
String atom = root.get(i);
tmp.append("/").append(atom);
}
- for (int i = 0;i < atoms.size();i++)
+ for (int i = 0; i < atoms.size(); i++)
{
String atom = (String)atoms.get(i);
tmp.append("/").append(atom);
@@ -200,6 +204,7 @@
{
final String name;
final ArrayList children;
+
public Node(String name)
{
this.name = name;