[jboss-cvs] JBossAS SVN: r70923 - projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2.

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

Author: bstansberry at jboss.com
Date: 2008-03-17 16:10:05 -0400 (Mon, 17 Mar 2008)
New Revision: 70923

Modified:
   projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/AbortableLRUAlgorithm.java
   projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/ClusteredCacheListener.java
   projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java
Log:
[EJBTHREE-1026] Get rid of generics complaints

Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/AbortableLRUAlgorithm.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/AbortableLRUAlgorithm.java	2008-03-17 20:08:59 UTC (rev 70922)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/AbortableLRUAlgorithm.java	2008-03-17 20:10:05 UTC (rev 70923)
@@ -51,6 +51,7 @@
     * @param fqn node corresponds to this fqn
     * @return True if successful
     */
+   @SuppressWarnings("unchecked")
    protected boolean evictCacheNode(Fqn fqn)
    {
       if (log.isTraceEnabled())

Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/ClusteredCacheListener.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/ClusteredCacheListener.java	2008-03-17 20:08:59 UTC (rev 70922)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/ClusteredCacheListener.java	2008-03-17 20:10:05 UTC (rev 70923)
@@ -58,7 +58,7 @@
       void nodePassivated(OwnedItem ownedItem, NodePassivatedEvent event);
    }
    
-   private final Map<Fqn, RegionHandler> handlers = new ConcurrentHashMap<Fqn, RegionHandler>();
+   private final Map<Fqn<Object>, RegionHandler> handlers = new ConcurrentHashMap<Fqn<Object>, RegionHandler>();
    private final boolean checkBuddy;
    
    public ClusteredCacheListener(boolean checkBuddy)
@@ -66,12 +66,12 @@
       this.checkBuddy= checkBuddy;
    }
    
-   public void addRegionHandler(Fqn region, RegionHandler handler)
+   public void addRegionHandler(Fqn<Object> region, RegionHandler handler)
    {
       handlers.put(region, handler);
    }
    
-   public boolean removeRegionHandler(Fqn region)
+   public boolean removeRegionHandler(Fqn<Object> region)
    {
       handlers.remove(region);
       return handlers.size() > 0;

Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java	2008-03-17 20:08:59 UTC (rev 70922)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java	2008-03-17 20:10:05 UTC (rev 70923)
@@ -42,7 +42,7 @@
    
    private final String owner;
    private final Object id;
-   private final Fqn region;
+   private final Fqn<Object> region;
    
    /**
     * Generates an OwnedItem from the given Fqn if the Fqn is a logical
@@ -86,7 +86,7 @@
       return (key == null ? null : new OwnedItem(owner, key, region));
    }
    
-   public OwnedItem(String owner, Object id, Fqn region)
+   public OwnedItem(String owner, Object id, Fqn<Object> region)
    {
       assert id != null : "id is null";
       assert region != null : "region is null";
@@ -120,22 +120,22 @@
    /**
     * Gets the base Fqn for the region where the item is cached.
     */
-   public Fqn getRegion()
+   public Fqn<Object> getRegion()
    {
       return region;
    }
    
-   public Fqn getFullFqn()
+   public Fqn<Object> getFullFqn()
    {
       if (owner != null)
       {
-         Fqn ownerFqn = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, owner);
-         Fqn base = new Fqn(ownerFqn, region);
-         return new Fqn(base, id);
+         Fqn<Object> ownerFqn = new Fqn<Object>(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, owner);
+         Fqn<Object> base = new Fqn<Object>(ownerFqn, region);
+         return new Fqn<Object>(base, id);
       }
       else
       {
-         return new Fqn(region, id);
+         return new Fqn<Object>(region, id);
       }
    }