henning
Sat, 04 Nov 2006 10:35:07 -0800
Author: henning Date: Sat Nov 4 10:34:38 2006 New Revision: 471244 URL: http://svn.apache.org/viewvc?view=rev&rev=471244 Log: Some style fixes (remove unused Imports, unused Variables, adding Serial Version ID for serializable fields
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/IteratorTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/FormTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/MessageTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/TilesTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ImportSupport.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolInfo.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/CookieTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ImportTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/LinkTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/IteratorTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/IteratorTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/IteratorTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/IteratorTool.java
Sat Nov 4 10:34:38 2006
@@ -20,7 +20,6 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
-import java.util.Vector;
import org.apache.velocity.util.ArrayIterator;
import org.apache.velocity.util.EnumerationIterator;
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.java
Sat Nov 4 10:34:38 2006
@@ -33,7 +33,7 @@
* </code>
* </p>
*
- * @version $Id: LogSystemCommonsLog.java,v 1.4 2004/11/11 07:00:54 nbubna Exp
$
+ * @version $Id$
*/
public class LogSystemCommonsLog implements Log
{
@@ -52,7 +52,6 @@
// ******************** begin non-static stuff *******************
private boolean printStackTrace = false;
- private String name;
public LogSystemCommonsLog()
{
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
Sat Nov 4 10:34:38 2006
@@ -19,12 +19,12 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.util.MessageResources;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.apache.velocity.tools.struts.StrutsUtils;
+import org.apache.struts.util.MessageResources;
/**
* <p>View tool to work with the Struts action messages.</p>
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/FormTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/FormTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/FormTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/FormTool.java
Sat Nov 4 10:34:38 2006
@@ -19,13 +19,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.servlet.ServletContext;
-
-import org.apache.struts.util.MessageResources;
-import org.apache.struts.action.*;
+import org.apache.struts.action.ActionForm;
import org.apache.velocity.tools.view.context.ViewContext;
-import org.apache.struts.util.ModuleUtils;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/MessageTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/MessageTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/MessageTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/MessageTool.java
Sat Nov 4 10:34:38 2006
@@ -17,7 +17,7 @@
package org.apache.velocity.tools.struts;
import java.util.List;
-import java.util.Locale;
+
import org.apache.struts.util.MessageResources;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java
Sat Nov 4 10:34:38 2006
@@ -17,16 +17,14 @@
package org.apache.velocity.tools.struts;
import java.util.Iterator;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.velocity.tools.view.tools.LinkTool;
-import org.apache.velocity.tools.struts.StrutsUtils;
-
+import org.apache.struts.action.SecurePlugInInterface;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.SecureActionConfig;
-import org.apache.struts.action.SecurePlugInInterface;
-import org.apache.struts.Globals;
+import org.apache.velocity.tools.view.tools.LinkTool;
/**
* Tool to be able to use Struts SSL Extensions with Velocity.
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsLinkTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsLinkTool.java
Sat Nov 4 10:34:38 2006
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.tools.view.tools.LinkTool;
-import org.apache.velocity.tools.struts.StrutsUtils;
/**
* <p>View tool to work with URI links in Struts.</p>
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/TilesTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/TilesTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/TilesTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/TilesTool.java
Sat Nov 4 10:34:38 2006
@@ -16,26 +16,23 @@
package org.apache.velocity.tools.struts;
-import java.util.Stack;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
+import java.util.Stack;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.struts.tiles.AttributeDefinition;
import org.apache.struts.tiles.ComponentContext;
import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.AttributeDefinition;
-import org.apache.struts.tiles.DirectStringAttribute;
+import org.apache.struts.tiles.Controller;
import org.apache.struts.tiles.DefinitionAttribute;
import org.apache.struts.tiles.DefinitionNameAttribute;
-import org.apache.struts.tiles.PathAttribute;
-import org.apache.struts.tiles.TilesUtil;
import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.Controller;
-
+import org.apache.struts.tiles.DirectStringAttribute;
+import org.apache.struts.tiles.TilesUtil;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.ImportSupport;
import org.apache.velocity.tools.view.context.ViewContext;
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java
Sat Nov 4 10:34:38 2006
@@ -17,8 +17,8 @@
package org.apache.velocity.tools.struts;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -32,9 +32,7 @@
import org.apache.commons.validator.Form;
import org.apache.commons.validator.ValidatorAction;
import org.apache.commons.validator.ValidatorResources;
-import org.apache.commons.validator.util.ValidatorUtils;
import org.apache.commons.validator.Var;
-
import org.apache.struts.Globals;
import org.apache.struts.config.ActionConfig;
import org.apache.struts.config.ModuleConfig;
@@ -42,7 +40,6 @@
import org.apache.struts.util.ModuleUtils;
import org.apache.struts.validator.Resources;
import org.apache.struts.validator.ValidatorPlugIn;
-
import org.apache.velocity.tools.view.context.ViewContext;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ImportSupport.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ImportSupport.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ImportSupport.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ImportSupport.java
Sat Nov 4 10:34:38 2006
@@ -16,28 +16,27 @@
package org.apache.velocity.tools.view;
-import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.ServletContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletException;
-
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
import java.io.Reader;
-import java.io.BufferedReader;
import java.io.StringReader;
-import java.io.InputStreamReader;
import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import java.net.HttpURLConnection;
+import java.util.Locale;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
/**
* <p>Provides methods to import arbitrary local or remote resources as
strings.</p>
@@ -197,7 +196,7 @@
String contentType = uc.getContentType();
if (contentType != null)
{
- charSet = this.getContentTypeAttribute(contentType,
"charset");
+ charSet =
ImportSupport.getContentTypeAttribute(contentType, "charset");
if (charSet == null)
{
charSet = DEFAULT_ENCODING;
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ToolboxRuleSet.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
Sat Nov 4 10:34:38 2006
@@ -19,8 +19,6 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.RuleSetBase;
-import org.apache.velocity.tools.view.DataInfo;
-import org.apache.velocity.tools.view.ViewToolInfo;
import org.xml.sax.Attributes;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
Sat Nov 4 10:34:38 2006
@@ -29,7 +29,6 @@
import org.apache.commons.digester.RuleSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.tools.view.ToolboxRuleSet;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolInfo.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolInfo.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolInfo.java
Sat Nov 4 10:34:38 2006
@@ -19,7 +19,6 @@
import org.apache.velocity.tools.view.ViewToolInfo;
-import org.apache.velocity.tools.view.context.ViewContext;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
Sat Nov 4 10:34:38 2006
@@ -21,25 +21,20 @@
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-
-import java.util.List;
-import java.util.Iterator;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
-import java.util.ArrayList;
-import javax.servlet.http.HttpSession;
import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
-import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.tools.view.DataInfo;
import org.apache.velocity.tools.view.ToolInfo;
import org.apache.velocity.tools.view.XMLToolboxManager;
import org.apache.velocity.tools.view.context.ViewContext;
-import org.apache.velocity.tools.view.servlet.ServletToolboxRuleSet;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxRuleSet.java
Sat Nov 4 10:34:38 2006
@@ -19,8 +19,6 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.velocity.tools.view.ToolboxRuleSet;
-import org.apache.velocity.tools.view.servlet.ServletToolboxManager;
-import org.apache.velocity.tools.view.servlet.ServletToolInfo;
/**
* <p>The set of Digester rules required to parse a toolbox
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
Sat Nov 4 10:34:38 2006
@@ -17,13 +17,14 @@
package org.apache.velocity.tools.view.servlet;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
@@ -31,7 +32,6 @@
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
/**
@@ -43,11 +43,14 @@
* somewhere.
*
* @author <a href="[EMAIL PROTECTED]">Nathan Bubna</a>
- * @version $Id: VelocityLayoutServlet.java,v 1.10 2004/11/11 07:01:21 nbubna
Exp $
+ * @version $Id$
*/
public class VelocityLayoutServlet extends VelocityViewServlet
{
+
+ /** serial version id */
+ private static final long serialVersionUID = -4521817395157483487L;
/**
* The velocity.properties key for specifying the
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/WebappLoader.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
Sat Nov 4 10:34:38 2006
@@ -16,16 +16,14 @@
package org.apache.velocity.tools.view.servlet;
-import javax.servlet.ServletContext;
-
-import java.io.InputStream;
import java.io.File;
+import java.io.InputStream;
import java.util.HashMap;
-import org.apache.commons.collections.ExtendedProperties;
+import javax.servlet.ServletContext;
+import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
Sat Nov 4 10:34:38 2006
@@ -18,15 +18,9 @@
package org.apache.velocity.tools.view.tools;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.velocity.tools.view.context.ViewContext;
-
/**
* <p>Abstract view tool for doing "searching" and robust
@@ -329,7 +323,10 @@
public class StoredResults implements java.io.Serializable
{
- private transient Object crit;
+ /** serial version id */
+ private static final long serialVersionUID = 4503130168585978169L;
+
+ private transient Object crit;
private transient List list;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
Sat Nov 4 10:34:38 2006
@@ -16,14 +16,13 @@
package org.apache.velocity.tools.view.tools;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletRequest;
import org.apache.velocity.tools.view.context.ViewContext;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.regex.PatternSyntaxException;
/**
* <p>browser-sniffing tool (session or request scope requested, session
scope advised).</p>
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/CookieTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/CookieTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/CookieTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/CookieTool.java
Sat Nov 4 10:34:38 2006
@@ -16,10 +16,10 @@
package org.apache.velocity.tools.view.tools;
-import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Cookie;
+
import org.apache.velocity.tools.view.context.ViewContext;
/**
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ImportTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ImportTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ImportTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ImportTool.java
Sat Nov 4 10:34:38 2006
@@ -16,10 +16,6 @@
package org.apache.velocity.tools.view.tools;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.tools.view.ImportSupport;
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/LinkTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/LinkTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/LinkTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/LinkTool.java
Sat Nov 4 10:34:38 2006
@@ -21,10 +21,11 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
+
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.tools.view.context.ViewContext;
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java?view=diff&rev=471244&r1=471243&r2=471244
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
Sat Nov 4 10:34:38 2006
@@ -16,8 +16,6 @@
package org.apache.velocity.tools.view.tools;
-import java.io.StringWriter;
-import java.util.Map;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.generic.RenderTool;
import org.apache.velocity.tools.view.context.ViewContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]