[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Manik Surtani]

  User: msurtani
  Date: 07/06/11 17:17:20

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  JBCACHE-1101
  
  Revision  Changes    Path
  1.88      +66 -66    JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -b -r1.87 -r1.88
  --- CacheImpl.java	11 Jun 2007 15:06:02 -0000	1.87
  +++ CacheImpl.java	11 Jun 2007 21:17:20 -0000	1.88
  @@ -1600,7 +1600,7 @@
       *
       * @param fqn The fully qualified name of the node.
       */
  -   public boolean remove(Fqn<?> fqn) throws CacheException
  +   public boolean remove(Fqn fqn) throws CacheException
      {
         GlobalTransaction tx = getCurrentTransaction();
         // special case if we are removing the root.  Remove all children instead.
  @@ -1636,7 +1636,7 @@
       * @param fqn Will remove everythign assoicated with this fqn.
       * @throws CacheException
       */
  -   public void evict(Fqn<?> fqn) throws CacheException
  +   public void evict(Fqn fqn) throws CacheException
      {
         if (fqn.isRoot())
         {
  @@ -1694,7 +1694,7 @@
      /**
       * Removes the keys and properties from a named node.
       */
  -   public void removeData(Fqn<?> fqn) throws CacheException
  +   public void removeData(Fqn fqn) throws CacheException
      {
         GlobalTransaction tx = getCurrentTransaction();
         MethodCall m = MethodCallFactory.create(MethodDeclarations.removeDataMethodLocal, tx, fqn, true);
  @@ -1738,7 +1738,7 @@
      /**
       * Releases all locks for this node and the entire node subtree.
       */
  -   public void releaseAllLocks(Fqn<?> fqn)
  +   public void releaseAllLocks(Fqn fqn)
      {
         MethodCall m = MethodCallFactory.create(MethodDeclarations.releaseAllLocksMethodLocal, fqn);
         try
  @@ -1764,7 +1764,7 @@
       * Prints a representation of the node defined by <code>fqn</code>.
       * Output includes name, fqn and data.
       */
  -   public String print(Fqn<?> fqn)
  +   public String print(Fqn fqn)
      {
         MethodCall m = MethodCallFactory.create(MethodDeclarations.printMethodLocal, fqn);
         Object retval = null;
  @@ -1832,7 +1832,7 @@
      /**
       * Returns true if the FQN exists and the node has children.
       */
  -   public boolean hasChild(Fqn<?> fqn)
  +   public boolean hasChild(Fqn fqn)
      {
         if (fqn == null) return false;
   
  @@ -1975,7 +1975,7 @@
       *
       * @see #getNumberOfAttributes
       */
  -   public int getNumberOfAttributes(Fqn<?> fqn)
  +   public int getNumberOfAttributes(Fqn fqn)
      {
         return numAttributes(findNode(fqn));
      }
  @@ -2672,7 +2672,7 @@
       *         to the presence of children
       * @throws CacheException
       */
  -   public boolean _evict(Fqn<?> fqn) throws CacheException
  +   public boolean _evict(Fqn fqn) throws CacheException
      {
         if (!exists(fqn))
            return true;// node does not exist. Maybe it has been recursively removed.
  @@ -2706,7 +2706,7 @@
       *         to the presence of children
       * @throws CacheException
       */
  -   public boolean _evict(Fqn<?> fqn, DataVersion version) throws CacheException
  +   public boolean _evict(Fqn fqn, DataVersion version) throws CacheException
      {
         if (!exists(fqn))
            return true;// node does not exist
  @@ -2874,7 +2874,7 @@
       * @param searchSubtrees if true, buddy backup subtrees are searched and if false, they are not.
       * @return a GravitateResult which contains the data for the gravitation
       */
  -   public GravitateResult gravitateData(Fqn<?> fqn, boolean searchSubtrees)
  +   public GravitateResult gravitateData(Fqn fqn, boolean searchSubtrees)
              throws CacheException
      {
         // we need to get the state for this Fqn and its sub-nodes.
  @@ -3023,7 +3023,7 @@
      /**
       * Releases all locks for a FQN.
       */
  -   public void _releaseAllLocks(Fqn<?> fqn)
  +   public void _releaseAllLocks(Fqn fqn)
      {
         NodeSPI<K, V> n;
   
  @@ -3057,7 +3057,7 @@
       * Finds and returns the string value for the Fqn.
       * Returns null if not found or upon error.
       */
  -   public String _print(Fqn<?> fqn)
  +   public String _print(Fqn fqn)
      {
         try
         {
  @@ -3074,7 +3074,7 @@
      /**
       * Should not be called.
       */
  -   public void _lock(Fqn<?> fqn, NodeLock.LockType lock_type, boolean recursive)
  +   public void _lock(Fqn fqn, NodeLock.LockType lock_type, boolean recursive)
              throws TimeoutException, LockingException
      {
         throw new UnsupportedOperationException("method _lock() should not be invoked on CacheImpl");
  @@ -3186,7 +3186,7 @@
       * @param newParentFqn
       * @param nodeToMoveFqn
       */
  -   public void _move(Fqn<?> nodeToMoveFqn, Fqn newParentFqn)
  +   public void _move(Fqn nodeToMoveFqn, Fqn newParentFqn)
      {
         // the actual move algorithm.
         NodeSPI<K, V> newParent = findNode(newParentFqn);
  @@ -3894,7 +3894,7 @@
       * @param fqn Fully qualified name for the corresponding node.
       * @return DataNode
       */
  -   public NodeSPI<K, V> findNode(Fqn<?> fqn)
  +   public NodeSPI<K, V> findNode(Fqn fqn)
      {
         try
         {
  @@ -3928,7 +3928,7 @@
       *
       * @param f
       */
  -   public boolean realRemove(Fqn<?> f, boolean skipMarkerCheck)
  +   public boolean realRemove(Fqn f, boolean skipMarkerCheck)
      {
         NodeSPI n = peek(f, true);
         if (n == null)
  @@ -3962,7 +3962,7 @@
      /**
       * Finds a node given a fully qualified name and DataVersion.
       */
  -   private NodeSPI<K, V> findNode(Fqn<?> fqn, DataVersion version) throws CacheException
  +   private NodeSPI<K, V> findNode(Fqn fqn, DataVersion version) throws CacheException
      {
         if (fqn == null) return null;