From 8bc447ad0570bd70ed9bad35e9317952c2d30adc Mon Sep 17 00:00:00 2001 From: stefanp Date: Thu, 7 Mar 2002 14:18:20 +0000 Subject: [PATCH] replaced DocFunction.getPrototype() with DocFunction.getDocPrototype() so that we can implement IPathElement --- src/helma/doc/DocHtmlWriter.java | 18 +++++++++--------- src/helma/doc/DocWriter.java | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/helma/doc/DocHtmlWriter.java b/src/helma/doc/DocHtmlWriter.java index d3f1de05..9d2ca931 100644 --- a/src/helma/doc/DocHtmlWriter.java +++ b/src/helma/doc/DocHtmlWriter.java @@ -129,9 +129,9 @@ public class DocHtmlWriter extends PrintWriter { StringBuffer buf = new StringBuffer (); buf.append(""); if ( DocRun.getOption("-f").equals("true") ) - buf.append("" ); + buf.append("" ); if ( func.isMacro() ) { - buf.append( func.getPrototype().getName()+"."+func.getName().substring(0,func.getName().length()-6) ); + buf.append( func.getDocPrototype().getName()+"."+func.getName().substring(0,func.getName().length()-6) ); } else { buf.append(func.getName().trim()); if( func.isTemplate() || func.isFunction() ) { @@ -161,9 +161,9 @@ public class DocHtmlWriter extends PrintWriter { String name = tag.getName(); switch (kind) { case DocTag.ARG: - return( "arg" + i + ": " + text ); + return( "Argument " + i + ": " + text ); case DocTag.PARAM: - return( "" + name + " " + text ); + return( "Parameter " + name + " " + text ); case DocTag.RETURNS: case DocTag.AUTHOR: case DocTag.VERSION: @@ -178,7 +178,7 @@ public class DocHtmlWriter extends PrintWriter { StringBuffer buf = new StringBuffer(); StringTokenizer tok = new StringTokenizer (text.trim(),"."); if ( tok.countTokens()==0 ) return text; - DocPrototype dp = app.getPrototype( tok.nextToken() ); + DocPrototype dp = app.getDocPrototype( tok.nextToken() ); if ( dp==null ) return text; buf.append("

" + name.substring(0,1).toUpperCase() + "

"); curChar = name.substring(0,1).toLowerCase(); } - print("
" + dl[i].getName() + " - " + dl[i].getTypeName() + " in " + dl[i].getPrototype().getName() + "" ); + print("
" + dl[i].getName() + " - " + dl[i].getTypeName() + " in " + dl[i].getDocPrototype().getName() + "" ); } print("
"); } @@ -249,7 +249,7 @@ public class DocHtmlWriter extends PrintWriter { if ( pt.getName().equalsIgnoreCase("hopobject") ) return; DocApplication app = pt.getApplication(); - DocPrototype hopobject = (DocPrototype)app.getPrototype("hopobject"); + DocPrototype hopobject = (DocPrototype)app.getDocPrototype("hopobject"); if ( hopobject==null || hopobject.countFunctions()==0 ) return; print(""); @@ -283,7 +283,7 @@ public class DocHtmlWriter extends PrintWriter { } public void printFunction(DocFunction func) { - print( "

in " + func.getPrototype().getName() + "/" + (new File(func.getLocation())).getName() + ":" ); + print( "

in " + func.getDocPrototype().getName() + "/" + (new File(func.getLocation())).getName() + ":" ); print( "
");
 		print( HtmlEncoder.encodeAll(func.getSource()) );
 		print( "
" ); @@ -318,7 +318,7 @@ public class DocHtmlWriter extends PrintWriter { return "prototype_" + docEl.getName() + ".html"; } else if ( docEl.isMethod() ) { DocFunction df = (DocFunction)docEl; - return "prototype_" + df.getPrototype().getName() + ".html#" + df.getName(); + return "prototype_" + df.getDocPrototype().getName() + ".html#" + df.getName(); } else { return ""; } diff --git a/src/helma/doc/DocWriter.java b/src/helma/doc/DocWriter.java index 3bbafdce..e9afe7bf 100644 --- a/src/helma/doc/DocWriter.java +++ b/src/helma/doc/DocWriter.java @@ -111,12 +111,12 @@ public class DocWriter extends DocHtmlWriter { DocFunction[] df = app.listFunctions(); for ( int i=0;i