Author: cziegeler
Date: Fri Feb 12 14:03:17 2010
New Revision: 909412
URL: http://svn.apache.org/viewvc?rev=909412&view=rev
Log:
Code cleanup
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/juli/logging/LogFactory.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/juli/logging/LogFactory.java?rev=909412&r1=909411&r2=909412&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/juli/logging/LogFactory.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/juli/logging/LogFactory.java
Fri Feb 12 14:03:17 2010
@@ -29,7 +29,7 @@
* @exception LogConfigurationException if a suitable <code>Log</code>
* instance cannot be returned
*/
- public static Log getLog(Class clazz)
+ public static Log getLog(Class<?> clazz)
throws LogConfigurationException {
return getLog(clazz.getName());
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java?rev=909412&r1=909411&r2=909412&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
Fri Feb 12 14:03:17 2010
@@ -126,7 +126,6 @@
* @throws SlingServletException
* @throws SlingIOException
*/
- @SuppressWarnings("unchecked")
private void callJsp(final Bindings bindings,
final SlingScriptHelper scriptHelper,
final ScriptContext context) {
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java?rev=909412&r1=909411&r2=909412&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
Fri Feb 12 14:03:17 2010
@@ -353,6 +353,7 @@
return false;
}
+ @SuppressWarnings("unchecked")
public Map getCache() {
return null;
}
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java?rev=909412&r1=909411&r2=909412&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Fri Feb 12 14:03:17 2010
@@ -194,10 +194,6 @@
return bundle;
}
- String getTldPath() {
- return tldPath;
- }
-
URL getTldURL() {
return bundle.getEntry(tldPath);
}
