svn commit: r1521103 - in /turbine/core/trunk/src/java/org/apache/turbine: modules/pages/ services/ services/assemblerbroker/ services/schedule/

[tv]

Author: tv
Date: Mon Sep  9 13:38:07 2013
New Revision: 1521103

URL: http://svn.apache.org/r1521103
Log:
Cleanup warnings

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java?rev=1521103&r1=1521102&r2=1521103&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java 
(original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java 
Mon Sep  9 13:38:07 2013
@@ -347,7 +347,7 @@ public class DefaultPage
     {
         String errMsg =
                 "default.doctype property not set properly in 
TurbineResources.properties!";
-        List doctypeProperty =
+        List<Object> doctypeProperty =
             
Turbine.getConfiguration().getList(TurbineConstants.DEFAULT_DOCUMENT_TYPE_KEY);
 
         if (doctypeProperty != null)

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1521103&r1=1521102&r2=1521103&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java 
(original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java 
Mon Sep  9 13:38:07 2013
@@ -237,7 +237,6 @@ public abstract class BaseServiceBroker 
      * Generic ServiceBroker provides no Services.
      * @throws InitializationException if a service class could not be found
      */
-    @SuppressWarnings("unchecked")
     protected void initMapping() throws InitializationException
     {
         // we need to temporarily store the earlyInit flags to avoid

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java?rev=1521103&r1=1521102&r2=1521103&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
 Mon Sep  9 13:38:07 2013
@@ -99,11 +99,11 @@ public class TurbineAssemblerBrokerServi
     private void registerFactories(String type)
         throws TurbineException
     {
-        List names = getConfiguration().getList(type);
+        List<Object> names = getConfiguration().getList(type);
 
         log.info("Registering " + names.size() + " " + type + " factories.");
 
-        for (Iterator it = names.iterator(); it.hasNext(); )
+        for (Iterator<Object> it = names.iterator(); it.hasNext(); )
         {
             String factory = (String) it.next();
             try
@@ -149,9 +149,9 @@ public class TurbineAssemblerBrokerServi
         {
             Configuration conf = getConfiguration();
 
-            for (Iterator i = conf.getKeys(); i.hasNext();)
+            for (Iterator<String> i = conf.getKeys(); i.hasNext();)
             {
-                String type = (String)i.next();
+                String type = i.next();
 
                 if (!"classname".equalsIgnoreCase(type))
                 {

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1521103&r1=1521102&r2=1521103&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
 Mon Sep  9 13:38:07 2013
@@ -25,12 +25,9 @@ import java.util.Vector;
 import javax.servlet.ServletConfig;
 
 import org.apache.commons.configuration.Configuration;
-
 import org.apache.commons.lang.StringUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.turbine.services.InitializationException;
 import org.apache.turbine.util.TurbineException;
 
@@ -106,7 +103,7 @@ public class TurbineNonPersistentSchedul
             scheduleQueue = new JobQueue();
             mainLoop = new MainLoop();
 
-            List<String> jobProps = conf.getList("scheduler.jobs");
+            List<Object> jobProps = conf.getList("scheduler.jobs");
             List<JobEntry> jobs = new Vector<JobEntry>();
             // If there are scheduler.jobs defined then set up a job vector
             // for the scheduleQueue
@@ -114,7 +111,7 @@ public class TurbineNonPersistentSchedul
             {
                 for (int i = 0; i < jobProps.size(); i++)
                 {
-                    String jobName = jobProps.get(i);
+                    String jobName = (String)jobProps.get(i);
                     String jobPrefix = "scheduler.job." + jobName;
 
                     String jobId = conf.getString(jobPrefix + ".ID", null);