Menu
▾
▴
webmacro-cvs
Update of /cvsroot/webmacro/webmacro/src/org/webmacro In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29613/src/org/webmacro Modified Files: Broker.java Context.java ContextException.java FastWriter.java InitException.java InvalidContextException.java InvalidTypeException.java NotFoundException.java PropertyException.java ResourceException.java RethrowableException.java RethrowableRuntimeException.java Template.java TemplateException.java UnsettableException.java WebMacroException.java WebMacroRuntimeException.java Log Message: Organise imports, tidy Index: FastWriter.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/FastWriter.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** FastWriter.java 17 Mar 2006 23:44:09 -0000 1.32 --- FastWriter.java 18 Mar 2008 16:14:56 -0000 1.33 *************** *** 24,33 **** package org.webmacro; import org.webmacro.util.ByteBufferOutputStream; import org.webmacro.util.Encoder; import org.webmacro.util.EncoderProvider; - import java.io.*; - /** --- 24,37 ---- package org.webmacro; + import java.io.IOException; + import java.io.OutputStream; + import java.io.OutputStreamWriter; + import java.io.UnsupportedEncodingException; + import java.io.Writer; + import org.webmacro.util.ByteBufferOutputStream; import org.webmacro.util.Encoder; import org.webmacro.util.EncoderProvider; /** Index: TemplateException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/TemplateException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TemplateException.java 30 Jul 2005 04:00:21 -0000 1.7 --- TemplateException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 30,37 **** public class TemplateException extends WebMacroException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 30,33 ---- Index: RethrowableRuntimeException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/RethrowableRuntimeException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RethrowableRuntimeException.java 30 Jul 2005 04:00:21 -0000 1.5 --- RethrowableRuntimeException.java 18 Mar 2008 16:14:56 -0000 1.6 *************** *** 45,51 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 45,48 ---- Index: ResourceException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/ResourceException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ResourceException.java 30 Jul 2005 04:00:21 -0000 1.5 --- ResourceException.java 18 Mar 2008 16:14:56 -0000 1.6 *************** *** 31,37 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 31,34 ---- Index: Context.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Context.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Context.java 30 Jul 2003 04:51:17 -0000 1.64 --- Context.java 18 Mar 2008 16:14:56 -0000 1.65 *************** *** 24,28 **** package org.webmacro; ! import java.util.*; import org.webmacro.engine.EvaluationExceptionHandler; --- 24,31 ---- package org.webmacro; ! import java.util.Collection; ! import java.util.HashMap; ! import java.util.Map; ! import java.util.Set; import org.webmacro.engine.EvaluationExceptionHandler; Index: WebMacroRuntimeException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WebMacroRuntimeException.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WebMacroRuntimeException.java 30 Jul 2005 04:00:21 -0000 1.4 --- WebMacroRuntimeException.java 18 Mar 2008 16:14:56 -0000 1.5 *************** *** 30,36 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 30,33 ---- Index: InvalidContextException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/InvalidContextException.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** InvalidContextException.java 30 Jul 2005 04:00:21 -0000 1.9 --- InvalidContextException.java 18 Mar 2008 16:14:56 -0000 1.10 *************** *** 30,37 **** public class InvalidContextException extends PropertyException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 30,33 ---- Index: UnsettableException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/UnsettableException.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UnsettableException.java 30 Jul 2005 04:00:21 -0000 1.6 --- UnsettableException.java 18 Mar 2008 16:14:56 -0000 1.7 *************** *** 32,43 **** public class UnsettableException extends ContextException { - - /** - * - */ private static final long serialVersionUID = 1L; /** ! * Constructor only requires a reason * <p> * @param reason explains what went wrong --- 32,39 ---- public class UnsettableException extends ContextException { private static final long serialVersionUID = 1L; /** ! * Constructor only requires a reason. * <p> * @param reason explains what went wrong Index: RethrowableException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/RethrowableException.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RethrowableException.java 30 Jul 2005 04:00:21 -0000 1.8 --- RethrowableException.java 18 Mar 2008 16:14:56 -0000 1.9 *************** *** 45,52 **** public class RethrowableException extends Exception { - - /** - * - */ private static final long serialVersionUID = 1L; --- 45,48 ---- Index: Template.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Template.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Template.java 17 Mar 2006 18:53:23 -0000 1.19 --- Template.java 18 Mar 2008 16:14:56 -0000 1.20 *************** *** 24,28 **** package org.webmacro; ! import java.io.*; import java.util.Map; --- 24,29 ---- package org.webmacro; ! import java.io.IOException; ! import java.io.OutputStream; import java.util.Map; *************** *** 30,35 **** * Defines the type of object which contains * WebMacro script, text, blocks to be evaluated. * @author lane - * */ public interface Template extends Visitable --- 31,36 ---- * Defines the type of object which contains * WebMacro script, text, blocks to be evaluated. + * * @author lane */ public interface Template extends Visitable Index: InvalidTypeException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/InvalidTypeException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** InvalidTypeException.java 30 Jul 2005 04:00:21 -0000 1.5 --- InvalidTypeException.java 18 Mar 2008 16:14:56 -0000 1.6 *************** *** 31,37 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 31,34 ---- Index: NotFoundException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/NotFoundException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NotFoundException.java 30 Jul 2005 04:00:21 -0000 1.7 --- NotFoundException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 29,36 **** public class NotFoundException extends ResourceException { - - /** - * - */ private static final long serialVersionUID = 1L; --- 29,32 ---- Index: InitException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/InitException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** InitException.java 30 Jul 2005 04:00:21 -0000 1.7 --- InitException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 31,37 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 31,34 ---- Index: Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Broker.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Broker.java 17 Mar 2006 18:41:41 -0000 1.47 --- Broker.java 18 Mar 2008 16:14:56 -0000 1.48 *************** *** 20,30 **** package org.webmacro; ! import java.io.*; import java.lang.ref.WeakReference; import java.net.MalformedURLException; import java.net.URL; ! import java.util.*; - import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; import org.webmacro.broker.ContextAutoLoader; import org.webmacro.engine.DefaultEvaluationExceptionHandler; --- 20,43 ---- package org.webmacro; ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileNotFoundException; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; ! import java.io.UnsupportedEncodingException; import java.lang.ref.WeakReference; import java.net.MalformedURLException; import java.net.URL; ! import java.util.Arrays; ! import java.util.Enumeration; ! import java.util.Hashtable; ! import java.util.Iterator; ! import java.util.Map; ! import java.util.Properties; ! import java.util.WeakHashMap; import org.webmacro.broker.ContextAutoLoader; import org.webmacro.engine.DefaultEvaluationExceptionHandler; *************** *** 40,43 **** --- 53,58 ---- import org.webmacro.util.SubSettings; + import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; + /** * The Broker is responsible for loading and initializing almost everything Index: WebMacroException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/WebMacroException.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WebMacroException.java 30 Jul 2005 04:00:21 -0000 1.8 --- WebMacroException.java 18 Mar 2008 16:14:56 -0000 1.9 *************** *** 30,37 **** public class WebMacroException extends RethrowableException { - - /** - * - */ private static final long serialVersionUID = 1L; private String _contextLocation; --- 30,33 ---- Index: PropertyException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/PropertyException.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PropertyException.java 30 Jul 2005 04:00:21 -0000 1.18 --- PropertyException.java 18 Mar 2008 16:14:56 -0000 1.19 *************** *** 41,48 **** public class PropertyException extends ContextException { - /** - * - */ private static final long serialVersionUID = 1L; private String _message = null; --- 41,46 ---- public class PropertyException extends ContextException { private static final long serialVersionUID = 1L; + private String _message = null; Index: ContextException.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/ContextException.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ContextException.java 30 Jul 2005 04:00:21 -0000 1.7 --- ContextException.java 18 Mar 2008 16:14:56 -0000 1.8 *************** *** 32,38 **** { - /** - * - */ private static final long serialVersionUID = 1L; --- 32,35 ---- |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X