svn commit: r523773 - in /incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix: executors/impl/ExecutorFactoryImpl.java locks/impl/SimpleLockManager.java

[gn...@apache.org]

Author: gnodet
Date: Thu Mar 29 10:25:32 2007
New Revision: 523773

URL: http://svn.apache.org/viewvc?view=rev&rev=523773
Log:
SM-903: use generics

Modified:
    incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java
    incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/locks/impl/SimpleLockManager.java

Modified: incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java?view=diff&rev=523773&r1=523772&r2=523773
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java (original)
+++ incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java Thu Mar 29 10:25:32 2007
@@ -51,7 +51,7 @@
 public class ExecutorFactoryImpl implements ExecutorFactory {
 
     private ExecutorConfig defaultConfig = new ExecutorConfig();
-    private Map configs = new HashMap();
+    private Map<String,ExecutorConfig> configs = new HashMap<String, ExecutorConfig>();
     
     public Executor createExecutor(String id) {
         ExecutorConfig config = getConfig(id);
@@ -62,10 +62,10 @@
     protected ExecutorConfig getConfig(String id) {
         ExecutorConfig config = null;
         if (configs != null) {
-            config = (ExecutorConfig) configs.get(id);
+            config = configs.get(id);
             while (config == null && id.indexOf('.') > 0) {
                 id = id.substring(0, id.lastIndexOf('.'));
-                config = (ExecutorConfig) configs.get(id);
+                config = configs.get(id);
             }
         }
         if (config == null) {
@@ -78,13 +78,13 @@
         if (config.getQueueSize() != 0 && config.getCorePoolSize() == 0) {
             throw new IllegalArgumentException("CorePoolSize must be > 0 when using a capacity queue");
         }
-        BlockingQueue queue;
+        BlockingQueue<Runnable> queue;
         if (config.getQueueSize() == 0) {
-            queue = new SynchronousQueue();
+            queue = new SynchronousQueue<Runnable>();
         } else if (config.getQueueSize() < 0 || config.getQueueSize() == Integer.MAX_VALUE) {
-            queue = new LinkedBlockingQueue();
+            queue = new LinkedBlockingQueue<Runnable>();
         } else {
-            queue = new ArrayBlockingQueue(config.getQueueSize());
+            queue = new ArrayBlockingQueue<Runnable>(config.getQueueSize());
         }
         ThreadFactory factory = new DefaultThreadFactory(id,
                                                          config.isThreadDaemon(), 
@@ -144,14 +144,14 @@
     /**
      * @return the configs
      */
-    public Map getConfigs() {
+    public Map<String, ExecutorConfig> getConfigs() {
         return configs;
     }
 
     /**
      * @param configs the configs to set
      */
-    public void setConfigs(Map configs) {
+    public void setConfigs(Map<String, ExecutorConfig> configs) {
         this.configs = configs;
     }
 

Modified: incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/locks/impl/SimpleLockManager.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/locks/impl/SimpleLockManager.java?view=diff&rev=523773&r1=523772&r2=523773
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/locks/impl/SimpleLockManager.java (original)
+++ incubator/servicemix/trunk/core/servicemix-services/src/main/java/org/apache/servicemix/locks/impl/SimpleLockManager.java Thu Mar 29 10:25:32 2007
@@ -25,13 +25,13 @@
 
 public class SimpleLockManager implements LockManager {
 
-    private ConcurrentMap locks = new ConcurrentHashMap();
+    private ConcurrentMap<String, Lock> locks = new ConcurrentHashMap<String, Lock>();
     
     public Lock getLock(String id) {
-        Lock lock = (Lock) locks.get(id);
+        Lock lock = locks.get(id);
         if (lock == null) {
             lock = new ReentrantLock();
-            Lock oldLock = (Lock) locks.putIfAbsent(id, lock);
+            Lock oldLock = locks.putIfAbsent(id, lock);
             if (oldLock != null) {
                 lock = oldLock;
             }