refactored the (now named) MatchableURLPatternFactory.createMatchableURLPattern metho...

diff --git a/src/share/org/securityfilter/filter/MatchableURLPatternFactory.java b/src/share/org/securityfilter/filter/MatchableURLPatternFactory.java
index 0def693..51e8f99 100644 (file)
--- a/src/share/org/securityfilter/filter/MatchableURLPatternFactory.java
+++ b/src/share/org/securityfilter/filter/MatchableURLPatternFactory.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/Attic/MatchableURLPatternFactory.java,v 1.3 2002/09/14 08:45:28 maxcooper Exp $
- * $Revision: 1.3 $
- * $Date: 2002/09/14 08:45:28 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/Attic/MatchableURLPatternFactory.java,v 1.4 2002/12/09 10:17:12 maxcooper Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/12/09 10:17:12 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -65,7 +65,7 @@ import org.securityfilter.config.WebResourceCollection;
  * of a set of instances.
  *
  * @author Max Cooper (max@maxcooper.com)
- * @version $Revision: 1.3 $ $Date: 2002/09/14 08:45:28 $
+ * @version $Revision: 1.4 $ $Date: 2002/12/09 10:17:12 $
  */
 public class MatchableURLPatternFactory {
    private RECompiler compiler;
@@ -87,7 +87,7 @@ public class MatchableURLPatternFactory {
     *
     * @exception RESyntaxException throws exception if pattern cannot be compiled after conversion to RE syntax
     */
-   public MatchableURLPattern createURLPatternMatcher(
+   public MatchableURLPattern createMatchableURLPattern(
       String pattern,
       SecurityConstraint constraint,
       WebResourceCollection resourceCollection,

diff --git a/src/share/org/securityfilter/filter/SecurityFilter.java b/src/share/org/securityfilter/filter/SecurityFilter.java
index ce17255..8aa21a5 100644 (file)
--- a/src/share/org/securityfilter/filter/SecurityFilter.java
+++ b/src/share/org/securityfilter/filter/SecurityFilter.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/SecurityFilter.java,v 1.8 2002/09/14 08:45:29 maxcooper Exp $
- * $Revision: 1.8 $
- * $Date: 2002/09/14 08:45:29 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/SecurityFilter.java,v 1.9 2002/12/09 10:17:12 maxcooper Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/12/09 10:17:12 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -78,7 +78,7 @@ import java.util.*;
  *
  * @author Max Cooper (max@maxcooper.com)
  * @author Torgeir Veimo (torgeir@pobox.com)
- * @version $Revision: 1.8 $ $Date: 2002/09/14 08:45:29 $
+ * @version $Revision: 1.9 $ $Date: 2002/12/09 10:17:12 $
  */
 public class SecurityFilter implements Filter {
    public static final String SAVED_REQUEST_URL = SecurityFilter.class.getName() + ".SAVED_REQUEST_URL";
@@ -221,7 +221,7 @@ public class SecurityFilter implements Filter {
             for (Iterator rIter = constraint.getWebResourceCollections().iterator(); rIter.hasNext();) {
                WebResourceCollection resourceCollection = (WebResourceCollection) rIter.next();
                for (Iterator pIter = resourceCollection.getURLPatterns().iterator(); pIter.hasNext();) {
-                  MatchableURLPattern pattern = patternFactory.createURLPatternMatcher(
+                  MatchableURLPattern pattern = patternFactory.createMatchableURLPattern(
                      (String) pIter.next(),
                      constraint,
                      resourceCollection,