Author: jdonnerstag
Date: Wed Aug 8 05:31:46 2007
New Revision: 563832
URL: http://svn.apache.org/viewvc?view=rev&rev=563832
Log:
formatting
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java?view=diff&rev=563832&r1=563831&r2=563832
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
Wed Aug 8 05:31:46 2007
@@ -47,57 +47,65 @@
private static final Set urls = new HashSet();
private static final List patterns = new ArrayList();
- protected boolean tryClassHere(String name) {
- // don't include classes in the java or javax.servlet package
- if ( name != null && (name.startsWith("java.") ||
name.startsWith("javax.servlet") ) ) {
- return false;
- }
- // Scan includes, then excludes
- boolean tryHere;
-
- // If no explicit includes, try here
- if (patterns == null || patterns.size() == 0) {
- tryHere = true;
- } else {
- // See if it matches include patterns
- tryHere = false;
- Iterator includesIterator = patterns.iterator();
- while (includesIterator.hasNext())
- {
- String rawpattern = (String) includesIterator.next();
- if (rawpattern.length()<=1)
+ protected boolean tryClassHere(String name)
+ {
+ // don't include classes in the java or javax.servlet package
+ if (name != null && (name.startsWith("java.") ||
name.startsWith("javax.servlet")))
+ {
+ return false;
+ }
+ // Scan includes, then excludes
+ boolean tryHere;
+
+ // If no explicit includes, try here
+ if (patterns == null || patterns.size() == 0)
+ {
+ tryHere = true;
+ }
+ else
+ {
+ // See if it matches include patterns
+ tryHere = false;
+ Iterator includesIterator = patterns.iterator();
+ while (includesIterator.hasNext())
+ {
+ String rawpattern =
(String)includesIterator.next();
+ if (rawpattern.length() <= 1)
{
continue;
}
- boolean isInclude = rawpattern.substring(0, 1).equals("+");
- String pattern = rawpattern.substring(1);
- if (WildcardMatcherHelper.match(pattern, name) != null) {
- tryHere = isInclude;
- }
- }
- }
+ boolean isInclude = rawpattern.substring(0,
1).equals("+");
+ String pattern = rawpattern.substring(1);
+ if (WildcardMatcherHelper.match(pattern, name)
!= null)
+ {
+ tryHere = isInclude;
+ }
+ }
+ }
- return tryHere;
- }
+ return tryHere;
+ }
/**
* Include a pattern
*
- * @param pattern the pattern to include
+ * @param pattern
+ * the pattern to include
*/
public static void includePattern(String pattern)
{
- patterns.add("+"+pattern);
+ patterns.add("+" + pattern);
}
/**
* Exclude a pattern
*
- * @param pattern the pattern to exclude
+ * @param pattern
+ * the pattern to exclude
*/
public static void excludePattern(String pattern)
{
- patterns.add("-"+pattern);
+ patterns.add("-" + pattern);
}
/**
@@ -192,7 +200,7 @@
{
addURL((URL)i.next());
}
- this.watcher = new ModificationWatcher(pollFrequency);
+ watcher = new ModificationWatcher(pollFrequency);
}
/**
@@ -207,7 +215,7 @@
public final URL getResource(final String name)
{
URL resource = findResource(name);
- ClassLoader parent = this.getParent();
+ ClassLoader parent = getParent();
if (resource == null && parent != null)
{
resource = parent.getResource(name);
@@ -238,7 +246,8 @@
{
final ClassLoader parent = getParent();
- if (tryClassHere(name)) {
+ if (tryClassHere(name))
+ {
try
{
clazz = findClass(name);
@@ -304,8 +313,8 @@
// FIXME only works for directories, but JARs etc could
be checked
// as well
URL location = (URL)locationsIterator.next();
- String clzLocation = location.getFile() +
clz.getName().replaceAll("\\.", "/")
- + ".class";
+ String clzLocation = location.getFile() +
clz.getName().replaceAll("\\.", "/") +
+ ".class";
log.debug("clzLocation=" + clzLocation);
clzFile = new File(clzLocation);
final File finalClzFile = clzFile;
