[jboss-cvs] JBossAS SVN: r81811 - projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/ha/cachemanager.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-11-29 12:24:22 -0500 (Sat, 29 Nov 2008)
New Revision: 81811

Modified:
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/ha/cachemanager/CacheManager.java
Log:
More warnings suppression

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/ha/cachemanager/CacheManager.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/ha/cachemanager/CacheManager.java	2008-11-29 17:19:55 UTC (rev 81810)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/ha/cachemanager/CacheManager.java	2008-11-29 17:24:22 UTC (rev 81811)
@@ -44,7 +44,6 @@
 import org.jboss.cache.CacheStatus;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.ConfigurationRegistry;
-import org.jboss.cache.jmx.CacheJmxWrapper;
 import org.jboss.cache.notifications.annotation.CacheListener;
 import org.jboss.cache.notifications.annotation.CacheStarted;
 import org.jboss.cache.notifications.annotation.CacheStopped;
@@ -259,7 +258,9 @@
          if (registerCachesInJmx && mbeanServer != null)
          {
             String oName = getObjectName(getCoreCacheJmxAttributes(), configName);
-            CacheJmxWrapper wrapper = new CacheJmxWrapper(cache);
+            @SuppressWarnings("deprecation")
+            org.jboss.cache.jmx.CacheJmxWrapper<Object, Object> wrapper = 
+               new org.jboss.cache.jmx.CacheJmxWrapper<Object, Object>(cache);
             try
             {
                mbeanServer.registerMBean(wrapper, new ObjectName(oName));
@@ -613,13 +614,14 @@
       return base + ":" + attributesBase + configName;
    }
    
+   @SuppressWarnings("deprecation")
    @CacheListener
    public static class StartStopListener
    {
-      private final CacheJmxWrapper plainWrapper;
+      private final org.jboss.cache.jmx.CacheJmxWrapper<Object, Object> plainWrapper;
       private final PojoCacheJmxWrapper pojoWrapper;
       
-      private StartStopListener(CacheJmxWrapper wrapper)
+      private StartStopListener(org.jboss.cache.jmx.CacheJmxWrapper<Object, Object> wrapper)
       {
          assert wrapper != null : "wrapper is null";
          this.plainWrapper = wrapper;
@@ -661,7 +663,7 @@
     * @param ctx Naming context under which we bind the object
     * @throws Exception Thrown if a naming exception occurs during binding
     */   
-   private void bind(String jndiName, Object who, Class classType, Context ctx) throws Exception
+   private void bind(String jndiName, Object who, Class<?> classType, Context ctx) throws Exception
    {
       // Ah ! This service isn't serializable, so we use a helper class
       //
@@ -700,7 +702,7 @@
    {
       for (Map.Entry<String, Boolean> entry : startupCaches.entrySet())
       {
-         Cache cache = null;
+         Cache<Object, Object> cache = null;
          if (entry.getValue().booleanValue())
          {
             PojoCache pc = getPojoCache(entry.getKey(), true);