cvs commit: xml-xindice/java/src/org/apache/xindice/core/filer BTree.java BTreeFiler.java HashFiler.java Paged.java

[vgritsenko]

vgritsenko    2003/08/08 15:40:45

  Modified:    java/src/org/apache/xindice/core/filer BTree.java
                        BTreeFiler.java HashFiler.java Paged.java
  Log:
  Paged to extend DBObject (it already implements all of its methods).
  
  Revision  Changes    Path
  1.15      +4 -3      
xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java
  
  Index: BTree.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BTree.java        7 Aug 2003 20:13:21 -0000       1.14
  +++ BTree.java        8 Aug 2003 22:40:45 -0000       1.15
  @@ -135,8 +135,9 @@
               rootInfo = new BTreeRootInfo(p);
               rootNode = getBTreeNode(rootInfo, p, null);
               return true;
  -        } else
  +        } else {
               return false;
  +        }
       }
   
       public boolean create() throws DBException {
  
  
  
  1.13      +4 -3      
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java
  
  Index: BTreeFiler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BTreeFiler.java   7 Aug 2003 20:13:21 -0000       1.12
  +++ BTreeFiler.java   8 Aug 2003 22:40:45 -0000       1.13
  @@ -124,8 +124,9 @@
               // These are the only properties that can be changed after 
creation
               fileHeader.setMaxKeySize(config.getShortAttribute(MAXKEYSIZE, 
fileHeader.getMaxKeySize()));
               return true;
  -        } else
  +        } else {
               return false;
  +        }
       }
   
       public boolean create() throws DBException {
  
  
  
  1.15      +4 -3      
xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java
  
  Index: HashFiler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HashFiler.java    7 Aug 2003 20:13:21 -0000       1.14
  +++ HashFiler.java    8 Aug 2003 22:40:45 -0000       1.15
  @@ -133,8 +133,9 @@
               fileHeader.setMaxKeySize(config.getShortAttribute(MAXKEYSIZE, 
fileHeader.getMaxKeySize()));
               // btree.open();
               return true;
  -        } else
  +        } else {
               return false;
  +        }
       }
   
       public boolean create() throws DBException {
  
  
  
  1.16      +17 -10    
xml-xindice/java/src/org/apache/xindice/core/filer/Paged.java
  
  Index: Paged.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/Paged.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Paged.java        7 Aug 2003 20:13:21 -0000       1.15
  +++ Paged.java        8 Aug 2003 22:40:45 -0000       1.16
  @@ -61,6 +61,7 @@
   
   import org.apache.xindice.core.DBException;
   import org.apache.xindice.core.FaultCodes;
  +import org.apache.xindice.core.DBObject;
   import org.apache.xindice.core.data.Key;
   import org.apache.xindice.core.data.Value;
   
  @@ -86,7 +87,7 @@
    *
    * @version CVS $Revision$, $Date$
    */
  -public abstract class Paged {
  +public abstract class Paged implements DBObject {
   
       // The maximum number of pages that will be held in the dirty cache.
       private static final int MAX_DIRTY_SIZE = 128;
  @@ -439,8 +440,10 @@
       }
   
       protected final void checkOpened() throws DBException {
  -        if (!opened)
  -            throw new FilerException(FaultCodes.COL_COLLECTION_CLOSED, 
"Filer is closed");
  +        if (!opened) {
  +            throw new FilerException(FaultCodes.COL_COLLECTION_CLOSED,
  +                                     "Filer is closed");
  +        }
       }
   
       /**
  @@ -479,11 +482,13 @@
                   raf = getDescriptor();
                   fileHeader.read();
                   opened = true;
  -            } else
  +            } else {
                   opened = false;
  +            }
               return opened;
           } catch (Exception e) {
  -            throw new FilerException(FaultCodes.GEN_CRITICAL_ERROR, "Error 
opening " + file.getName(), e);
  +            throw new FilerException(FaultCodes.GEN_CRITICAL_ERROR,
  +                                     "Error opening " + file.getName(), e);
           } finally {
               putDescriptor(raf);
           }
  @@ -518,12 +523,14 @@
       public boolean drop() throws DBException {
           try {
               close();
  -            if (exists())
  +            if (exists()) {
                   return getFile().delete();
  -            else
  +            } else {
                   return true;
  +            }
           } catch (Exception e) {
  -            throw new FilerException(FaultCodes.COL_CANNOT_DROP, "Can't drop 
" + file.getName(), e);
  +            throw new FilerException(FaultCodes.COL_CANNOT_DROP,
  +                                     "Can't drop " + file.getName(), e);
           }
       }