From e899706d484297f283373f8b55825d2c4e5a067c Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Wed, 28 Oct 2009 05:54:26 +0100 Subject: [PATCH] Made usage of StaticContent less convoluted. --- samples/bsh/src/dolda/bsvc/Main.java | 2 +- src/dolda/jsvc/util/StaticContent.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/samples/bsh/src/dolda/bsvc/Main.java b/samples/bsh/src/dolda/bsvc/Main.java index d6a83d2..9deae0e 100644 --- a/samples/bsh/src/dolda/bsvc/Main.java +++ b/samples/bsh/src/dolda/bsvc/Main.java @@ -7,7 +7,7 @@ public class Main { public static Responder responder() { Multiplexer root = new Multiplexer(); root.file("sh", new PerSession(ShellPage.class)); - root.file("css", new StaticContent(Main.class, "static/base.css", false, "text/css")); + root.file("css", new StaticContent(Main.class, "static/base.css", "text/css")); return(Misc.stdroot(root)); } } diff --git a/src/dolda/jsvc/util/StaticContent.java b/src/dolda/jsvc/util/StaticContent.java index 685669c..6d74e37 100644 --- a/src/dolda/jsvc/util/StaticContent.java +++ b/src/dolda/jsvc/util/StaticContent.java @@ -10,24 +10,22 @@ public class StaticContent implements Responder { private final boolean dir; private final String mimetype; - public StaticContent(Class base, String resname, boolean dir, String mimetype) { + public StaticContent(Class base, String resname, String mimetype) { this.base = base; - this.resname = resname; - this.dir = dir; + this.dir = ((this.resname = resname).charAt(resname.length() - 1) == '/'); this.mimetype = mimetype; } - public StaticContent(String resname, boolean dir, String mimetype) { - this(null, resname, dir, mimetype); + public StaticContent(String resname, String mimetype) { + this(null, resname, mimetype); } public void respond(Request req) { String nm; - if(dir) { - nm = resname + "/" + req.path(); - } else { + if(dir) + nm = resname + req.path(); + else nm = resname; - } InputStream in; if(base == null) { in = StaticContent.class.getClassLoader().getResourceAsStream(nm); -- 2.11.0