Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18836/src/org/webmacro/servlet
Modified Files:
Servlet22Broker.java
Log Message:
Eclipse: missing javadoc return
Index: Servlet22Broker.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/Servlet22Broker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Servlet22Broker.java 31 Oct 2005 02:46:41 -0000 1.14
--- Servlet22Broker.java 19 Mar 2008 20:04:44 -0000 1.15
***************
*** 148,163 ****
/**
* Get an existing instance of the Servlet 2.2 broker or create a new one.
* Templates will be retrieved relative to the ServletContext root
! * and classes loaded from the ClassLoader passed in. NOTE: Templates
! * will <b>not</b> be loaded from the classpath.
* @param sc The ServletContext to template access
* @param cl The ClassLoader for class loading, typically servlet or
! * JSP page's class loader
* @param additionalProperties
* @param fromServlet true if it is actually an initialization derived from
! * a Servlet instance passed in - just for nicer logging output
* @param servletOrContextName Name of the servlet or context originating this broker,
! * for nicer logging
! * @return
* @throws org.webmacro.InitException
* @since 2.1
--- 148,166 ----
/**
* Get an existing instance of the Servlet 2.2 broker or create a new one.
+ *
* Templates will be retrieved relative to the ServletContext root
! * and classes loaded from the ClassLoader passed in.
! *
! * NOTE: Templates will <b>not</b> be loaded from the classpath.
! *
* @param sc The ServletContext to template access
* @param cl The ClassLoader for class loading, typically servlet or
! * JSP page's class loader
* @param additionalProperties
* @param fromServlet true if it is actually an initialization derived from
! * a Servlet instance passed in - just for nicer logging output
* @param servletOrContextName Name of the servlet or context originating this broker,
! * for nicer logging
! *
* @throws org.webmacro.InitException
* @since 2.1
***************
*** 199,203 ****
/**
! * Get a resource (file) from the the Broker's class loader
*/
public URL getResource (String name)
--- 202,206 ----
/**
! * Get a resource (file) from the the Broker's class loader.
*/
public URL getResource (String name)
***************
*** 245,249 ****
/**
! * Get a resource (file) from the Broker's class loader
*/
public InputStream getResourceAsStream (String name)
--- 248,252 ----
/**
! * Get a resource (file) from the Broker's class loader.
*/
public InputStream getResourceAsStream (String name)
***************
*** 259,263 ****
/**
* Get a template; kind of like getting a resource, but might come
! * from a different place
*/
public URL getTemplate (String name)
--- 262,266 ----
/**
* Get a template; kind of like getting a resource, but might come
! * from a different place.
*/
public URL getTemplate (String name)
***************
*** 275,280 ****
* 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
{
--- 278,283 ----
* 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
{
|
