From 7e04e8f4e66aa3a9abdb35ed987a7252fe6e19fe Mon Sep 17 00:00:00 2001
From: uguu
Date: Wed, 23 May 2007 19:41:10 +0000
Subject: [PATCH] git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/deployer@7
bdfc86a3-8c30-0410-b963-dc9a622ac1c7
---
.../sourceforge/deployer/DeployerClassLoader.java | 26 ++++++++++------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/deployer/trunk/src/main/java/jp/sourceforge/deployer/DeployerClassLoader.java b/deployer/trunk/src/main/java/jp/sourceforge/deployer/DeployerClassLoader.java
index 43f048a..a907d5b 100644
--- a/deployer/trunk/src/main/java/jp/sourceforge/deployer/DeployerClassLoader.java
+++ b/deployer/trunk/src/main/java/jp/sourceforge/deployer/DeployerClassLoader.java
@@ -43,9 +43,8 @@ public class DeployerClassLoader extends ClassLoader {
* {@link DeployerClassLoader}ã¤ã³ã¹ã¿ã³ã¹ãåæåãã¾ãã
*
*
- * @param directories
- * ã¯ã©ã¹ã»ãã¡ã¤ã«ããªã½ã¼ã¹ãªã©ãæ¤ç´¢ãããã£ã¬ã¯ããªãè¤æ°æå®ãããã¨ãåºæ¥ã¾ã(ä¾ãã°ãclasses/,
- * conf/ã®ããã«)ã
+ * @param fileDirectories
+ * ã¯ã©ã¹ã»ãã¡ã¤ã«ããªã½ã¼ã¹ãªã©ãæ¤ç´¢ãããã£ã¬ã¯ããªãè¤æ°æå®ãããã¨ãåºæ¥ã¾ã(ä¾ãã°ãclasses/ãconf/ã®ããã«)ã
* nullã®å ´åã¯ç¡è¦ãã¾ããé
åä¸ã®nullãç¡è¦ãã¾ãã
* @param jarDirectories
* jarãã¡ã¤ã«ãæ¤ç´¢ãããã£ã¬ã¯ããªããã®ãã£ã¬ã¯ããªä»¥ä¸ã«åå¨ããjarãã¡ã¤ã«ãèªã¿è¾¼ã¿ã¾ãã
@@ -55,9 +54,9 @@ public class DeployerClassLoader extends ClassLoader {
* @throws MalformedURLException
* æå®ããããã£ã¬ã¯ããªã®å½¢å¼ãä¸æ£ã§ããå ´åã
*/
- public DeployerClassLoader(File[] directories, File[] jarDirectories, ClassLoader parent) throws MalformedURLException {
+ public DeployerClassLoader(File[] fileDirectories, File[] jarDirectories, ClassLoader parent) throws MalformedURLException {
super(parent);
- this.initialize(directories, jarDirectories);
+ this.initialize(fileDirectories, jarDirectories);
}
/**
@@ -65,9 +64,8 @@ public class DeployerClassLoader extends ClassLoader {
* {@link DeployerClassLoader}ã¤ã³ã¹ã¿ã³ã¹ãåæåãã¾ãã
*
*
- * @param directories
- * ã¯ã©ã¹ã»ãã¡ã¤ã«ããªã½ã¼ã¹ãªã©ãæ¤ç´¢ãããã£ã¬ã¯ããªãè¤æ°æå®ãããã¨ãåºæ¥ã¾ã(ä¾ãã°ãclasses/,
- * conf/ã®ããã«)ã
+ * @param fileDirectories
+ * ã¯ã©ã¹ã»ãã¡ã¤ã«ããªã½ã¼ã¹ãªã©ãæ¤ç´¢ãããã£ã¬ã¯ããªãè¤æ°æå®ãããã¨ãåºæ¥ã¾ã(ä¾ãã°ãclasses/ãconf/ã®ããã«)ã
* nullã®å ´åã¯ç¡è¦ãã¾ããé
åä¸ã®nullãç¡è¦ãã¾ãã
* @param jarDirectories
* jarãã¡ã¤ã«ãæ¤ç´¢ãããã£ã¬ã¯ããªããã®ãã£ã¬ã¯ããªä»¥ä¸ã«åå¨ããjarãã¡ã¤ã«ãèªã¿è¾¼ã¿ã¾ãã
@@ -75,9 +73,9 @@ public class DeployerClassLoader extends ClassLoader {
* @throws MalformedURLException
* æå®ããããã£ã¬ã¯ããªã®å½¢å¼ãä¸æ£ã§ããå ´åã
*/
- public DeployerClassLoader(File[] directories, File[] jarDirectories) throws MalformedURLException {
+ public DeployerClassLoader(File[] fileDirectories, File[] jarDirectories) throws MalformedURLException {
super();
- this.initialize(directories, jarDirectories);
+ this.initialize(fileDirectories, jarDirectories);
}
/**
@@ -85,7 +83,7 @@ public class DeployerClassLoader extends ClassLoader {
* ã¯ã©ã¹ãã¼ãã¼ãåæåãã¾ãã
*
*
- * @param directories
+ * @param fileDirectories
* ã¯ã©ã¹ã»ãã¡ã¤ã«ããªã½ã¼ã¹ãªã©ãæ¤ç´¢ãããã£ã¬ã¯ããªãè¤æ°æå®ãããã¨ãåºæ¥ã¾ã(ä¾ãã°ãclasses/,
* conf/ã®ããã«)ã
* nullã®å ´åã¯ç¡è¦ãã¾ããé
åä¸ã®nullãç¡è¦ãã¾ãã
@@ -95,11 +93,11 @@ public class DeployerClassLoader extends ClassLoader {
* @throws MalformedURLException
* æå®ããããã£ã¬ã¯ããªã®å½¢å¼ãä¸æ£ã§ããå ´åã
*/
- private void initialize(File[] directories, File[] jarDirectories) throws MalformedURLException {
+ private void initialize(File[] fileDirectories, File[] jarDirectories) throws MalformedURLException {
List urlList = new ArrayList();
- if (directories != null) {
- for (File f : directories) {
+ if (fileDirectories != null) {
+ for (File f : fileDirectories) {
if (f != null) {
urlList.add(f.toURL());
}
--
2.11.0