curcuru 01/08/10 10:42:47
Modified: test/java/src/org/apache/qetest/xsl ConformanceDirRules.java
Log:
Update includes to accept dir;foo;bar multiple dirs; minor javadoc cleanup
Revision Changes Path
1.2 +21 -14
xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceDirRules.java
Index: ConformanceDirRules.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceDirRules.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConformanceDirRules.java 2000/11/01 23:26:56 1.1
+++ ConformanceDirRules.java 2001/08/10 17:42:47 1.2
@@ -60,12 +60,14 @@
import java.io.File;
import java.util.Hashtable;
+import java.util.StringTokenizer;
/**
* Returns directories that are either on an inclusion list, or
* just ones that don't begin with [x|X], or are 'CVS'.
+ * Rudimentary multiple inclusion dirs are now supported.
* @author [EMAIL PROTECTED]
- * @version $Id: ConformanceDirRules.java,v 1.1 2000/11/01 23:26:56 curcuru
Exp $
+ * @version $Id: ConformanceDirRules.java,v 1.2 2001/08/10 17:42:47 curcuru
Exp $
*/
public class ConformanceDirRules implements FilenameFilter
{
@@ -76,7 +78,7 @@
/**
* Initialize with a case-sensitive Hash of directory names to include.
*
- * NEEDSDOC @param iDirs
+ * @param iDirs hash of inclusion dirs
*/
public ConformanceDirRules(Hashtable iDirs)
{
@@ -84,9 +86,9 @@
}
/**
- * Initialize with a case-insensitive String directory name to include.
+ * Initialize with a case-insensitive String directory name(s) to
include.
*
- * NEEDSDOC @param incDir
+ * @param incDir semicolon-delimited string of inclusion dir(s)
*/
public ConformanceDirRules(String incDir)
{
@@ -107,7 +109,7 @@
/**
* Accessor methods for case-sensitive Hash of directory names to
include.
*
- * NEEDSDOC @param iDirs
+ * @param iDirs hash of inclusion dirs
*/
public void setIncludeDirs(Hashtable iDirs)
{
@@ -121,7 +123,7 @@
/**
* Accessor methods for case-sensitive Hash of directory names to
include.
*
- * NEEDSDOC ($objectName$) @return
+ * @return clone of our hash of inclusion dirs
*/
public Hashtable getIncludeDirs()
{
@@ -141,7 +143,7 @@
/**
* Accessor method to set a case-insensitive String directory name to
include.
*
- * NEEDSDOC @param incDir
+ * @param incDir semicolon-delimited string of inclusion dir(s)
*/
public void setIncludeDirs(String incDir)
{
@@ -153,8 +155,8 @@
* <p><b>Note:</b> simply uses .toUpperCase() and .toLowerCase() on the
input string;
* does not do full case-checking on the entire string!</p>
*
- * NEEDSDOC @param incDir
- * NEEDSDOC @param caseSensitive
+ * @param incDir semicolon-delimited string of inclusion dir(s)
+ * @param caseSensitive - should be obvious, shouldn't it?
*/
public void setIncludeDirs(String incDir, boolean caseSensitive)
{
@@ -164,12 +166,17 @@
includeDirs = null;
includeDirs = new Hashtable();
- includeDirs.put(incDir, "");
-
- if (!caseSensitive)
+ StringTokenizer st = new StringTokenizer(incDir, ";");
+ while (st.hasMoreTokens())
{
- includeDirs.put(incDir.toUpperCase(), "");
- includeDirs.put(incDir.toLowerCase(), "");
+ String tmp = st.nextToken();
+ // Value in hash is ignored
+ includeDirs.put(tmp, Boolean.TRUE);
+ if (!caseSensitive)
+ {
+ includeDirs.put(tmp.toUpperCase(), Boolean.TRUE);
+ includeDirs.put(tmp.toLowerCase(), Boolean.TRUE);
+ }
}
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
