You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/08/13 01:24:26 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake TurbineIntakeService.java
epugh 2003/08/12 16:24:26
Modified: src/java/org/apache/turbine/util/velocity
VelocityActionEvent.java
src/java/org/apache/turbine/services/localization
LocaleDetector.java
src/java/org/apache/turbine/services/jsp
TurbineJspService.java
src/java/org/apache/turbine/services/cache
TurbineGlobalCacheService.java
src/java/org/apache/turbine/services/intake
TurbineIntakeService.java
Log:
Unneeded variables suggested by PMD
Revision Changes Path
1.17 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
Index: VelocityActionEvent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VelocityActionEvent.java 5 Aug 2003 08:21:19 -0000 1.16
+++ VelocityActionEvent.java 12 Aug 2003 23:24:26 -0000 1.17
@@ -62,7 +62,6 @@
import org.apache.turbine.modules.ActionEvent;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.parser.ParameterParser;
import org.apache.velocity.context.Context;
1.7 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocaleDetector.java
Index: LocaleDetector.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocaleDetector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocaleDetector.java 4 Apr 2003 14:59:29 -0000 1.6
+++ LocaleDetector.java 12 Aug 2003 23:24:26 -0000 1.7
@@ -104,7 +104,6 @@
{
Configuration conf = Turbine.getConfiguration();
- Locale locale = null;
// return a "default" locale
if (languageHeader == null ||
1.15 +0 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineJspService.java 3 Jun 2003 13:41:27 -0000 1.14
+++ TurbineJspService.java 12 Aug 2003 23:24:26 -0000 1.15
@@ -253,7 +253,6 @@
private void initJsp()
throws Exception
{
- ServletContext context = TurbineServlet.getServletContext();
Configuration config = getConfiguration();
// Set relative paths from config.
1.10 +3 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
Index: TurbineGlobalCacheService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineGlobalCacheService.java 7 Apr 2003 15:36:38 -0000 1.9
+++ TurbineGlobalCacheService.java 12 Aug 2003 23:24:26 -0000 1.10
@@ -205,8 +205,7 @@
throws ObjectExpiredException
{
CachedObject obj = null;
- boolean stale = false;
-
+
obj = (CachedObject) cache.get(id);
if (obj == null)
@@ -377,8 +376,7 @@
{
for (Enumeration e = cache.keys(); e.hasMoreElements();)
{
- String key = (String) e.nextElement();
- CachedObject co = (CachedObject) cache.get(key);
+ String key = (String) e.nextElement();
cache.remove(key);
}
}
1.14 +2 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineIntakeService.java 9 Apr 2003 22:34:23 -0000 1.13
+++ TurbineIntakeService.java 12 Aug 2003 23:24:26 -0000 1.14
@@ -143,7 +143,6 @@
public void init()
throws InitializationException
{
- ServletConfig config = Turbine.getTurbineServletConfig();
Vector defaultXmlPathes = new Vector();
defaultXmlPathes.add(XML_PATH_DEFAULT);
@@ -257,9 +256,7 @@
{
for (Iterator it = appDataElements.keySet().iterator(); it.hasNext();)
{
- AppData appData = (AppData) it.next();
-
- String pkg = appData.getBasePackage();
+ AppData appData = (AppData) it.next();
int maxPooledGroups = 0;
List glist = appData.getGroups();