[cweb-CVS] bigdata-rdf/src/java/com/bigdata/rdf TripleStore.java, 1.21, 1.22

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6099/src/java/com/bigdata/rdf

Modified Files:
	TripleStore.java 
Log Message:
Continued minor refactoring in line with model updates.

Index: TripleStore.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/TripleStore.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TripleStore.java	6 Mar 2007 20:38:13 -0000	1.21
--- TripleStore.java	11 Mar 2007 11:43:32 -0000	1.22
***************
*** 89,93 ****
  import com.bigdata.rdf.serializers.StatementSerializer;
  import com.bigdata.rdf.serializers.TermIdSerializer;
! import com.bigdata.scaleup.PartitionedIndex;
  import com.bigdata.scaleup.SlaveJournal;
  import com.ibm.icu.text.Collator;
--- 89,93 ----
  import com.bigdata.rdf.serializers.StatementSerializer;
  import com.bigdata.rdf.serializers.TermIdSerializer;
! import com.bigdata.scaleup.PartitionedIndexView;
  import com.bigdata.scaleup.SlaveJournal;
  import com.ibm.icu.text.Collator;
***************
*** 140,144 ****
   * @todo Refactor to use a delegation mechanism so that we can run with or
   *       without partitioned indices? (All you have to do now is change the
!  *       class that is being extended from Journal to PartitionedJournal and
   *       handle some different initialization properties.)
   * 
--- 140,144 ----
   * @todo Refactor to use a delegation mechanism so that we can run with or
   *       without partitioned indices? (All you have to do now is change the
!  *       class that is being extended from Journal to MasterJournal and
   *       handle some different initialization properties.)
   * 
***************
*** 397,402 ****
       * 
       * FIXME setupCommitters and discardCommitters are not invoked when we are
!      * using a {@link PartitionedIndex}.  I need to refactor the apis so that
!      * these methods do not appear on {@link PartitionedIndex} or that they are
       * correctly invoked by the {@link SlaveJournal}.  I expect that they are
       * not required on {@link IJournal} but only on {@link Journal}.
--- 397,402 ----
       * 
       * FIXME setupCommitters and discardCommitters are not invoked when we are
!      * using a {@link PartitionedIndexView}.  I need to refactor the apis so that
!      * these methods do not appear on {@link PartitionedIndexView} or that they are
       * correctly invoked by the {@link SlaveJournal}.  I expect that they are
       * not required on {@link IJournal} but only on {@link Journal}.
***************
*** 410,414 ****
          /*
           * This is here as a work around so that this counter gets initialized
!          * whether or not we are extending Journal vs PartitionedJournal.
           */
          getCounter();
--- 410,414 ----
          /*
           * This is here as a work around so that this counter gets initialized
!          * whether or not we are extending Journal vs MasterJournal.
           */
          getCounter();