[Gzz-commits] fenfire/org/fenfire index/impl/SpaceXuIndexer.j...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/15 10:59:08

Modified files:
        org/fenfire/index/impl: SpaceXuIndexer.java 
        org/fenfire/view/buoy: ScrollBlockNodeLinker.java 
Removed files:
        org/fenfire    : VStreamNodeTexter.java 
        org/fenfire/impl: SimpleVStreamTexter.java 
        org/fenfire/index: IndexedVStreamNodeTexter.java 

Log message:
        Start fixing to new system

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.4 
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.5
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.4      Mon Mar 31 
09:29:15 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java  Tue Apr 15 10:59:08 2003
@@ -14,13 +14,11 @@
 /** An index of xanadu links stored in a space.
  */
 public class SpaceXuIndexer implements XuIndexer {
-public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.4 2003/03/31 
14:29:15 mudyc Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.5 2003/04/15 
14:59:08 tjl Exp $";
     public static final boolean dbg = true;
-    protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println(s); }
 
-    protected Space space;
-    protected VStreamNodeTexter texter;
+    protected Fen fen;
 
     protected MyIndex forwardIndex = new MyIndex(1),
                       backwardIndex = new MyIndex(2);
@@ -28,9 +26,8 @@
     protected Map linksByNode = new HashMap(),
                   nodesByLink = new HashMap();
 
-    public SpaceXuIndexer(Space space) {
-        this.space = space;
-       this.texter = (VStreamNodeTexter)space.getNodeTexter();
+    public SpaceXuIndexer(Fen fen) {
+        this.fen = fen;
     }
 
     protected class MyIndex implements Index {
@@ -43,7 +40,7 @@
         public Collection getMatches(Object o) {
             Collection res = new ArrayList();
            Collection all =
-               IndexManager.getEnfiladeOverlap(space).getMatches(o);
+               fen.enfiladeOverlap.getMatches(o);
 
            /*
             for(Iterator i=all.iterator(); i.hasNext();) {
Index: fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java
diff -u fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java:1.1 
fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java:1.2
--- fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java:1.1        Thu Mar 
27 02:53:07 2003
+++ fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java    Tue Apr 15 
10:59:08 2003
@@ -53,12 +53,10 @@
 
     public org.fenfire.index.XuIndexer xuIndex;
 
-    public VStreamNodeTexter nodeTexter;
+    Fen fen;
 
-    public ScrollBlockNodeLinker(Space space) {
-       enfiladeOverlap = 
-           org.fenfire.index.IndexManager.getEnfiladeOverlap(space);
-       nodeTexter = (VStreamNodeTexter)space.getNodeTexter();
+    public ScrollBlockNodeLinker(Fen fen) {
+       this.fen = fen;
     }
 
     public BuoyViewNodeType transclusionPageSpanNodeType;
@@ -70,7 +68,7 @@
 
     public BuoyViewNodeType cellNodeType;
 
-    public void doLinks(RDFNode c, VobScene vs, int cs, 
+    public void doLinks(Object node, VobScene vs, int cs, 
                            BuoyViewNodeType cellNodeType, 
                            BuoyLinkListener listener) {
 
@@ -82,8 +80,7 @@
        // Find all transclusion and put buoys of scrollblocks
        // of pagespans
        //
-       Enfilade1D enf = 
-                       nodeTexter.getEnfilade(c, null);
+       Enfilade1D enf = fen.txt.get(node, null);
        for(Iterator i = org.nongnu.alph.util.EnfUtil.
                            getScrollBlockRepresentatives(enf).iterator(); 
                        i.hasNext(); ) {
@@ -93,11 +90,10 @@
                sb.getCurrent();
 
                listener.link(1, cs, transclusionPageSpanNodeType, 
-                               new org.fenfire.util.Pair(c, sb), s);
+                               new org.fenfire.util.Pair(node, sb), s);
            }
        }
     }
-
 
     // XXX Reverse links! Scrollblock to 
 }