From 520a32fe80bfee970e6ea01bbd0f1681f655d2b5 Mon Sep 17 00:00:00 2001 From: stefanp Date: Thu, 21 Nov 2002 18:32:47 +0000 Subject: [PATCH] some tiny fixes --- src/helma/doc/DocElement.java | 1 + src/helma/doc/DocSkin.java | 5 ++++- src/helma/doc/Util.java | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/helma/doc/DocElement.java b/src/helma/doc/DocElement.java index b841aab3..151a77c7 100644 --- a/src/helma/doc/DocElement.java +++ b/src/helma/doc/DocElement.java @@ -211,6 +211,7 @@ public abstract class DocElement implements IPathElement { buf.append (line+"\n"); line = in.readLine (); } + in.close (); return buf.toString(); } catch (IOException e) { return (""); diff --git a/src/helma/doc/DocSkin.java b/src/helma/doc/DocSkin.java index decf09db..ff605cf2 100644 --- a/src/helma/doc/DocSkin.java +++ b/src/helma/doc/DocSkin.java @@ -51,7 +51,10 @@ public class DocSkin extends DocFileElement { } if (j > i+2) { String str = (new String (source, i+2, j-i)).trim (); - str = str.substring (0, str.indexOf(" ")); + if (str.endsWith("%>")) + str = str.substring (0, str.length()-2); + if (str.indexOf (" ")>-1) + str = str.substring (0, str.indexOf(" ")); if (str.indexOf(".")>-1 && (str.startsWith ("param.") || str.startsWith ("response.") diff --git a/src/helma/doc/Util.java b/src/helma/doc/Util.java index 6450af38..102f9ad5 100644 --- a/src/helma/doc/Util.java +++ b/src/helma/doc/Util.java @@ -12,8 +12,10 @@ public final class Util { } public static boolean isExcluded (String str) { - if (excluded.size ()==0) + if (excluded.size ()==0) { excluded.add ("cvs"); + excluded.add (".docs"); + } return (excluded.contains (str.toLowerCase ())); }