Author: apetrelli
Date: Fri Mar 9 04:01:00 2007
New Revision: 516381
URL: http://svn.apache.org/viewvc?view=rev&rev=516381
Log:
TILES-129
Cleaned Java 5 support for tiles-core, tiles-jsp and tiles-api main source code.
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitions.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesDecorationFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
(original)
+++
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
Fri Mar 9 04:01:00 2007
@@ -75,7 +75,7 @@
private static Object getAttribute(Object context, String attributeName) {
try {
- Class contextClass = context.getClass();
+ Class<?> contextClass = context.getClass();
Method attrMethod = contextClass.getMethod("getAttribute",
String.class);
return attrMethod.invoke(context, attributeName);
} catch (Exception e) {
@@ -87,7 +87,7 @@
private static void setAttribute(Object context, String name, Object value)
throws TilesException {
try {
- Class contextClass = context.getClass();
+ Class<?> contextClass = context.getClass();
Method attrMethod = contextClass.getMethod("setAttribute",
String.class, Object.class);
attrMethod.invoke(context, name, value);
} catch (Exception e) {
@@ -98,7 +98,7 @@
private static void removeAttribute(Object context, String name)
throws TilesException {
try {
- Class contextClass = context.getClass();
+ Class<?> contextClass = context.getClass();
Method attrMethod = contextClass.getMethod("removeAttribute",
String.class);
attrMethod.invoke(context, name);
} catch (Exception e) {
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
(original)
+++
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
Fri Mar 9 04:01:00 2007
@@ -127,6 +127,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected Map<String, String> parseAlternateDefinitions() {
Map<String, String> map = new HashMap<String, String>();
Enumeration<String> e = filterConfig.getInitParameterNames();
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitions.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitions.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitions.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitions.java
Fri Mar 9 04:01:00 2007
@@ -95,5 +95,5 @@
/**
* Returns base definitions collection;
*/
- public Map getBaseDefinitions();
+ public Map<String, ComponentDefinition> getBaseDefinitions();
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
Fri Mar 9 04:01:00 2007
@@ -107,9 +107,10 @@
ComponentDefinition definition = null;
if (locale != null) {
- Map localeSpecificMap = localeSpecificDefinitions.get(locale);
+ Map<String, ComponentDefinition> localeSpecificMap =
localeSpecificDefinitions
+ .get(locale);
if (localeSpecificMap != null) {
- definition = (ComponentDefinition) localeSpecificMap.get(name);
+ definition = localeSpecificMap.get(name);
}
}
@@ -154,7 +155,7 @@
/**
* Returns base definitions collection;
*/
- public Map getBaseDefinitions() {
+ public Map<String, ComponentDefinition> getBaseDefinitions() {
return baseDefinitions;
}
@@ -272,9 +273,10 @@
protected void overload(ComponentDefinition parent,
ComponentDefinition child) {
// Iterate on each parent's attribute and add it if not defined in
child.
- Iterator parentAttributes = parent.getAttributes().keySet().iterator();
+ Iterator<String> parentAttributes = parent.getAttributes().keySet()
+ .iterator();
while (parentAttributes.hasNext()) {
- String name = (String) parentAttributes.next();
+ String name = parentAttributes.next();
if (!child.getAttributes().containsKey(name))
child.put(name, parent.getAttribute(name));
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
Fri Mar 9 04:01:00 2007
@@ -48,7 +48,7 @@
* @throws DefinitionsFactoryException if required properties are not
* passed in or the initialization
fails.
*/
- public void init(Map params) throws DefinitionsFactoryException;
+ public void init(Map<String, String> params) throws
DefinitionsFactoryException;
/**
* Reads <code>[EMAIL PROTECTED]
org.apache.tiles.definition.ComponentDefinition}</code> objects from a source.
@@ -61,6 +61,6 @@
* @throws DefinitionsFactoryException if the source is invalid or
* an error occurs when reading
definitions.
*/
- public Map read(Object source) throws DefinitionsFactoryException;
+ public Map<String, ComponentDefinition> read(Object source) throws
DefinitionsFactoryException;
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
Fri Mar 9 04:01:00 2007
@@ -214,7 +214,7 @@
processedLocales.add(locale);
List<String> postfixes = calculatePostfixes(locale);
- Map localeDefsMap = new HashMap();
+ Map<String, ComponentDefinition> localeDefsMap = new HashMap<String,
ComponentDefinition>();
for (Object postfix : postfixes) {
// For each postfix, all the sources must be loaded.
for (Object source : sources) {
@@ -231,7 +231,8 @@
// Definition must be collected, starting from the base
// source up to the last localized file.
- Map defsMap = reader.read(connection.getInputStream());
+ Map<String, ComponentDefinition> defsMap = reader
+ .read(connection.getInputStream());
if (defsMap != null) {
localeDefsMap.putAll(defsMap);
}
@@ -267,7 +268,8 @@
connection.connect();
lastModifiedDates.put(source.toExternalForm(),
connection.getLastModified());
- Map defsMap = reader.read(connection.getInputStream());
+ Map<String, ComponentDefinition> defsMap = reader
+ .read(connection.getInputStream());
definitions.addDefinitions(defsMap);
}
} catch (IOException e) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
Fri Mar 9 04:01:00 2007
@@ -124,7 +124,7 @@
* if the source is invalid or
* an error occurs when reading definitions.
*/
- public Map read(Object source) throws DefinitionsFactoryException {
+ public Map<String, ComponentDefinition> read(Object source) throws
DefinitionsFactoryException {
// Get out if we have not been initialized.
if (!inited) {
@@ -178,10 +178,10 @@
* if required properties are not
* passed in or the initialization fails.
*/
- public void init(Map params) throws DefinitionsFactoryException {
+ public void init(Map<String, String> params) throws
DefinitionsFactoryException {
if (params != null) {
- String value = (String) params.get(PARSER_VALIDATE_PARAMETER_NAME);
+ String value = params.get(PARSER_VALIDATE_PARAMETER_NAME);
if (value != null) {
digester.setValidating(Boolean.valueOf(value));
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
Fri Mar 9 04:01:00 2007
@@ -216,7 +216,7 @@
String parameterName) throws
TilesException {
Object value;
try {
- Class contextClass = context.getClass();
+ Class<?> contextClass = context.getClass();
Method getInitParameterMethod =
contextClass.getMethod("getInitParameter", String.class);
value = getInitParameterMethod.invoke(context, parameterName);
@@ -227,17 +227,19 @@
return value == null ? null : value.toString();
}
+ @SuppressWarnings("unchecked")
protected static Map<String, String> getInitParameterMap(Object context)
throws TilesException {
Map<String, String> initParameters = new HashMap<String, String>();
- Class contextClass = context.getClass();
+ Class<?> contextClass = context.getClass();
try {
Method method = contextClass.getMethod("getInitParameterNames");
- Enumeration e = (Enumeration) method.invoke(context);
+ Enumeration<String> e = (Enumeration<String>) method
+ .invoke(context);
method = contextClass.getMethod("getInitParameter", String.class);
while (e.hasMoreElements()) {
- String key = (String) e.nextElement();
+ String key = e.nextElement();
initParameters.put(key, (String) method.invoke(context, key));
}
} catch (Exception e) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesDecorationFilter.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesDecorationFilter.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesDecorationFilter.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesDecorationFilter.java
Fri Mar 9 04:01:00 2007
@@ -47,15 +47,9 @@
public class TilesDecorationFilter implements Filter {
+ @SuppressWarnings("unused")
private static final Log LOG =
LogFactory.getLog(TilesDecorationFilter.class);
- /**
- * The filter configuration object we are associated with. If
- * this value is null, this filter instance is not currently
- * configured.
- */
- private FilterConfig filterConfig = null;
-
private ServletContext servletContext = null;
private String targetAttributeName = "body";
@@ -100,7 +94,6 @@
}
public void init(FilterConfig filterConfig) throws ServletException {
- this.filterConfig = filterConfig;
String name = filterConfig.getInitParameter("target-attribute-name");
if(name != null) {
targetAttributeName = name;
@@ -111,7 +104,6 @@
* Destroy method for this filter
*/
public void destroy() {
- this.filterConfig = null;
this.servletContext = null;
this.targetAttributeName = "body";
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
Fri Mar 9 04:01:00 2007
@@ -39,6 +39,7 @@
public class TilesFilter extends TilesServlet implements Filter {
+ @SuppressWarnings("unused")
private static final Log LOG = LogFactory.getLog(TilesFilter.class);
/**
@@ -147,6 +148,7 @@
return config.getInitParameter(string);
}
+ @SuppressWarnings("unchecked")
public Enumeration getInitParameterNames() {
return config.getInitParameterNames();
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
Fri Mar 9 04:01:00 2007
@@ -81,7 +81,7 @@
*/
public String getDefinitionsFactoryKey(TilesRequestContext request) {
String retValue = null;
- Map requestScope = request.getRequestScope();
+ Map<String, Object> requestScope = request.getRequestScope();
if (requestScope != null) { // Probably the request scope does not
exist
retValue = (String) requestScope.get(
DEFINITIONS_FACTORY_KEY_ATTRIBUTE_NAME);
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
Fri Mar 9 04:01:00 2007
@@ -41,7 +41,7 @@
public Locale resolveLocale(TilesRequestContext request) {
Locale retValue = null;
- Map session = request.getSessionScope();
+ Map<String, Object> session = request.getSessionScope();
if (session != null) {
retValue = (Locale) session.get(ComponentConstants.LOCALE_KEY);
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
Fri Mar 9 04:01:00 2007
@@ -59,6 +59,7 @@
return rootContext.getMimeType(string);
}
+ @SuppressWarnings("unchecked")
public Set getResourcePaths(String string) {
return rootContext.getResourcePaths(string);
}
@@ -84,12 +85,12 @@
return rootContext.getServlet(string);
}
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({ "deprecation", "unchecked" })
public Enumeration getServlets() {
return rootContext.getServlets(); //To change body of implemented
methods use File | Settings | File Templates.
}
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({ "deprecation", "unchecked" })
public Enumeration getServletNames() {
return rootContext.getServletNames();
}
@@ -123,6 +124,7 @@
return parm;
}
+ @SuppressWarnings("unchecked")
public Enumeration getInitParameterNames() {
return new CompositeEnumeration(config.getInitParameterNames(),
rootContext.getInitParameterNames());
@@ -132,6 +134,7 @@
return rootContext.getAttribute(string);
}
+ @SuppressWarnings("unchecked")
public Enumeration getAttributeNames() {
return rootContext.getAttributeNames();
}
@@ -148,6 +151,7 @@
return rootContext.getServletContextName();
}
+ @SuppressWarnings("unchecked")
class CompositeEnumeration implements Enumeration {
private Enumeration first;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
Fri Mar 9 04:01:00 2007
@@ -40,7 +40,7 @@
Thread.currentThread().setContextClassLoader(ClassUtil.class.getClassLoader());
}
try {
- Class namedClass = Class.forName(className);
+ Class<?> namedClass = Class.forName(className);
return namedClass.newInstance();
} catch (ClassNotFoundException e) {
if(returnNull) {
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
Fri Mar 9 04:01:00 2007
@@ -53,7 +53,7 @@
static {
try {
// get version of include method with flush argument
- Class[] args = new Class[]{String.class, boolean.class};
+ Class<?>[] args = new Class<?>[]{String.class, boolean.class};
include = PageContext.class.getMethod("include", args);
} catch (NoSuchMethodException e) {
LOG.debug("Could not find JSP 2.0 include method. Using old one
that doesn't support " +
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
Fri Mar 9 04:01:00 2007
@@ -44,6 +44,7 @@
/**
* The log instance for this tag.
*/
+ @SuppressWarnings("unused")
private static final Log LOG =
LogFactory.getLog(ContainerTagSupport.class);
protected TilesContainer container;
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
Fri Mar 9 04:01:00 2007
@@ -58,9 +58,9 @@
pageContext.setAttribute(toName != null? toName : name,
attribute.getValue(), scope);
} else {
- Iterator names = componentContext.getAttributeNames();
+ Iterator<String> names = componentContext.getAttributeNames();
while (names.hasNext()) {
- String name = (String) names.next();
+ String name = names.next();
if (name == null && !ignore) {
throw new JspException("Error importing attributes. " +
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?view=diff&rev=516381&r1=516380&r2=516381
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
Fri Mar 9 04:01:00 2007
@@ -131,7 +131,6 @@
- @SuppressWarnings("deprecated")
public class RuntimeConfiguredContext implements ServletContext {
private ServletContext rootContext;
@@ -159,6 +158,7 @@
return rootContext.getMimeType(string);
}
+ @SuppressWarnings("unchecked")
public Set getResourcePaths(String string) {
return rootContext.getResourcePaths(string);
}
@@ -179,15 +179,18 @@
return rootContext.getNamedDispatcher(string);
}
- public Servlet getServlet(String string) throws ServletException {
+ @SuppressWarnings("deprecation")
+ public Servlet getServlet(String string) throws
ServletException {
return rootContext.getServlet(string);
}
- public Enumeration getServlets() {
+ @SuppressWarnings({ "deprecation", "unchecked" })
+ public Enumeration getServlets() {
return rootContext.getServlets();
}
- public Enumeration getServletNames() {
+ @SuppressWarnings({ "deprecation", "unchecked" })
+ public Enumeration getServletNames() {
return rootContext.getServletNames();
}
@@ -195,7 +198,8 @@
rootContext.log(string);
}
- public void log(Exception exception, String string) {
+ @SuppressWarnings("deprecation")
+ public void log(Exception exception, String string) {
rootContext.log(exception, string);
}
@@ -222,6 +226,7 @@
initParameters.put(name, value);
}
+ @SuppressWarnings("unchecked")
public Enumeration getInitParameterNames() {
return rootContext.getInitParameterNames();
}
@@ -230,6 +235,7 @@
return rootContext.getAttribute(string);
}
+ @SuppressWarnings("unchecked")
public Enumeration getAttributeNames() {
return rootContext.getAttributeNames();
}
