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-26 09:49:15
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17341/src/org/webmacro/util Modified Files: WMEval.java Log Message: Add templateName constructor, Change void eval signature to String eval, rather than throwing it away, Do not print stack trace: use exception constructor Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/WMEval.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** WMEval.java 20 Mar 2008 11:01:41 -0000 1.22 --- WMEval.java 26 Mar 2008 09:44:42 -0000 1.23 *************** *** 101,106 **** catch (Exception e) { ! e.printStackTrace(System.err); ! throw new IllegalStateException(e.toString()); } } --- 101,105 ---- catch (Exception e) { ! throw new IllegalStateException(e); } } *************** *** 116,125 **** catch (Exception e) { ! e.printStackTrace(System.err); ! throw new IllegalStateException(e.toString()); } } /** * Return the settings associated with this WebMacro instance. */ --- 115,137 ---- catch (Exception e) { ! throw new IllegalStateException(e); } } /** + * Build a WebMacro environment to evaluate a template given it's name. + */ + public WMEval (String templateName) { + try { + wm = new WM(); + context = wm.getContext(); + parseLocalTemplate(templateName); + } + catch (Exception e) { + throw new IllegalStateException(e); + } + } + + /** * Return the settings associated with this WebMacro instance. */ *************** *** 248,254 **** * current template and current output stream using UTF8. */ ! public void eval() throws Exception { ! eval(context, currentTemplate); } --- 260,266 ---- * current template and current output stream using UTF8. */ ! public String eval() throws Exception { ! return eval(context, currentTemplate); } *************** *** 318,323 **** catch (Exception e) { ! e.printStackTrace(System.err); ! throw new ServletException(e.toString()); } return value; --- 330,334 ---- catch (Exception e) { ! throw new ServletException(e); } return value; |
From: Tim P <ti...@us...> - 2008-03-25 23:27:43
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28778/test/unit/org/webmacro/template Modified Files: TestMap.java Log Message: _context was hiding a field Index: TestMap.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestMap.java 16 Oct 2005 17:39:42 -0000 1.1 --- TestMap.java 25 Mar 2008 23:27:40 -0000 1.2 *************** *** 7,11 **** public class TestMap extends TemplateTestCase { - Context _context; public TestMap (String name) --- 7,10 ---- |
From: Tim P <ti...@us...> - 2008-03-25 23:14:55
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23664/src/org/webmacro/directive Modified Files: ParamDirective.java Log Message: Eclipse: target may be null: separate try blocks for each Exception Index: ParamDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/ParamDirective.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ParamDirective.java 12 Jun 2003 00:47:44 -0000 1.7 --- ParamDirective.java 25 Mar 2008 23:14:52 -0000 1.8 *************** *** 72,79 **** target = (Variable) builder.getArg(PARAM_TARGET, bc); result = builder.getArg(PARAM_RESULT, bc); - if (!target.isSimpleName()) - throw new NotSimpleVariableBuildException(myDescr.name); - - target.setValue(bc, result); } catch (ClassCastException e) --- 72,75 ---- *************** *** 81,84 **** --- 77,86 ---- throw new NotVariableBuildException(myDescr.name, e); } + if (!target.isSimpleName()) + throw new NotSimpleVariableBuildException(myDescr.name); + try + { + target.setValue(bc, result); + } catch (PropertyException e) { |
From: Tim P <ti...@us...> - 2008-03-25 23:13:28
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23231/src/org/webmacro/directive Modified Files: AttributeDirective.java Log Message: Eclipse: target may be null: separate try blocks for each Exception Index: AttributeDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/AttributeDirective.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AttributeDirective.java 12 Jun 2003 00:47:44 -0000 1.8 --- AttributeDirective.java 25 Mar 2008 23:13:25 -0000 1.9 *************** *** 63,74 **** { Variable target = null; ! try ! { target = (Variable) builder.getArg(ATTRIBUTE_TARGET, bc); ! Object result = builder.getArg(ATTRIBUTE_RESULT, bc); ! if (!target.isSimpleName()) ! throw new NotSimpleVariableBuildException(myDescr.name); ! ! target.setValue(bc, result); } catch (ClassCastException e) --- 63,70 ---- { Variable target = null; ! Object result = null; ! try { target = (Variable) builder.getArg(ATTRIBUTE_TARGET, bc); ! result = builder.getArg(ATTRIBUTE_RESULT, bc); } catch (ClassCastException e) *************** *** 76,79 **** --- 72,82 ---- throw new NotVariableBuildException(myDescr.name, e); } + if (!target.isSimpleName()) + throw new NotSimpleVariableBuildException(myDescr.name); + + try + { + target.setValue(bc, result); + } catch (PropertyException e) { |
From: Tim P <ti...@us...> - 2008-03-25 23:10:29
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21821/src/org/webmacro/directive Modified Files: DirectiveBuilder.java Log Message: Add FIXME Index: DirectiveBuilder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/DirectiveBuilder.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DirectiveBuilder.java 12 Jun 2003 00:47:44 -0000 1.10 --- DirectiveBuilder.java 25 Mar 2008 23:10:25 -0000 1.11 *************** *** 119,123 **** { if (buildArgs == null) ! return null; else return buildArgs.getArg(argId, bc); --- 119,123 ---- { if (buildArgs == null) ! return null; // FIXME Should throw exception here, as non-null branch does else return buildArgs.getArg(argId, bc); |
From: Tim P <ti...@us...> - 2008-03-25 23:01:38
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18291/src/org/webmacro/resource Modified Files: ReloadingCacheManager.java Log Message: Eclipse: r may be null, though we know it may not: brackets make it explicit Index: ReloadingCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/ReloadingCacheManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReloadingCacheManager.java 21 Jul 2004 16:13:05 -0000 1.2 --- ReloadingCacheManager.java 25 Mar 2008 23:01:34 -0000 1.3 *************** *** 192,202 **** r = (MyCacheElement) _cache.get(query); ! if (r != null) o = r.getObject(); ! // should the template be reloaded, regardless of cached status? ! if (o != null && r.reloadContext != null && _reloadOnChange) ! reload = r.reloadContext.shouldReload(); ! if (o == null || reload) { --- 192,202 ---- r = (MyCacheElement) _cache.get(query); ! if (r != null) { o = r.getObject(); ! // should the template be reloaded, regardless of cached status? ! if (o != null && r.reloadContext != null && _reloadOnChange) ! reload = r.reloadContext.shouldReload(); ! } if (o == null || reload) { |
From: Tim P <ti...@us...> - 2008-03-25 22:56:09
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15183/src/org/webmacro/engine Modified Files: WMTemplate.java Log Message: Eclipse: variable can only be null Index: WMTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/WMTemplate.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** WMTemplate.java 20 Mar 2008 21:02:18 -0000 1.52 --- WMTemplate.java 25 Mar 2008 22:56:02 -0000 1.53 *************** *** 199,203 **** if (bc != null) be.setContextLocation(bc.getCurrentLocation()); - newContent = null; _log.error("Template contained invalid data", be); throw be; --- 199,202 ---- *************** *** 205,209 **** catch (IOException e) { - newContent = null; // don't let the old one survive _log.error("Template: Could not read template: " + this); throw e; --- 204,207 ---- |
From: Tim P <ti...@us...> - 2008-03-25 22:54:13
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/src/org/webmacro/resource Modified Files: URLTemplateProvider.java Log Message: Eclipse: variable cannot be null Index: URLTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplateProvider.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** URLTemplateProvider.java 20 Mar 2008 11:14:07 -0000 1.20 --- URLTemplateProvider.java 25 Mar 2008 22:54:09 -0000 1.21 *************** *** 386,397 **** { String p = buildPath(pre, mid, post); ! if (path != null) ! { ! return (Template) _broker.get(_TYPE, p); ! } ! else ! { ! return (Template) _broker.get(_TYPE, p); ! } } catch (Exception ex) --- 386,390 ---- { String p = buildPath(pre, mid, post); ! return (Template) _broker.get(_TYPE, p); } catch (Exception ex) |
From: Tim P <ti...@us...> - 2008-03-25 20:24:31
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22265/src/org/webmacro/engine Modified Files: Expression.java Log Message: Eclipse: variable cannot be null Index: Expression.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/Expression.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Expression.java 18 Mar 2008 19:37:25 -0000 1.14 --- Expression.java 25 Mar 2008 20:24:26 -0000 1.15 *************** *** 69,77 **** // added by Keats 30-Nov-01 else if (o == UNDEF) - { return false; - } else ! return (o != null); } --- 69,75 ---- // added by Keats 30-Nov-01 else if (o == UNDEF) return false; else ! return true; } |
From: Tim P <ti...@us...> - 2008-03-25 11:33:54
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7599 Modified Files: WebMacro.defaults.classic WebMacro.defaults.minimal Log Message: Unify comments Index: WebMacro.defaults.minimal =================================================================== RCS file: /cvsroot/webmacro/webmacro/WebMacro.defaults.minimal,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WebMacro.defaults.minimal 24 Oct 2005 00:21:00 -0000 1.2 --- WebMacro.defaults.minimal 25 Mar 2008 11:33:46 -0000 1.3 *************** *** 218,222 **** ! # There are no web or context tools in the minimal version. You supply your own context tool fault handler: ContextAutoLoaders.ContextTools: ContextAutoLoaders.WebContextTools: --- 218,223 ---- ! # There are no web or context tools in the minimal version. ! # You supply your own context tool fault handler: ContextAutoLoaders.ContextTools: ContextAutoLoaders.WebContextTools: *************** *** 231,234 **** --- 232,236 ---- # FastWriter Configuration # + # This setting can be tuned for space/time trade-offs. # Misconfiguration of these settings can cause severe performance # and resource penalties Index: WebMacro.defaults.classic =================================================================== RCS file: /cvsroot/webmacro/webmacro/WebMacro.defaults.classic,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WebMacro.defaults.classic 24 Oct 2005 00:21:00 -0000 1.6 --- WebMacro.defaults.classic 25 Mar 2008 11:33:46 -0000 1.7 *************** *** 1,7 **** - # DO NOT EDIT THIS FILE -- Edit WebMacro.properties instead! # ! # This file contains the DEFAULT values for WebMacro CLASSIC. You can ! # set the actual live values in WebMacro.properties and that will # override the settings in this file. This file also contains examples # of how to set properties, which may be commented out. --- 1,6 ---- # DO NOT EDIT THIS FILE -- Edit WebMacro.properties instead! # ! # This file contains the DEFAULT values for WebMacro CLASSIC. ! # You can set the actual live values in WebMacro.properties and that will # override the settings in this file. This file also contains examples # of how to set properties, which may be commented out. *************** *** 278,281 **** --- 277,283 ---- # # This setting can be tuned for space/time trade-offs. + # Misconfiguration of these settings can cause severe performance + # and resource penalties + FastWriter.DefaultBufferSize = 4096 |
From: Tim P <ti...@us...> - 2008-03-24 22:49:10
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29585/test/unit/org/webmacro/template Modified Files: EncodingTestCase.java Log Message: Typo Index: EncodingTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/EncodingTestCase.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EncodingTestCase.java 24 Mar 2008 22:43:40 -0000 1.9 --- EncodingTestCase.java 24 Mar 2008 22:49:08 -0000 1.10 *************** *** 208,212 **** assertTrue("One byte array is null", ((a != null) && (b != null))); ! if (a != null) { // Eclipse forces som nonsense on us assertTrue("Size of binary output differs", a.length == b.length); --- 208,212 ---- assertTrue("One byte array is null", ((a != null) && (b != null))); ! if (a != null) { // Eclipse forces some nonsense on us assertTrue("Size of binary output differs", a.length == b.length); |
From: Tim P <ti...@us...> - 2008-03-24 22:43:44
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27301/test/unit/org/webmacro/template Modified Files: EncodingTestCase.java Log Message: Eclipse: stop warning at cost of slightly uglier code Index: EncodingTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/EncodingTestCase.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EncodingTestCase.java 18 Mar 2008 10:00:36 -0000 1.8 --- EncodingTestCase.java 24 Mar 2008 22:43:40 -0000 1.9 *************** *** 208,217 **** assertTrue("One byte array is null", ((a != null) && (b != null))); ! assertTrue("Size of binary output differs", ! a.length == b.length); ! for (int i = 0; i < a.length; i++) ! { ! assertTrue("Binary output differs", ! a[i] == b[i]); } } --- 208,219 ---- assertTrue("One byte array is null", ((a != null) && (b != null))); ! if (a != null) { // Eclipse forces som nonsense on us ! assertTrue("Size of binary output differs", ! a.length == b.length); ! for (int i = 0; i < a.length; i++) ! { ! assertTrue("Binary output differs", ! a[i] == b[i]); ! } } } |
From: Tim P <ti...@us...> - 2008-03-21 08:35:25
|
Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/test In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24768/test/unit/org/webmacro/util/test Modified Files: WMEvalTest.java Log Message: Commit before moving Index: WMEvalTest.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/test/WMEvalTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WMEvalTest.java 20 Mar 2008 16:50:54 -0000 1.1 --- WMEvalTest.java 21 Mar 2008 08:35:21 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package org.webmacro.util.test; + import org.webmacro.Context; + import org.webmacro.Template; import org.webmacro.util.Settings; import org.webmacro.util.WMEval; *************** *** 70,73 **** --- 72,76 ---- */ public void testGetLog() { + assertNull(new WMEval().getLog()); } *************** *** 91,95 **** */ public void testGetNewContext() { ! } --- 94,102 ---- */ public void testGetNewContext() { ! WMEval it = new WMEval(); ! it.getCurrentContext().put("o", "b"); ! assertEquals("b",it.getCurrentContext().get("o")); ! it.getNewContext(); ! assertNull(it.getCurrentContext().get("o")); } *************** *** 112,115 **** --- 119,123 ---- */ public void testGetCurrentTemplate() { + assertNull(new WMEval().getCurrentTemplate()); } *************** *** 118,123 **** * Test method for {@link org.webmacro.util.WMEval#parseLocalTemplate(java.lang.String)}. */ ! public void testParseLocalTemplate() { ! } --- 126,132 ---- * Test method for {@link org.webmacro.util.WMEval#parseLocalTemplate(java.lang.String)}. */ ! public void testParseLocalTemplate() throws Exception { ! Template t = new WMEval().parseLocalTemplate("org/webmacro/util/test/WMEvalTest.wm"); ! assertEquals("Hi!", t.evaluateAsString(new Context())); } *************** *** 125,130 **** * Test method for {@link org.webmacro.util.WMEval#setCurrentTemplate(org.webmacro.Template)}. */ ! public void testSetCurrentTemplate() { ! } --- 134,142 ---- * Test method for {@link org.webmacro.util.WMEval#setCurrentTemplate(org.webmacro.Template)}. */ ! public void testSetCurrentTemplate() throws Exception { ! Template t = new WMEval().parseLocalTemplate("org/webmacro/util/test/WMEvalTest.wm"); ! WMEval it = new WMEval(); ! it.setCurrentTemplate(t); ! assertEquals("Hi!", it.eval(new Context())); } *************** *** 132,136 **** * Test method for {@link org.webmacro.util.WMEval#setCurrentContext(org.webmacro.Context)}. */ ! public void testSetCurrentContext() { } --- 144,153 ---- * Test method for {@link org.webmacro.util.WMEval#setCurrentContext(org.webmacro.Context)}. */ ! public void testSetCurrentContext() throws Exception { ! WMEval it = new WMEval(); ! Context c = new Context(); ! c.put("o", "b"); ! it.setCurrentContext(c); ! assertEquals("b",it.getCurrentContext().get("o")); } *************** *** 146,150 **** * Test method for {@link org.webmacro.util.WMEval#eval()}. */ ! public void testEval() { } --- 163,169 ---- * Test method for {@link org.webmacro.util.WMEval#eval()}. */ ! public void testEval() throws Exception { ! WMEval it = new WMEval("org/webmacro/util/test/WMEvalTest.wm"); ! assertEquals("Hi!", it.eval(new Context())); } *************** *** 203,207 **** */ public void testDestroy() { ! } --- 222,231 ---- */ public void testDestroy() { ! WMEval it = new WMEval(); ! it.getCurrentContext().put("o", "b"); ! assertEquals("b",it.getCurrentContext().get("o")); ! it.destroy(); ! assertNull(it.getCurrentContext()); ! assertNull(it.getCurrentTemplate()); } |
From: Tim P <ti...@us...> - 2008-03-20 23:49:20
|
Update of /cvsroot/webmacro/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10068 Modified Files: checkstyleSuppressions.xml checkstyle.xml Log Message: Done, remaining issues are issues to be investigated. Index: checkstyleSuppressions.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/checkstyleSuppressions.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** checkstyleSuppressions.xml 20 Mar 2008 16:05:14 -0000 1.4 --- checkstyleSuppressions.xml 20 Mar 2008 23:49:14 -0000 1.5 *************** *** 14,18 **** files="Test*.java" /> ! <!-- Generated by javacc - not in our control --> <suppress checks="InnerAssignment" files="ASCII_CharStream.java" /> --- 14,18 ---- files="Test*.java" /> ! <!-- Generated by javacc - not under our control --> <suppress checks="InnerAssignment" files="ASCII_CharStream.java" /> *************** *** 39,43 **** <suppress checks="MissingSwitchDefault" files="WMParser_implTokenManager.java" /> - <suppress checks="FileLength" files="WMParser_impl.java" /> --- 39,42 ---- *************** *** 56,61 **** --- 55,79 ---- <suppress checks="TypeName" files="WMParser_impl.java" /> + <suppress checks="RedundantThrows" + files="WMParser_impl.java" /> + <suppress checks="MissingSwitchDefault" + files="WMParser_impl.java" /> + <suppress checks="SimplifyBooleanExpression" + files="WMParser_impl.java" /> + <suppress checks="SimplifyBooleanReturn" + files="WMParser_impl.java" /> + <suppress checks="EmptyForIteratorPad" + files="WMParser_impl.java" /> + <suppress checks="HiddenField" + files="WMParser_impl.java" /> + <suppress checks="ParenPad" + files="WMParser_impl.java" /> + <suppress checks="InnerAssignment" + files="ParseException.java" /> + <suppress checks="TypeName" files="WMParser_implConstants.java" /> + <suppress checks="InterfaceIsType" + files="WMParser_implConstants.java" /> <!-- The code is clear --> *************** *** 71,75 **** <suppress checks="TypeName" files="CGI_Impersonator.java" /> ! </suppressions> --- 89,105 ---- <suppress checks="TypeName" files="CGI_Impersonator.java" /> ! ! <!-- We want to allow extension --> ! <suppress checks="FinalClass" ! files="HTMLEscaper.java" /> ! <suppress checks="FinalClass" ! files="CheckTemplates.java" /> ! ! <!-- Not a Utility class ? --> ! <suppress checks="HideUtilityClassConstructor" ! files="Expression.java" /> ! <suppress checks="HideUtilityClassConstructor" ! files="DirectiveDescriptor.java" /> ! </suppressions> Index: checkstyle.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/checkstyle.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** checkstyle.xml 20 Mar 2008 15:46:48 -0000 1.6 --- checkstyle.xml 20 Mar 2008 23:49:14 -0000 1.7 *************** *** 211,215 **** <property name="message" value="Line has trailing spaces."/> </module --> ! <module name="TodoComment"/> <module name="UpperEll"/> --- 211,216 ---- <property name="message" value="Line has trailing spaces."/> </module --> ! <!-- we just use Maven's tag list now --> ! <!-- module name="TodoComment"/ --> <module name="UpperEll"/> |
From: Tim P <ti...@us...> - 2008-03-20 23:23:56
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32037/src/org/webmacro/adapter/spring Added Files: package.html Log Message: Checkstyle --- NEW FILE: package.html --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> <title>org.webmacro.adapter.spring</title> </head> <body bgcolor="white"> <p> Spring adaptor for webmacro. </p> </body> </html> |
From: Tim P <ti...@us...> - 2008-03-20 23:23:56
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32037/src/org/webmacro/adapter/jsp Added Files: package.html Log Message: Checkstyle --- NEW FILE: package.html --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> <title>org.webmacro.adapter.jsp</title> </head> <body bgcolor="white"> <p> Java Server Pages (JSP) adaptor for webmacro. </p> </body> </html> |
From: Tim P <ti...@us...> - 2008-03-20 23:18:26
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30013/src/org/webmacro/servlet Modified Files: ListUtil.java Log Message: Checkstyle: whitespace Index: ListUtil.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ListUtil.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ListUtil.java 19 Mar 2008 15:15:27 -0000 1.14 --- ListUtil.java 20 Mar 2008 23:18:23 -0000 1.15 *************** *** 779,787 **** out.println("List split with fill"); List splitList1 = split(l, 3, true); ! for (Iterator it1 = splitList1.iterator(); it1.hasNext();) { out.print("-: "); List part = (List) it1.next(); ! for (Iterator it2 = part.iterator(); it2.hasNext();) { out.print(it2.next() + ", "); --- 779,787 ---- out.println("List split with fill"); List splitList1 = split(l, 3, true); ! for (Iterator it1 = splitList1.iterator(); it1.hasNext(); ) { out.print("-: "); List part = (List) it1.next(); ! for (Iterator it2 = part.iterator(); it2.hasNext(); ) { out.print(it2.next() + ", "); *************** *** 791,799 **** out.println("List transposeSplit"); List splitList2 = transposeSplit(l, 3, false); ! for (Iterator it1 = splitList2.iterator(); it1.hasNext();) { out.print("-: "); List part = (List) it1.next(); ! for (Iterator it2 = part.iterator(); it2.hasNext();) { out.print(it2.next() + ", "); --- 791,799 ---- out.println("List transposeSplit"); List splitList2 = transposeSplit(l, 3, false); ! for (Iterator it1 = splitList2.iterator(); it1.hasNext(); ) { out.print("-: "); List part = (List) it1.next(); ! for (Iterator it2 = part.iterator(); it2.hasNext(); ) { out.print(it2.next() + ", "); |
From: Tim P <ti...@us...> - 2008-03-20 22:45:34
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16975/src/org/webmacro/engine Modified Files: Block.java Log Message: Add case 10 Index: Block.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/Block.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Block.java 20 Mar 2008 21:45:33 -0000 1.27 --- Block.java 20 Mar 2008 22:45:29 -0000 1.28 *************** *** 156,163 **** teC._columnNo = this.getColNo(i); _macros[i++].write(out, context); break; default : throw new WebMacroRuntimeException( ! "Bug: _remainder value not 0 to 9: " + _remainder); } --- 156,164 ---- teC._columnNo = this.getColNo(i); _macros[i++].write(out, context); + case 10: break; default : throw new WebMacroRuntimeException( ! "Bug: _remainder value not 0 to 10: " + _remainder); } |
From: Tim P <ti...@us...> - 2008-03-20 22:35:36
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13142/src/org/webmacro/adapter/spring Modified Files: WebMacroViewResolver.java Log Message: Checkstyle: avoid inner assignments Index: WebMacroViewResolver.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring/WebMacroViewResolver.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** WebMacroViewResolver.java 20 Mar 2008 20:38:40 -0000 1.7 --- WebMacroViewResolver.java 20 Mar 2008 22:35:27 -0000 1.8 *************** *** 96,102 **** try { ! return webMacro == null ! ? webMacro = new WM(servletcontext,classLoader, null) ! : webMacro; // Can we find the servlet here using a bean context? } catch (InitException initEx) --- 96,102 ---- try { ! if (webMacro == null) // Can we find the servlet here using a bean context? ! webMacro = new WM(servletcontext,classLoader, null); ! return webMacro; } catch (InitException initEx) |
From: Tim P <ti...@us...> - 2008-03-20 22:31:01
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11132/src/org/webmacro/directive Modified Files: SetpropsDirective.java Log Message: Checkstyle: avoid nested blocks, eclipse format Index: SetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetpropsDirective.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SetpropsDirective.java 20 Mar 2008 11:47:50 -0000 1.4 --- SetpropsDirective.java 20 Mar 2008 22:30:55 -0000 1.5 *************** *** 47,221 **** { ! private static final String DEFAULT_CLASS_NAME = "java.util.Hashtable"; ! private static final int PROPS_TARGET = 1; ! private static final int PROPS_CLASS = 2; ! private static final int PROPS_CLASSNAME = 3; ! private static final int PROPS_RESULT = 4; ! private Variable target; ! private Object result; ! private String _className; ! private static final ArgDescriptor[] myArgs = new ArgDescriptor[] ! { new LValueArg(PROPS_TARGET), new OptionalGroup(3), new KeywordArg(PROPS_CLASS, "class"), new AssignmentArg(), new QuotedStringArg(PROPS_CLASSNAME), new BlockArg(PROPS_RESULT) }; ! private static final DirectiveDescriptor myDescr = new DirectiveDescriptor( "setprops", null, myArgs, null); ! public static DirectiveDescriptor getDescriptor() ! { ! return myDescr; ! } ! public SetpropsDirective() ! { ! } ! public Object build(DirectiveBuilder builder, BuildContext bc) throws BuildException ! { ! try ! { ! target = (Variable) builder.getArg(PROPS_TARGET, bc); ! } ! catch (ClassCastException e) ! { ! throw new NotVariableBuildException(myDescr.name, e); ! } ! _className = (String) builder.getArg(PROPS_CLASSNAME, bc); ! if (_className == null) ! _className = DEFAULT_CLASS_NAME; ! result = builder.getArg(PROPS_RESULT, bc); ! return this; ! } ! public void write(FastWriter out, Context context) throws PropertyException, ! IOException ! { ! try ! { ! if (!context.containsKey(target.getName())) ! { ! // target doesn't exist. Must create. ! // TODO check for class loading restrictions as per bean directive ! try ! { ! Class c = Instantiator.getInstance(context.getBroker()) ! .classForName(_className); ! Object o = c.newInstance(); ! target.setValue(context, o); ! } ! catch (RuntimeException re) ! { ! throw new PropertyException("Failed to create instance of " ! + _className + " for the #properties directive. " + re, ! re); ! } - } - String res = (String) ((Macro) result).evaluate(context); - String[] lines = TextTool.getLines(res); - String s; - String prevLine = ""; - String prefix = "#set $" + target.getVariableName() + "."; - for (int i = 0; i < lines.length; i++) - { - s = prevLine + lines[i].trim(); - if (s.endsWith("\\")) - { - // ends with continuation character. Add to next line. - prevLine = s.substring(0, s.length() - 1); } ! else ! { ! prevLine = ""; ! setProp(context, s, prefix); } ! } ! } ! catch (PropertyException e) ! { ! throw e; ! } ! catch (Exception e) ! { ! String errorText = "#setprops: Unable to set " + target; ! writeWarning(errorText, context, out); ! } ! } ! private void setProp(Context context, String s, String prefix) ! throws PropertyException ! { ! String prop; ! String val; ! StringTemplate stmpl; ! { ! if (s.length() > 0 && !s.startsWith("#")) ! { ! for (int j = 0; j < s.length(); j++) ! { ! char ch = s.charAt(j); ! if (ch == ':' || ch == '=') ! { ! prop = s.substring(0, j).trim(); ! val = s.substring(j + 1).trim(); ! // convert to WM syntax and evaluate ! // if (val.length() > 0) ! // { ! // try first as a string ! s = prefix + prop + "=\"" + val + "\""; ! try ! { ! stmpl = new StringTemplate(context.getBroker(), s); ! stmpl.evaluateAsString(context); ! } ! catch (WebMacroException wme) ! { ! // try again without quotes. ! s = prefix + prop + "=" + val; ! try ! { stmpl = new StringTemplate(context.getBroker(), s); stmpl.evaluateAsString(context); ! } ! catch (WebMacroException wme2) ! { ! PropertyException pex = new PropertyException( ! "Failed to set property \"" + prop ! + "\" to value \"" + val ! + "\" on variable \"" ! + target.getVariableName() ! + "\" of type " ! + target.getClass().getName(), wme2); ! context.getEvaluationExceptionHandler().evaluate( ! this.target, context, pex); ! } ! } ! break; ! } } ! } ! } ! } ! public void accept(TemplateVisitor v) ! { ! v.beginDirective(myDescr.name); ! v.visitDirectiveArg("PropertiesClassKeyword", "class"); ! v.visitDirectiveArg("PropertiesClassName", _className); ! v.visitDirectiveArg("PropertiesTarget", target); ! v.visitDirectiveArg("PropertiesValue", result); ! v.endDirective(); ! } } --- 47,196 ---- { ! private static final String DEFAULT_CLASS_NAME = "java.util.Hashtable"; ! private static final int PROPS_TARGET = 1; ! private static final int PROPS_CLASS = 2; ! private static final int PROPS_CLASSNAME = 3; ! private static final int PROPS_RESULT = 4; ! private Variable target; ! private Object result; ! private String _className; ! private static final ArgDescriptor[] myArgs = new ArgDescriptor[] { ! new LValueArg(PROPS_TARGET), new OptionalGroup(3), new KeywordArg(PROPS_CLASS, "class"), new AssignmentArg(), new QuotedStringArg(PROPS_CLASSNAME), new BlockArg(PROPS_RESULT) }; ! private static final DirectiveDescriptor myDescr = new DirectiveDescriptor( "setprops", null, myArgs, null); ! public static DirectiveDescriptor getDescriptor () ! { ! return myDescr; ! } ! public SetpropsDirective() ! { ! } ! public Object build (DirectiveBuilder builder, BuildContext bc) throws BuildException ! { ! try { ! target = (Variable) builder.getArg(PROPS_TARGET, bc); ! } catch (ClassCastException e) { ! throw new NotVariableBuildException(myDescr.name, e); ! } ! _className = (String) builder.getArg(PROPS_CLASSNAME, bc); ! if (_className == null) ! _className = DEFAULT_CLASS_NAME; ! result = builder.getArg(PROPS_RESULT, bc); ! return this; ! } ! public void write (FastWriter out, Context context) ! throws PropertyException, IOException ! { ! try { ! if (!context.containsKey(target.getName())) { ! // target doesn't exist. Must create. ! // TODO check for class loading restrictions as per bean directive ! try { ! Class c = Instantiator.getInstance(context.getBroker()) ! .classForName(_className); ! Object o = c.newInstance(); ! target.setValue(context, o); ! } catch (RuntimeException re) { ! throw new PropertyException("Failed to create instance of " ! + _className + " for the #properties directive. " ! + re, re); ! } } ! String res = (String) ((Macro) result).evaluate(context); ! String[] lines = TextTool.getLines(res); ! String s; ! String prevLine = ""; ! String prefix = "#set $" + target.getVariableName() + "."; ! for (int i = 0; i < lines.length; i++) { ! s = prevLine + lines[i].trim(); ! if (s.endsWith("\\")) { ! // ends with continuation character. Add to next line. ! prevLine = s.substring(0, s.length() - 1); ! } else { ! prevLine = ""; ! setProp(context, s, prefix); ! } } ! } catch (PropertyException e) { ! throw e; ! } catch (Exception e) { ! String errorText = "#setprops: Unable to set " + target; ! writeWarning(errorText, context, out); ! } ! } ! private void setProp (Context context, String s, String prefix) ! throws PropertyException ! { ! String prop; ! String val; ! StringTemplate stmpl; ! ! if (s.length() > 0 && !s.startsWith("#")) { ! for (int j = 0; j < s.length(); j++) { ! char ch = s.charAt(j); ! if (ch == ':' || ch == '=') { ! prop = s.substring(0, j).trim(); ! val = s.substring(j + 1).trim(); ! // convert to WM syntax and evaluate ! // if (val.length() > 0) ! // { ! // try first as a string ! s = prefix + prop + "=\"" + val + "\""; ! try { stmpl = new StringTemplate(context.getBroker(), s); stmpl.evaluateAsString(context); ! } catch (WebMacroException wme) { ! // try again without quotes. ! s = prefix + prop + "=" + val; ! try { ! stmpl = new StringTemplate(context.getBroker(), s); ! stmpl.evaluateAsString(context); ! } catch (WebMacroException wme2) { ! PropertyException pex = new PropertyException( ! "Failed to set property \"" + prop ! + "\" to value \"" + val ! + "\" on variable \"" ! + target.getVariableName() ! + "\" of type " ! + target.getClass().getName(), wme2); ! context.getEvaluationExceptionHandler().evaluate( ! this.target, context, pex); ! } ! } ! break; ! } } ! } ! } ! ! public void accept (TemplateVisitor v) ! { ! v.beginDirective(myDescr.name); ! v.visitDirectiveArg("PropertiesClassKeyword", "class"); ! v.visitDirectiveArg("PropertiesClassName", _className); ! v.visitDirectiveArg("PropertiesTarget", target); ! v.visitDirectiveArg("PropertiesValue", result); ! v.endDirective(); ! } } |
From: Tim P <ti...@us...> - 2008-03-20 22:27:23
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9866/src/org/webmacro/adapter/jsp Modified Files: TemplateTag.java Log Message: Checkstyle: Avoid inner assignments Index: TemplateTag.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/jsp/TemplateTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TemplateTag.java 20 Mar 2008 11:52:10 -0000 1.6 --- TemplateTag.java 20 Mar 2008 22:27:20 -0000 1.7 *************** *** 127,131 **** public WebMacro getWebMacro() throws InitException { ! return webmacro == null ? webmacro = makeWM() : webmacro; } --- 127,133 ---- public WebMacro getWebMacro() throws InitException { ! if (webmacro == null) ! webmacro = makeWM(); ! return webmacro; } |
From: Tim P <ti...@us...> - 2008-03-20 22:24:45
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8694/src/org/webmacro/parser Modified Files: ParseException.java Log Message: Tabs Index: ParseException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/ParseException.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ParseException.java 30 Jul 2005 04:00:34 -0000 1.6 --- ParseException.java 20 Mar 2008 22:24:39 -0000 1.7 *************** *** 17,26 **** { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! /** * This constructor is used by the method "generateParseException" * in the generated parser. Calling this constructor generates --- 17,23 ---- { ! private static final long serialVersionUID = 1L; ! /** * This constructor is used by the method "generateParseException" * in the generated parser. Calling this constructor generates *************** *** 209,222 **** default: if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) ! { String s = "0000" + Integer.toString(ch, 16); retval.append("\\u" + s.substring(s.length() - 4, s.length())); } ! else ! { retval.append(ch); } continue; ! } } return retval.toString(); --- 206,219 ---- default: if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) ! { String s = "0000" + Integer.toString(ch, 16); retval.append("\\u" + s.substring(s.length() - 4, s.length())); } ! else ! { retval.append(ch); } continue; ! } } return retval.toString(); |
From: Tim P <ti...@us...> - 2008-03-20 21:55:48
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29439/src/org/webmacro/tools Modified Files: WMTemplateAntTask.java Log Message: Checkstyle: redundant throws Index: WMTemplateAntTask.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/tools/WMTemplateAntTask.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WMTemplateAntTask.java 27 May 2005 19:44:59 -0000 1.6 --- WMTemplateAntTask.java 20 Mar 2008 21:55:45 -0000 1.7 *************** *** 1,5 **** package org.webmacro.tools; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; --- 1,4 ---- *************** *** 14,18 **** /** ! * Taskdef for validating WM templates * * @author Brian Goetz --- 13,17 ---- /** ! * Taskdef for validating WM templates. * * @author Brian Goetz *************** *** 80,84 **** ! public void execute () throws BuildException { --- 79,83 ---- ! public void execute () { |
From: Tim P <ti...@us...> - 2008-03-20 21:53:46
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/tools In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28656/src/org/webmacro/tools Modified Files: TemplateEvalAntTask.java Log Message: whitespace Index: TemplateEvalAntTask.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/tools/TemplateEvalAntTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TemplateEvalAntTask.java 1 Nov 2005 04:08:05 -0000 1.4 --- TemplateEvalAntTask.java 20 Mar 2008 21:53:44 -0000 1.5 *************** *** 3,8 **** * Subclass of WMTemplateAntTask for naming * EvalTemplates as the ant task to run. * @author lane - * */ public class TemplateEvalAntTask extends WMTemplateAntTask --- 3,8 ---- * Subclass of WMTemplateAntTask for naming * EvalTemplates as the ant task to run. + * * @author lane */ public class TemplateEvalAntTask extends WMTemplateAntTask *************** *** 13,16 **** --- 13,17 ---- super(); } + /** * Returns org.webmacro.tools.EvalTemplates |
From: Tim P <ti...@us...> - 2008-03-20 21:52:24
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28205/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.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CountDirective.java 20 Mar 2008 12:37:38 -0000 1.9 --- CountDirective.java 20 Mar 2008 21:52:21 -0000 1.10 *************** *** 179,183 **** if (step > 0) { ! for (; start <= end; start += step) { _iterator.setValue(context, new Integer(start)); --- 179,183 ---- if (step > 0) { ! for ( ; start <= end; start += step) { _iterator.setValue(context, new Integer(start)); *************** *** 187,191 **** else if (step < 0) { ! for (; start >= end; start += step) { _iterator.setValue(context, new Integer(start)); --- 187,191 ---- else if (step < 0) { ! for ( ; start >= end; start += step) { _iterator.setValue(context, new Integer(start)); |