From 18a289941f029666d490c4045ed89dccf64b8a1b Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 13 Oct 2009 14:50:57 +0200
Subject: [PATCH] Publicized the multiplexer's matcher interface.

---
 src/dolda/jsvc/util/Multiplexer.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/dolda/jsvc/util/Multiplexer.java b/src/dolda/jsvc/util/Multiplexer.java
index df9e4c2..8b003b7 100644
--- a/src/dolda/jsvc/util/Multiplexer.java
+++ b/src/dolda/jsvc/util/Multiplexer.java
@@ -5,10 +5,10 @@ import java.util.*;
 
 public class Multiplexer implements Responder {
     private Responder def;
-    private Collection<Sub> subs = new LinkedList<Sub>();
+    private Collection<Matcher> matchers = new LinkedList<Matcher>();
 
-    private static interface Sub {
-	boolean match(Request req);
+    public static interface Matcher {
+	public boolean match(Request req);
     }
     
     public Multiplexer(Responder def) {
@@ -24,7 +24,7 @@ public class Multiplexer implements Responder {
     }
     
     public void file(final String path, final Responder responder) {
-	subs.add(new Sub() {
+	add(new Matcher() {
 		public boolean match(Request req) {
 		    if(req.path().equals(path)) {
 			responder.respond(req);
@@ -37,7 +37,7 @@ public class Multiplexer implements Responder {
 
     public void dir(String path, final Responder responder) {
 	final String fp = Misc.stripslashes(path, true, true);
-	subs.add(new Sub() {
+	add(new Matcher() {
 		public boolean match(Request req) {
 		    if(req.path().equals(fp)) {
 			throw(Restarts.redirect(fp + "/"));
@@ -50,9 +50,13 @@ public class Multiplexer implements Responder {
 	    });
     }
     
+    public void add(Matcher m) {
+	matchers.add(m);
+    }
+    
     public void respond(Request req) {
-	for(Sub s : subs) {
-	    if(s.match(req))
+	for(Matcher m : matchers) {
+	    if(m.match(req))
 		return;
 	}
 	def.respond(req);
-- 
2.11.0