Menu
▾
▴
webmacro-cvs — receive cvs commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(97) |
Dec
(35) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(12) |
Feb
(55) |
Mar
(21) |
Apr
(3) |
May
(7) |
Jun
(25) |
Jul
(108) |
Aug
(23) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
(6) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(13) |
Feb
|
Mar
(257) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(38) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(63) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tim P <ti...@us...> - 2008-03-20 14:55:44
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23672 Modified Files: checkstyle.xml Log Message: XML Index: checkstyle.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/checkstyle.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** checkstyle.xml 20 Mar 2008 14:36:41 -0000 1.2 --- checkstyle.xml 20 Mar 2008 14:55:41 -0000 1.3 *************** *** 64,68 **** - <!-- Checks for Naming Conventions. --> <!-- See http://checkstyle.sf.net/config_naming.html --> --- 64,67 ---- *************** *** 140,144 **** <module name="ParenPad"/> <!-- None allowed --> ! <module name="TabCharacter"> <module name="WhitespaceAfter"> <property name="tokens" value="SEMI"/> --- 139,143 ---- <module name="ParenPad"/> <!-- None allowed --> ! <module name="TabCharacter" /> <module name="WhitespaceAfter"> <property name="tokens" value="SEMI"/> *************** *** 151,155 **** <!-- See http://checkstyle.sf.net/config_modifiers.html --> <!-- module name="ModifierOrder"/ --> ! <module name="RedundantModifier"> --- 150,154 ---- <!-- See http://checkstyle.sf.net/config_modifiers.html --> <!-- module name="ModifierOrder"/ --> ! <module name="RedundantModifier"/> *************** *** 201,205 **** <!-- Miscellaneous other checks. --> <!-- See http://checkstyle.sf.net/config_misc.html --> ! <module name="ArrayTypeStyle"> <!-- We don't do this at all --> <!-- module name="FinalParameters"/ --> --- 200,204 ---- <!-- Miscellaneous other checks. --> <!-- See http://checkstyle.sf.net/config_misc.html --> ! <module name="ArrayTypeStyle" /> <!-- We don't do this at all --> <!-- module name="FinalParameters"/ --> *************** *** 215,216 **** --- 214,216 ---- </module> + |
|
From: Tim P <ti...@us...> - 2008-03-20 14:36:46
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16049 Modified Files: checkstyle.xml Log Message: Supress what cannot be changed Index: checkstyle.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/checkstyle.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** checkstyle.xml 17 Mar 2008 23:37:49 -0000 1.1 --- checkstyle.xml 20 Mar 2008 14:36:41 -0000 1.2 *************** *** 37,41 **** <property name="cacheFile" value="${checkstyle.cache.file}"/> ! <property name="tabWidth" value="2"/> <!-- module name="LeftCurly"> <property name="option" value="eol"/> --- 37,41 ---- <property name="cacheFile" value="${checkstyle.cache.file}"/> ! <property name="tabWidth" value="4"/> <!-- module name="LeftCurly"> <property name="option" value="eol"/> *************** *** 53,62 **** <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> - <module name="JavadocMethod"> - <property name="scope" value="nothing"/> - </module> <module name="JavadocType"> <property name="scope" value="public"/> </module> <module name="JavadocVariable"> <property name="scope" value="nothing"/> --- 53,62 ---- <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> <module name="JavadocType"> <property name="scope" value="public"/> </module> + <module name="JavadocMethod"> + <property name="scope" value="nothing"/> + </module> <module name="JavadocVariable"> <property name="scope" value="nothing"/> *************** *** 122,126 **** <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> ! <module name="EmptyForIteratorPad"/> <module name="NoWhitespaceAfter"> <property name="tokens" value="TYPECAST"/> --- 122,131 ---- <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> ! <module name="EmptyForIteratorPad"> ! <property name="option" value="space" /> ! </module> ! <module name="EmptyForInitializerPad"> ! <property name="option" value="space" /> ! </module> <module name="NoWhitespaceAfter"> <property name="tokens" value="TYPECAST"/> *************** *** 135,139 **** <module name="ParenPad"/> <!-- None allowed --> ! <!-- module name="TabCharacter"/ --> <module name="WhitespaceAfter"> <property name="tokens" value="SEMI"/> --- 140,144 ---- <module name="ParenPad"/> <!-- None allowed --> ! <module name="TabCharacter"> <module name="WhitespaceAfter"> <property name="tokens" value="SEMI"/> *************** *** 146,150 **** <!-- See http://checkstyle.sf.net/config_modifiers.html --> <!-- module name="ModifierOrder"/ --> ! <!-- module name="RedundantModifier"/ --> --- 151,155 ---- <!-- See http://checkstyle.sf.net/config_modifiers.html --> <!-- module name="ModifierOrder"/ --> ! <module name="RedundantModifier"> *************** *** 152,156 **** <!-- See http://checkstyle.sf.net/config_blocks.html --> <module name="AvoidNestedBlocks"/> ! <module name="EmptyBlock"/> <module name="NeedBraces"> --- 157,162 ---- <!-- See http://checkstyle.sf.net/config_blocks.html --> <module name="AvoidNestedBlocks"/> ! <!-- We have quite a few, all OK --> ! <!-- module name="EmptyBlock"/ --> <module name="NeedBraces"> *************** *** 174,187 **** </module> <module name="IllegalInstantiation"/> - <!-- Suppressed in poem generated code --> <module name="InnerAssignment"/> - <!-- Suppressed in poem generated code --> - <!-- But we have another xx occurrances --> <module name="MagicNumber"/> <module name="MissingSwitchDefault"/> ! <!-- We have loads of unchecked exceptions --> ! <!-- also subclasses of PoemException in generated--> ! <!-- bad check in my view --> ! <!-- module name="RedundantThrows"/ --> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> --- 180,187 ---- </module> <module name="IllegalInstantiation"/> <module name="InnerAssignment"/> <module name="MagicNumber"/> <module name="MissingSwitchDefault"/> ! <module name="RedundantThrows" /> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> *************** *** 193,206 **** <module name="HideUtilityClassConstructor"/> <module name="InterfaceIsType"/> ! <!-- We do use public fields responsibly sometimes --> ! <!-- module name="VisibilityModifier"> <property name="protectedAllowed" value="true"/> <property name="packageAllowed" value="true"/> ! </module --> <!-- Miscellaneous other checks. --> <!-- See http://checkstyle.sf.net/config_misc.html --> ! <!-- module name="ArrayTypeStyle"/ --> <!-- We don't do this at all --> <!-- module name="FinalParameters"/ --> --- 193,205 ---- <module name="HideUtilityClassConstructor"/> <module name="InterfaceIsType"/> ! <module name="VisibilityModifier"> <property name="protectedAllowed" value="true"/> <property name="packageAllowed" value="true"/> ! </module> <!-- Miscellaneous other checks. --> <!-- See http://checkstyle.sf.net/config_misc.html --> ! <module name="ArrayTypeStyle"> <!-- We don't do this at all --> <!-- module name="FinalParameters"/ --> |
|
From: Tim P <ti...@us...> - 2008-03-20 14:16:53
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8181/src/org/webmacro/util Modified Files: HTMLEscaper.java Log Message: Checkstyle: Utility classes should not have a public or default constructor. Index: HTMLEscaper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/HTMLEscaper.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HTMLEscaper.java 5 Dec 2003 20:18:13 -0000 1.9 --- HTMLEscaper.java 20 Mar 2008 14:16:50 -0000 1.10 *************** *** 29,33 **** public class HTMLEscaper { ! /** * This method will take the input and escape characters that have --- 29,35 ---- public class HTMLEscaper { ! /** Utility classes should not have a public or default constructor. */ ! private HTMLEscaper() {} ! /** * This method will take the input and escape characters that have |
|
From: Tim P <ti...@us...> - 2008-03-20 14:13:51
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6555/src/org/webmacro/resource Modified Files: BrokerTemplateProviderHelper.java Log Message: Checkstyle: unused import Index: BrokerTemplateProviderHelper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/BrokerTemplateProviderHelper.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** BrokerTemplateProviderHelper.java 20 Mar 2008 11:59:34 -0000 1.14 --- BrokerTemplateProviderHelper.java 20 Mar 2008 14:12:58 -0000 1.15 *************** *** 32,36 **** import org.webmacro.Log; import org.webmacro.NotFoundException; - import org.webmacro.Provider; import org.webmacro.ResourceException; import org.webmacro.Template; --- 32,35 ---- *************** *** 44,48 **** * Broker. It is called by both BrokerTemplateProvider and * TemplateProvider. ! * @see Provider * @see TemplateProvider * @see BrokerTemplateProvider --- 43,47 ---- * Broker. It is called by both BrokerTemplateProvider and * TemplateProvider. ! * @see org.webmacro.Provider * @see TemplateProvider * @see BrokerTemplateProvider |
|
From: Tim P <ti...@us...> - 2008-03-20 14:07:26
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4109 Modified Files: checkstyleSuppressions.xml Log Message: Add parser exclusions Index: checkstyleSuppressions.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/checkstyleSuppressions.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** checkstyleSuppressions.xml 17 Mar 2008 23:37:49 -0000 1.1 --- checkstyleSuppressions.xml 20 Mar 2008 14:06:53 -0000 1.2 *************** *** 14,16 **** --- 14,49 ---- files="Test*.java" /> + <!-- Generated by javacc - not in our control --> + <suppress checks="InnerAssignment" + files="ASCII_CharStream.java" /> + <suppress checks="InnerAssignment" + files="BackupCharStream.java" /> + <suppress checks="InnerAssignment" + files="TokenMgrError.java" /> + <suppress checks="InnerAssignment" + files="WMParser_implTokenManager.java" /> + <suppress checks="MethodLength" + files="WMParser_implTokenManager.java" /> + <suppress checks="LineLength" + files="WMParser_implTokenManager.java" /> + <suppress checks="FileLength" + files="WMParser_impl.java" /> + <suppress checks="LineLength" + files="WMParser_impl.java" /> + <suppress checks="WhitespaceAfter" + files="WMParser_impl.java" /> + <suppress checks="WhitespaceBefore" + files="WMParser_impl.java" /> + <suppress checks="NestedBlocks" + files="WMParser_impl.java" /> + <suppress checks="InnerAssignment" + files="WMParser_impl.java" /> + + <!-- The code is clear --> + <suppress checks="JavadocMethod" + files="Expression.java" /> + <suppress checks="JavadocType" + files="Expression.java" /> + + </suppressions> |
|
From: Tim P <ti...@us...> - 2008-03-20 12:55:01
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3805/src/org/webmacro/engine Modified Files: ParamBuilder.java Log Message: Checkstyle: javadoc Index: ParamBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/ParamBuilder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ParamBuilder.java 12 Jun 2003 00:47:45 -0000 1.11 --- ParamBuilder.java 20 Mar 2008 12:54:58 -0000 1.12 *************** *** 24,32 **** package org.webmacro.engine; ! public class ParamBuilder implements Builder { - private Object[] _names; --- 24,31 ---- package org.webmacro.engine; ! /** Build from parameters. */ public class ParamBuilder implements Builder { private Object[] _names; |
|
From: Tim P <ti...@us...> - 2008-03-20 12:53:40
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3422/src/org/webmacro/engine Modified Files: TemplateDumper.java Log Message: Checkstyle: javadoc Index: TemplateDumper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/TemplateDumper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TemplateDumper.java 18 Mar 2008 10:57:41 -0000 1.6 --- TemplateDumper.java 20 Mar 2008 12:53:36 -0000 1.7 *************** *** 29,32 **** --- 29,35 ---- import java.io.InputStreamReader; + /** + * Dump a template. + */ public class TemplateDumper extends TemplateVisitor { |
|
From: Tim P <ti...@us...> - 2008-03-20 12:52:43
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3038/src/org/webmacro/servlet Modified Files: Servlet20Broker.java Log Message: Checkstyle: whitespace Index: Servlet20Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/Servlet20Broker.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Servlet20Broker.java 31 Oct 2005 02:46:41 -0000 1.8 --- Servlet20Broker.java 20 Mar 2008 12:52:38 -0000 1.9 *************** *** 21,25 **** */ - package org.webmacro.servlet; --- 21,24 ---- *************** *** 44,47 **** --- 43,47 ---- * </p> * writes log messages to the servlet log. + * * @author Brian Goetz * @author Marc Palmer (wj...@wa...) *************** *** 78,82 **** /** ! * Get a Servlet API 2.0 compatible broker for the Servlet specified * @param s The servlet * @param additionalProperties --- 78,82 ---- /** ! * Get a Servlet API 2.0 compatible broker for the Servlet specified. * @param s The servlet * @param additionalProperties *************** *** 93,97 **** /** ! * Get a Servlet API 2.0 compatible broker for the ServletContext specified * @param sc The Servlet context * @param cl A ClassLoader to use, presumably the webapp classloader --- 93,97 ---- /** ! * Get a Servlet API 2.0 compatible broker for the ServletContext specified. * @param sc The Servlet context * @param cl A ClassLoader to use, presumably the webapp classloader *************** *** 104,108 **** Properties additionalProperties) throws InitException { ! return _getBroker(sc, cl, additionalProperties, false, sc.toString() ); } --- 104,108 ---- Properties additionalProperties) throws InitException { ! return _getBroker(sc, cl, additionalProperties, false, sc.toString()); } *************** *** 144,148 **** (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName ! + " joining Broker" + " " + b.getName() ); return b; } --- 144,148 ---- (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName ! + " joining Broker" + " " + b.getName()); return b; } *************** *** 157,162 **** } ! /** ! * Get a resource (file) from the the Broker's class loader */ public URL getResource (String name) { --- 157,161 ---- } ! /** Get a resource (file) from the the Broker's class loader. */ public URL getResource (String name) { *************** *** 168,172 **** /** ! * Get a resource (file) from the Broker's class loader */ public InputStream getResourceAsStream (String name) --- 167,171 ---- /** ! * Get a resource (file) from the Broker's class loader. */ public InputStream getResourceAsStream (String name) *************** *** 181,186 **** * Loads a class by name. Uses the servlet classloader to load the * class. If the class is not found uses the Broker classForName ! * implementation. */ ! public Class classForName (String name) throws ClassNotFoundException { --- 180,185 ---- * Loads a class by name. Uses the servlet classloader to load the * class. If the class is not found uses the Broker classForName ! * implementation. ! */ public Class classForName (String name) throws ClassNotFoundException { |
|
From: Tim P <ti...@us...> - 2008-03-20 12:50:30
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2230/src/org/webmacro/engine Modified Files: VariableBuilder.java Log Message: Checkstyle: javadoc Index: VariableBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/VariableBuilder.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** VariableBuilder.java 21 Jul 2003 21:27:23 -0000 1.16 --- VariableBuilder.java 20 Mar 2008 12:50:26 -0000 1.17 *************** *** 24,28 **** package org.webmacro.engine; ! public class VariableBuilder implements Builder { --- 24,28 ---- package org.webmacro.engine; ! /** Gets variable values from context. */ public class VariableBuilder implements Builder { |
|
From: Tim P <ti...@us...> - 2008-03-20 12:49:11
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1668/src/org/webmacro/engine Modified Files: NullBuilder.java Log Message: Checkstyle: javadoc Index: NullBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/NullBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NullBuilder.java 12 Jun 2003 00:47:45 -0000 1.4 --- NullBuilder.java 20 Mar 2008 12:49:06 -0000 1.5 *************** *** 24,28 **** package org.webmacro.engine; ! final public class NullBuilder implements Builder { --- 24,28 ---- package org.webmacro.engine; ! /** Returns null. */ final public class NullBuilder implements Builder { |
|
From: Tim P <ti...@us...> - 2008-03-20 12:48:25
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1391/src/org/webmacro/resource Modified Files: TemplateProvider.java Log Message: Checkstyle: organise imports Index: TemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/TemplateProvider.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** TemplateProvider.java 28 Jan 2008 16:00:33 -0000 1.29 --- TemplateProvider.java 20 Mar 2008 12:48:20 -0000 1.30 *************** *** 24,44 **** package org.webmacro.resource; - import org.webmacro.*; - import org.webmacro.engine.FileTemplate; - import org.webmacro.util.Settings; - import java.io.File; import java.util.StringTokenizer; /** * The TemplateProvider is the WebMacro class responsible for * loading templates. You could replace it with your own version * in the configuration file. Templates are loaded from the filesystem, ! * relative to the TemplatePath specified in teh configuration. * <p> * Ordinarily you would not accses this class directly, but * instead you would call the Broker and it would look up and * use the TemplateProvider for you. ! * @see Provider */ final public class TemplateProvider extends CachingProvider --- 24,51 ---- package org.webmacro.resource; import java.io.File; import java.util.StringTokenizer; + import org.webmacro.Broker; + import org.webmacro.InitException; + import org.webmacro.Log; + import org.webmacro.NotFoundException; + import org.webmacro.ResourceException; + import org.webmacro.Template; + import org.webmacro.TemplateException; + import org.webmacro.engine.FileTemplate; + import org.webmacro.util.Settings; + /** * The TemplateProvider is the WebMacro class responsible for * loading templates. You could replace it with your own version * in the configuration file. Templates are loaded from the filesystem, ! * relative to the TemplatePath specified in the configuration. * <p> * Ordinarily you would not accses this class directly, but * instead you would call the Broker and it would look up and * use the TemplateProvider for you. ! * ! * @see org.webmacro.Provider */ final public class TemplateProvider extends CachingProvider *************** *** 56,60 **** /** * Responsible for deciding, how often resources ! * should be checked for modification at max */ private ReloadDelayDecorator reloadDelay; --- 63,67 ---- /** * Responsible for deciding, how often resources ! * should be checked for modification at max. */ private ReloadDelayDecorator reloadDelay; *************** *** 97,101 **** /** * Create a new TemplateProvider that uses the specified directory ! * as the source for Template objects that it will return * @exception InitException provider failed to initialize */ --- 104,108 ---- /** * Create a new TemplateProvider that uses the specified directory ! * as the source for Template objects that it will return. * @exception InitException provider failed to initialize */ *************** *** 136,140 **** /** ! * Supports the "template" type */ final public String getType () --- 143,147 ---- /** ! * Supports the "template" type. */ final public String getType () |
|
From: Tim P <ti...@us...> - 2008-03-20 12:45:23
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32703/src/org/webmacro/engine Modified Files: StringMacroAdapter.java Log Message: Checkstyle: organise imports Index: StringMacroAdapter.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/StringMacroAdapter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StringMacroAdapter.java 12 Jun 2003 00:47:45 -0000 1.5 --- StringMacroAdapter.java 20 Mar 2008 12:45:19 -0000 1.6 *************** *** 23,30 **** package org.webmacro.engine; - import org.webmacro.*; - import java.io.IOException; /** * Looks like a Macro, but really it's a String. --- 23,34 ---- package org.webmacro.engine; import java.io.IOException; + import org.webmacro.Context; + import org.webmacro.FastWriter; + import org.webmacro.Macro; + import org.webmacro.TemplateVisitor; + import org.webmacro.Visitable; + /** * Looks like a Macro, but really it's a String. |
|
From: Tim P <ti...@us...> - 2008-03-20 12:44:33
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32304/src/org/webmacro Modified Files: Context.java Log Message: Checkstyle: javadoc Index: Context.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Context.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Context.java 18 Mar 2008 16:14:56 -0000 1.65 --- Context.java 20 Mar 2008 12:44:27 -0000 1.66 *************** *** 73,77 **** /** ! * Create a new Context relative to the default WM instance */ public Context() throws InitException { --- 73,77 ---- /** ! * Create a new Context relative to the default WM instance. */ public Context() throws InitException { *************** *** 80,84 **** /** ! * Create a new Context relative to the supplied broker */ public Context (Broker broker) --- 80,84 ---- /** ! * Create a new Context relative to the supplied broker. */ public Context (Broker broker) *************** *** 88,91 **** --- 88,92 ---- } + /** Holder for template place. */ public final static class TemplateEvaluationContext { *************** *** 148,152 **** /** ! * Get the instance of the Broker for this request */ public final Broker getBroker () --- 149,153 ---- /** ! * Get the instance of the Broker for this request. */ public final Broker getBroker () *************** *** 188,192 **** /** ! * Get the EvaluationExceptionHandler */ public EvaluationExceptionHandler getEvaluationExceptionHandler () --- 189,193 ---- /** ! * Get the EvaluationExceptionHandler. */ public EvaluationExceptionHandler getEvaluationExceptionHandler () *************** *** 204,208 **** /** ! * Set a new EvaluationExceptionHandler */ public void setEvaluationExceptionHandler (EvaluationExceptionHandler eeh) --- 205,209 ---- /** ! * Set a new EvaluationExceptionHandler. */ public void setEvaluationExceptionHandler (EvaluationExceptionHandler eeh) *************** *** 288,292 **** /** * Convenience method for putting static classes into the context, wraps the ! * class instance in a wrapper */ public final Object put (Object name, Class c) --- 289,293 ---- /** * Convenience method for putting static classes into the context, wraps the ! * class instance in a wrapper. */ public final Object put (Object name, Class c) *************** *** 420,424 **** /** * Same as get(name) but can be overridden by subclasses to do ! * something different */ public Object getProperty (Object name) throws PropertyException --- 421,425 ---- /** * Same as get(name) but can be overridden by subclasses to do ! * something different. */ public Object getProperty (Object name) throws PropertyException *************** *** 429,433 **** /** * Same as put(name,value) but can be overridden by subclasses to do ! * something different */ public boolean setProperty (Object name, Object value) --- 430,434 ---- /** * Same as put(name,value) but can be overridden by subclasses to do ! * something different. */ public boolean setProperty (Object name, Object value) *************** *** 440,444 **** /** * Same as get(Object names[]) but can be overridden by subclasses ! * to behave differently */ public Object getProperty (Object[] names) throws PropertyException --- 441,445 ---- /** * Same as get(Object names[]) but can be overridden by subclasses ! * to behave differently. */ public Object getProperty (Object[] names) throws PropertyException *************** *** 449,453 **** /** * Same as set(Object names[], Object value) but can be overridden ! * by subclasses to behave differently * @return whether or not the set was successful */ --- 450,454 ---- /** * Same as set(Object names[], Object value) but can be overridden ! * by subclasses to behave differently. * @return whether or not the set was successful */ *************** *** 476,480 **** /** ! * Method from Map interface, operates on underlying Map */ public boolean containsKey (Object key) --- 477,481 ---- /** ! * Method from Map interface, operates on underlying Map. */ public boolean containsKey (Object key) *************** *** 484,488 **** /** ! * Method from Map interface, operates on underlying Map */ public final boolean containsValue (Object value) --- 485,489 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final boolean containsValue (Object value) *************** *** 492,496 **** /** ! * Method from Map interface, operates on underlying Map */ public final Set entrySet () --- 493,497 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final Set entrySet () *************** *** 500,504 **** /** ! * Method from Map interface, operates on underlying Map */ public final boolean isEmpty () --- 501,505 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final boolean isEmpty () *************** *** 508,512 **** /** ! * Method from Map interface, operates on underlying Map */ public final Set keySet () --- 509,513 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final Set keySet () *************** *** 516,520 **** /** ! * Method from Map interface, operates on underlying Map */ public final void putAll (Map t) --- 517,521 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final void putAll (Map t) *************** *** 524,528 **** /** ! * Method from Map interface, operates on underlying Map */ public final Object remove (Object key) --- 525,529 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final Object remove (Object key) *************** *** 532,536 **** /** ! * Method from Map interface, operates on underlying Map */ public final int size () --- 533,537 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final int size () *************** *** 540,544 **** /** ! * Method from Map interface, operates on underlying Map */ public final Collection values () --- 541,545 ---- /** ! * Method from Map interface, operates on underlying Map. */ public final Collection values () *************** *** 551,555 **** /** ! * Dump the variables (and their values) contained in this Context. Output is similiar to * <code>java.util.HashMap.toString()</code> */ --- 552,557 ---- /** ! * Dump the variables (and their values) contained in this Context. ! * Output is similiar to * <code>java.util.HashMap.toString()</code> */ |
|
From: Tim P <ti...@us...> - 2008-03-20 12:40:23
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30736/src/org/webmacro/servlet Modified Files: URLTool.java Log Message: Checkstyle: javadoc Index: URLTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/URLTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** URLTool.java 30 Jul 2003 04:51:17 -0000 1.6 --- URLTool.java 20 Mar 2008 12:40:18 -0000 1.7 *************** *** 32,36 **** /** ! * Provide Template with access to url handing routines * @author Sebastian Kanthak (mailto:ska...@mu...) */ --- 32,36 ---- /** ! * Provide Template with access to url handing routines. * @author Sebastian Kanthak (mailto:ska...@mu...) */ *************** *** 38,41 **** --- 38,44 ---- { + /** + * Tool implementation. + */ public class URLToolImpl { *************** *** 50,54 **** /** ! * Get the url thas was used to access this page, * as it is returned by HttpUtils.getRequestURL. * @return URL used to access this page without query string --- 53,57 ---- /** ! * Get the url that was used to access this page, * as it is returned by HttpUtils.getRequestURL. * @return URL used to access this page without query string *************** *** 60,64 **** /** ! * Return the complete url, that was uses to access this page * including path_info and query_string if present. * <br> --- 63,67 ---- /** ! * Return the complete url, that was used to access this page * including path_info and query_string if present. * <br> |
|
From: Tim P <ti...@us...> - 2008-03-20 12:37:42
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29610/src/org/webmacro/directive Modified Files: CountDirective.java Log Message: Checkstyle: whitespace Index: CountDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/CountDirective.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CountDirective.java 28 Mar 2006 23:44:26 -0000 1.8 --- CountDirective.java 20 Mar 2008 12:37:38 -0000 1.9 *************** *** 35,44 **** /** * #count $i from 1 to 100 [step 1] ! * * @author Eric B. Ridge (eb...@tc...) * @since 1.1b1 */ ! public class CountDirective extends org.webmacro.directive.Directive { --- 35,47 ---- /** + * Syntax: + * <pre> * #count $i from 1 to 100 [step 1] ! * </pre> ! * * @author Eric B. Ridge (eb...@tc...) * @since 1.1b1 */ ! public class CountDirective extends Directive { *************** *** 52,68 **** private static final int COUNT_BODY = 8; ! private static final Directive.ArgDescriptor[] _args = new Directive.ArgDescriptor[]{ ! new Directive.LValueArg(COUNT_ITERATOR), ! new Directive.KeywordArg(COUNT_FROM_K, "from"), ! new Directive.RValueArg(COUNT_START), ! new Directive.KeywordArg(COUNT_TO_K, "to"), ! new Directive.RValueArg(COUNT_END), ! new Directive.OptionalGroup(2), ! new Directive.KeywordArg(COUNT_STEP_K, "step"), ! new Directive.RValueArg(COUNT_STEP), ! new Directive.BlockArg(COUNT_BODY), ! }; ! private static final DirectiveDescriptor _desc = new DirectiveDescriptor("count", null, _args, null); public static DirectiveDescriptor getDescriptor () --- 55,73 ---- private static final int COUNT_BODY = 8; ! private static final Directive.ArgDescriptor[] _args = ! new Directive.ArgDescriptor[]{ ! new Directive.LValueArg(COUNT_ITERATOR), ! new Directive.KeywordArg(COUNT_FROM_K, "from"), ! new Directive.RValueArg(COUNT_START), ! new Directive.KeywordArg(COUNT_TO_K, "to"), ! new Directive.RValueArg(COUNT_END), ! new Directive.OptionalGroup(2), ! new Directive.KeywordArg(COUNT_STEP_K, "step"), ! new Directive.RValueArg(COUNT_STEP), ! new Directive.BlockArg(COUNT_BODY), ! }; ! private static final DirectiveDescriptor _desc = ! new DirectiveDescriptor("count", null, _args, null); public static DirectiveDescriptor getDescriptor () *************** *** 79,83 **** private int _start, _end, _step = Integer.MAX_VALUE; ! public Object build (DirectiveBuilder builder, BuildContext bc) throws BuildException { try --- 84,89 ---- private int _start, _end, _step = Integer.MAX_VALUE; ! public Object build (DirectiveBuilder builder, BuildContext bc) ! throws BuildException { try *************** *** 94,98 **** _body = (Block) builder.getArg(COUNT_BODY, bc); ! // attempt to go ahead and force the start, end, and step values into primitive ints if (_objStart != null) { --- 100,105 ---- _body = (Block) builder.getArg(COUNT_BODY, bc); ! // attempt to go ahead and force the start, end, and step values ! // into primitive ints if (_objStart != null) { *************** *** 138,142 **** } ! public void write (FastWriter out, Context context) throws PropertyException, IOException { int start = _start, end = _end, step = _step; --- 145,150 ---- } ! public void write (FastWriter out, Context context) ! throws PropertyException, IOException { int start = _start, end = _end, step = _step; *************** *** 156,160 **** catch (Exception e) { ! out.write(context.getEvaluationExceptionHandler().expand(_iterator, context, e)); error = true; } --- 164,169 ---- catch (Exception e) { ! out.write(context.getEvaluationExceptionHandler() ! .expand(_iterator, context, e)); error = true; } *************** *** 163,167 **** { // Check if no step explicitly assigned, if so auto-detect it ! if (step == Integer.MAX_VALUE ) { step = (start > end) ? -1 : +1; --- 172,176 ---- { // Check if no step explicitly assigned, if so auto-detect it ! if (step == Integer.MAX_VALUE) { step = (start > end) ? -1 : +1; *************** *** 188,192 **** PropertyException pe = new PropertyException.UndefinedVariableException(); pe.setMessage("#count: step cannot be 0."); ! out.write(context.getEvaluationExceptionHandler().expand(_iterator, context, pe)); } } --- 197,202 ---- PropertyException pe = new PropertyException.UndefinedVariableException(); pe.setMessage("#count: step cannot be 0."); ! out.write(context.getEvaluationExceptionHandler() ! .expand(_iterator, context, pe)); } } |
|
From: Tim P <ti...@us...> - 2008-03-20 12:33:54
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28060/src/org/webmacro/engine Modified Files: UndefinedMacro.java Log Message: Checkstyle: organise imports Index: UndefinedMacro.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/UndefinedMacro.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UndefinedMacro.java 12 Jun 2003 00:47:45 -0000 1.5 --- UndefinedMacro.java 20 Mar 2008 12:33:52 -0000 1.6 *************** *** 23,27 **** package org.webmacro.engine; ! import org.webmacro.*; /** --- 23,32 ---- package org.webmacro.engine; ! import org.webmacro.Context; ! import org.webmacro.FastWriter; ! import org.webmacro.Macro; ! import org.webmacro.PropertyException; ! import org.webmacro.TemplateVisitor; ! import org.webmacro.Visitable; /** *************** *** 67,71 **** /** ! * Throws an exception -- cannot write an undefined */ public final void write (FastWriter out, Context context) --- 72,76 ---- /** ! * Throws an exception -- cannot write an undefined. */ public final void write (FastWriter out, Context context) |
|
From: Tim P <ti...@us...> - 2008-03-20 12:33:06
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27656/src/org/webmacro/engine Modified Files: FileTemplate.java Log Message: Checkstyle: organise imports Index: FileTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/FileTemplate.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FileTemplate.java 12 Jun 2003 00:47:45 -0000 1.12 --- FileTemplate.java 20 Mar 2008 12:32:59 -0000 1.13 *************** *** 24,30 **** package org.webmacro.engine; ! import org.webmacro.Broker; ! import java.io.*; /** --- 24,35 ---- package org.webmacro.engine; ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.IOException; ! import java.io.InputStreamReader; ! import java.io.Reader; ! import org.webmacro.Broker; /** *************** *** 36,45 **** /** ! * The name of the file to read this template from */ private final File myFile; /** ! * What encoding I use to read my templates */ private final String myEncoding; --- 41,50 ---- /** ! * The name of the file to read this template from. */ private final File myFile; /** ! * What encoding I use to read my templates. */ private final String myEncoding; |
|
From: Tim P <ti...@us...> - 2008-03-20 12:32:13
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27323/src/org/webmacro/directive Modified Files: TypeDirective.java Log Message: Checkstyle: organise imports Index: TypeDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/TypeDirective.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TypeDirective.java 29 Mar 2006 16:27:44 -0000 1.9 --- TypeDirective.java 20 Mar 2008 12:32:04 -0000 1.10 *************** *** 22,26 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; --- 22,33 ---- package org.webmacro.directive; ! import java.io.IOException; ! ! import org.webmacro.Broker; ! import org.webmacro.Context; ! import org.webmacro.FastWriter; ! import org.webmacro.Macro; ! import org.webmacro.PropertyException; ! import org.webmacro.TemplateVisitor; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; *************** *** 29,44 **** import org.webmacro.util.Settings; - import java.io.IOException; - /** * TypeDirective allows the programmer (or template designer) to ensure * objects placed into the <code>Context</code> are of the required class ! * type.<p> ! * ! * Syntax:<pre> * #type [ required ] var-reference quoted-string * </pre> * ! * Examples:<pre> * $MyName, if it exists in the context, <b>must</b> be a java.lang.String * #type $MyName "java.lang.String" --- 36,51 ---- import org.webmacro.util.Settings; /** * TypeDirective allows the programmer (or template designer) to ensure * objects placed into the <code>Context</code> are of the required class ! * type. ! * <p> ! * Syntax: ! * <pre> * #type [ required ] var-reference quoted-string * </pre> * ! * Examples: ! * <pre> * $MyName, if it exists in the context, <b>must</b> be a java.lang.String * #type $MyName "java.lang.String" *************** *** 66,70 **** * * TypeDirective is <b>enabled by default</b>, however, it can be disabled ! * via your custom <code>WebMacro.properties</code> file:<pre> * TypeDirective.Enabled = true | false * </pre> --- 73,78 ---- * * TypeDirective is <b>enabled by default</b>, however, it can be disabled ! * via your custom <code>WebMacro.properties</code> file: ! * <pre> * TypeDirective.Enabled = true | false * </pre> *************** *** 92,97 **** /** ! * static method required by the WebMacro parser to provide ! * a descriptor about this directive */ public static DirectiveDescriptor getDescriptor () --- 100,105 ---- /** ! * Static method required by the WebMacro parser to provide ! * a descriptor about this directive. */ public static DirectiveDescriptor getDescriptor () *************** *** 101,115 **** ! /** the Context object we need to check the type of */ private Variable _object; ! /** the Class instance that _object is requried to be */ private Class _class; ! /** is the Variable required to be in the Context? */ private boolean _required; /** ! * configure directive for this run and return 'this' */ public Object build (DirectiveBuilder builder, BuildContext bc) throws BuildException --- 109,123 ---- ! /** The Context object we need to check the type of. */ private Variable _object; ! /** The Class instance that _object is requried to be. */ private Class _class; ! /** Is the Variable required to be in the Context? */ private boolean _required; /** ! * Configure directive for this run and return 'this'. */ public Object build (DirectiveBuilder builder, BuildContext bc) throws BuildException *************** *** 179,183 **** /** ! * The #type directive does not produce output */ public void write (FastWriter fw, Context context) throws IOException, PropertyException --- 187,191 ---- /** ! * The #type directive does not produce output. */ public void write (FastWriter fw, Context context) throws IOException, PropertyException *************** *** 237,239 **** return clazz; } ! } \ No newline at end of file --- 245,248 ---- return clazz; } ! } ! |
|
From: Tim P <ti...@us...> - 2008-03-20 12:30:12
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26638/src/org/webmacro/resource Modified Files: URLTemplate.java Log Message: Checkstyle: organise imports Index: URLTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplate.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** URLTemplate.java 31 Oct 2005 02:46:41 -0000 1.11 --- URLTemplate.java 20 Mar 2008 12:30:09 -0000 1.12 *************** *** 23,26 **** --- 23,37 ---- package org.webmacro.resource; + import java.io.BufferedReader; + import java.io.File; + import java.io.IOException; + import java.io.InputStream; + import java.io.InputStreamReader; + import java.io.Reader; + import java.net.URL; + import java.util.HashMap; + import java.util.Locale; + import java.util.Properties; + import org.webmacro.Broker; import org.webmacro.TemplateException; *************** *** 30,39 **** import org.webmacro.util.NativeAsciiReader; - import java.io.*; - import java.net.URL; - import java.util.HashMap; - import java.util.Locale; - import java.util.Properties; - /** * FileTemplate objects read their template data from a text file. --- 41,44 ---- *************** *** 43,50 **** { ! /** ! * CVS revision ! */ ! public static final String RCS = "@(#) $Id$"; --- 48,52 ---- { ! /** CVS revision */ public static final String RCS = "@(#) $Id$"; *************** *** 52,74 **** * The location of the resourse (file) this template was read from. */ - private final URL _url; /** ! * The physical file referred to by "file:" and "jar:" URLs */ - private File underLyingFile = null; /** ! * The time the underlying file was last modified */ - private long underLyingFileLastModTime = 0; /** ! * Cache for any per-directory encoding files */ - private final HashMap propertiesCache = new HashMap(); --- 54,72 ---- * The location of the resourse (file) this template was read from. */ private final URL _url; /** ! * The physical file referred to by "file:" and "jar:" URLs. */ private File underLyingFile = null; /** ! * The time the underlying file was last modified. */ private long underLyingFileLastModTime = 0; /** ! * Cache for any per-directory encoding files. */ private final HashMap propertiesCache = new HashMap(); *************** *** 78,84 **** /** ! * A dummy object used as a place holder in the encoding cache */ - private static final Object dummy = new Object(); --- 76,81 ---- /** ! * A dummy object used as a place holder in the encoding cache. */ private static final Object dummy = new Object(); *************** *** 91,98 **** * jar:xxxxxx!yyyyyy *</pre> ! * extracting the xxxxxx. In the latter case the reference is to the jar containing the * template. */ - public URLTemplate ( Broker broker, --- 88,95 ---- * jar:xxxxxx!yyyyyy *</pre> ! * extracting the xxxxxx. ! * In the latter case the reference is to the jar containing the * template. */ public URLTemplate ( Broker broker, *************** *** 130,134 **** * Imply a reference to the actual file. */ - public boolean shouldReload () { --- 127,130 ---- *************** *** 147,151 **** * if the file changes */ - private void setupLocalProperties () { --- 143,146 ---- *************** *** 230,234 **** /** ! * return the URL for the current template. */ public URL getURL () --- 225,229 ---- /** ! * @return the URL for the current template */ public URL getURL () |
|
From: Tim P <ti...@us...> - 2008-03-20 12:27:27
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25370/src/org/webmacro/adapter/jsp Modified Files: JSPAttributes.java Log Message: Whitespace Index: JSPAttributes.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp/JSPAttributes.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JSPAttributes.java 8 Dec 2005 22:12:30 -0000 1.1 --- JSPAttributes.java 20 Mar 2008 12:27:23 -0000 1.2 *************** *** 5,13 **** /** - * - * <p> * Class that provides access to the JSP pageContext attributes with scoping, * such that $Attributes.SCOPE.xxxx returns appropriate values. - * </p> * <p> * SCOPE can be one of "Page", "Request", "Session" or "Application". --- 5,10 ---- *************** *** 31,35 **** /** ! * Utility class to provide access to scoped attributes, JSP-style */ abstract class ScopedAttributes --- 28,32 ---- /** ! * Utility class to provide access to scoped attributes, JSP-style. */ abstract class ScopedAttributes *************** *** 101,105 **** /** - * * @return The bean that provides access to session attributes */ --- 98,101 ---- *************** *** 112,116 **** /** - * * @return The bean that provides access to page attributes */ --- 108,111 ---- *************** *** 123,127 **** /** - * * @return The bean that provides access to request attributes */ --- 118,121 ---- *************** *** 134,138 **** /** - * * @return The bean that provides access to application attributes */ --- 128,131 ---- |
|
From: Tim P <ti...@us...> - 2008-03-20 12:25:02
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24068/src/org/webmacro/util Modified Files: AbstractLogFile.java Log Message: Checkstyle: organise imports Index: AbstractLogFile.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/AbstractLogFile.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AbstractLogFile.java 31 Oct 2005 02:46:41 -0000 1.5 --- AbstractLogFile.java 20 Mar 2008 12:24:52 -0000 1.6 *************** *** 21,29 **** */ - package org.webmacro.util; import java.text.MessageFormat; ! import java.util.*; /** --- 21,32 ---- */ package org.webmacro.util; import java.text.MessageFormat; ! import java.util.HashMap; ! import java.util.Iterator; ! import java.util.LinkedList; ! import java.util.List; ! import java.util.Map; /** *************** *** 31,35 **** * to make it easier to write new log targets that plug into WM. */ - abstract public class AbstractLogFile implements LogTarget { --- 34,37 ---- *************** *** 47,54 **** /** - * <p> * Create a new LogFile instance reading properties from the * supplied Settings object. - * </p> * <pre> * LogTraceExceptions: true|false|yes|no|on|off --- 49,54 ---- *************** *** 85,89 **** /** ! * Set the log level for this Logfile. The default is LogSystem.NOTICE */ public void setLogLevel (int level) --- 85,89 ---- /** ! * Set the log level for this Logfile. The default is LogSystem.NOTICE. */ public void setLogLevel (int level) |
|
From: Tim P <ti...@us...> - 2008-03-20 12:23:45
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23611/src/org/webmacro/directive Modified Files: SetblockDirective.java Log Message: Checkstyle: organise imports Index: SetblockDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetblockDirective.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SetblockDirective.java 1 Nov 2005 04:08:04 -0000 1.6 --- SetblockDirective.java 20 Mar 2008 12:23:41 -0000 1.7 *************** *** 23,32 **** package org.webmacro.directive; ! import org.webmacro.*; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; import org.webmacro.engine.Variable; - import java.io.IOException; /** * Allows setting a variable to a block of template script. --- 23,37 ---- package org.webmacro.directive; ! import java.io.IOException; ! ! import org.webmacro.Context; ! import org.webmacro.FastWriter; ! import org.webmacro.Macro; ! import org.webmacro.PropertyException; ! import org.webmacro.TemplateVisitor; import org.webmacro.engine.BuildContext; import org.webmacro.engine.BuildException; import org.webmacro.engine.Variable; /** * Allows setting a variable to a block of template script. |
|
From: Tim P <ti...@us...> - 2008-03-20 12:22:56
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23207/src/org/webmacro/parser Modified Files: WMParser.java Log Message: Checkstyle: Move javadoc, organise imports Index: WMParser.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WMParser.java 16 Jul 2003 06:45:00 -0000 1.10 --- WMParser.java 20 Mar 2008 12:22:52 -0000 1.11 *************** *** 21,31 **** */ - /** - * @author Brian Goetz - */ - package org.webmacro.parser; ! import java.io.*; import org.webmacro.Broker; --- 21,28 ---- */ package org.webmacro.parser; ! import java.io.IOException; ! import java.io.Reader; import org.webmacro.Broker; *************** *** 33,36 **** --- 30,36 ---- import org.webmacro.engine.Parser; + /** + * @author Brian Goetz + */ public class WMParser implements Parser { |
|
From: Tim P <ti...@us...> - 2008-03-20 12:21:34
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22814/src/org/webmacro/engine Modified Files: BlockBuilder.java Log Message: Checkstyle: javadoc Index: BlockBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/BlockBuilder.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** BlockBuilder.java 12 Jun 2003 00:47:45 -0000 1.19 --- BlockBuilder.java 20 Mar 2008 12:21:30 -0000 1.20 *************** *** 21,25 **** */ - package org.webmacro.engine; --- 21,24 ---- *************** *** 60,63 **** --- 59,63 ---- } + /** Iterate over a Block. */ public interface BlockIterator extends Iterator { *************** *** 70,73 **** --- 70,74 ---- } + /** BlockBuilder iterator. */ public class BBIterator implements BlockIterator { |
|
From: Tim P <ti...@us...> - 2008-03-20 12:17:42
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21277/src/org/webmacro/util Modified Files: Eval.java Log Message: Checkstyle: make final Index: Eval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Eval.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Eval.java 31 Oct 2005 02:46:41 -0000 1.3 --- Eval.java 20 Mar 2008 12:17:39 -0000 1.4 *************** *** 2,6 **** /** ! * Eval.java - static class with one method eval which just returns its * argument. This is a workaround for a WebMacro syntax issue, where an * expression isn't recognized properly outside of a directive or method call. --- 2,6 ---- /** ! * Static class with one method, eval, which just returns its * argument. This is a workaround for a WebMacro syntax issue, where an * expression isn't recognized properly outside of a directive or method call. *************** *** 11,15 **** * @since May 6, 2003 */ ! public class Eval { --- 11,15 ---- * @since May 6, 2003 */ ! public final class Eval { *************** *** 19,22 **** --- 19,26 ---- } + /** + * @param o object to return + * @return input unmodified + */ static public Object eval (Object o) { |
6 messages has been excluded from this view by a project administrator.