[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py impl/Simpl...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/27 04:02:32

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/impl: SimpleVStreamTexter.java 
        org/fenfire/index/impl: SpaceXuIndexer.java 
        org/fenfire/util: ShortRDF.java 
        org/fenfire/view: CoordinatePlaneView.java 
        org/fenfire/vocab: ALPH.java 

Log message:
        asdf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleVStreamTexter.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CoordinatePlaneView.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/ALPH.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.1 
fenfire/org/fenfire/demo/buoyoing.py:1.2
--- fenfire/org/fenfire/demo/buoyoing.py:1.1    Thu Mar 27 02:53:07 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu Mar 27 04:02:32 2003
@@ -129,6 +129,7 @@
        )
     xuindexer = fenfire.index.IndexManager.getXuIndexer(xuspace)
 
+
     pagescrolls = (
     PageImageScroll(None, storm.Mediaserver.Id(
     # "Focus+context views of World-Wide Web nodes"
@@ -158,11 +159,14 @@
 
     pagespans = [scroll.getCurrent() for scroll in pagescrolls]
 
+    print 'FOOOOOOOO'
+
     if 1:
        xuindexer.add(XuLink(
            
pagespanNodes.makeEnf(pagespans[0].subSpan(0,1).subArea(300,350,30,200)),
            
pagespanNodes.makeEnf(pagespans[1].subSpan(0,1).subArea(220,250,370,240))
            ))
+        print 'FOOOOOOOO'
 
        xuindexer.add(XuLink(
            
pagespanNodes.makeEnf(pagespans[1].subSpan(1,2).subArea(0,300,350,300)),
Index: fenfire/org/fenfire/impl/SimpleVStreamTexter.java
diff -u fenfire/org/fenfire/impl/SimpleVStreamTexter.java:1.2 
fenfire/org/fenfire/impl/SimpleVStreamTexter.java:1.3
--- fenfire/org/fenfire/impl/SimpleVStreamTexter.java:1.2       Thu Mar 27 
02:53:07 2003
+++ fenfire/org/fenfire/impl/SimpleVStreamTexter.java   Thu Mar 27 04:02:32 2003
@@ -99,7 +99,7 @@
 
     public final Enfilade1D getEnfilade(RDFNode node, Obs o) {
        RDFNode n = ShortRDF.getDataNode(space.getModel(), node);
-       if(o != null) space.getObsTrigger().addObs(o, this, n);
+       // XXX if(o != null) space.getObsTrigger().addObs(o, this, n);
        Enfilade1D enf = getFromMap(n);
         if(enf == null) return enfMaker.makeEnfilade();
         else return enf;
@@ -108,7 +108,7 @@
     public final void setEnfilade(RDFNode node, Enfilade1D vstream) {
        RDFNode n = ShortRDF.getDataNode(space.getModel(), node);
        setMap(n, vstream);
-       space.getObsTrigger().chg(this, n);
+       // XXX space.getObsTrigger().chg(this, n);
     }
 
     /*
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.2 
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.3
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.2      Wed Mar 26 
21:26:40 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java  Thu Mar 27 04:02:32 2003
@@ -14,7 +14,7 @@
 /** An index of xanadu links stored in a space.
  */
 public class SpaceXuIndexer implements XuIndexer {
-public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.2 2003/03/27 
02:26:40 mudyc Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.3 2003/03/27 
09:02:32 mudyc 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); }
@@ -97,8 +97,8 @@
     public void add(XuLink l) {
        Model mod = space.getModel();
        RDFNode id = ShortRDF.newNode(mod, ALPH.xuType);
-       RDFNode from = ShortRDF.newNode(mod, id, ALPH.xuLinkFrom);
-       RDFNode to = ShortRDF.newNode(mod, id, ALPH.xuLinkTo);
+       RDFNode from = ShortRDF.newNode(mod, id, ALPH.xuLinkFrom, 
ALPH.xuLinkType);
+       RDFNode to = ShortRDF.newNode(mod, id, ALPH.xuLinkTo, ALPH.xuLinkType);
 
        texter.setEnfilade(from, l.from);
        texter.setEnfilade(to, l.to);
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.8 
fenfire/org/fenfire/util/ShortRDF.java:1.9
--- fenfire/org/fenfire/util/ShortRDF.java:1.8  Thu Mar 27 03:51:57 2003
+++ fenfire/org/fenfire/util/ShortRDF.java      Thu Mar 27 04:02:32 2003
@@ -8,7 +8,7 @@
 
 
 public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.8 2003/03/27 
08:51:57 mudyc Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.9 2003/03/27 
09:02:32 mudyc Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
     public static Resource getRes(Model model, RDFNode node, Property 
predicate) 
@@ -84,6 +84,7 @@
        if (object == null) {
            return model.createResource(uri);
        } else {
+           pa("JOU!"+object);
            Resource res = model.createResource(uri);
            res.addProperty(RDF.type, (Resource)object);
            return res;
@@ -107,6 +108,24 @@
        pa("Exception ocurred!: "+e);
        throw new Error("ShortRDF has RDFException!");
     }}
+
+    /** old -pred-> new
+     */
+    static public RDFNode newNode(Model model, RDFNode node, Property 
property, RDFNode type) 
+    { try {
+       String uri = URN5Namespace.instance.generateId();
+        Resource res = model.createResource(uri);
+
+       ((Resource)node).addProperty(property, res);
+       res.addProperty(RDF.type, (Resource)type);
+       return res;
+
+    } catch (RDFException e) {
+       pa("Exception ocurred!: "+e);
+       throw new Error("ShortRDF has RDFException!");
+    }}
+
+
 
     /** New -pred-> old
      */
Index: fenfire/org/fenfire/view/CoordinatePlaneView.java
diff -u fenfire/org/fenfire/view/CoordinatePlaneView.java:1.3 
fenfire/org/fenfire/view/CoordinatePlaneView.java:1.4
--- fenfire/org/fenfire/view/CoordinatePlaneView.java:1.3       Wed Mar 26 
09:00:25 2003
+++ fenfire/org/fenfire/view/CoordinatePlaneView.java   Thu Mar 27 04:02:32 2003
@@ -2,6 +2,8 @@
 
 package org.fenfire.view;
 import org.fenfire.modules.pp.*;
+import org.fenfire.*;
+import org.fenfire.view.*;
 import org.fenfire.view.buoy.*;
 import org.fenfire.vocab.*;
 import org.fenfire.util.*;
@@ -13,6 +15,7 @@
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
 
+
 /** A view which shows a single rank of cells, at coordinates given
  * in the structure. 
  * For use in PP, but generalizable; possibly a step into floatingworld ideas.
@@ -22,7 +25,7 @@
  */
 
 public class CoordinatePlaneView {
-public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.3 
2003/03/26 14:00:25 mudyc Exp $";
+public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.4 
2003/03/27 09:02:32 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("CoordinatePlaneView"+s); }
 
@@ -53,34 +56,48 @@
     /** Render with culling.
      * @param cullCS is the clip cs or under zero if not used.
      */
-    public void render(VobScene vs, int into, 
-                      RDFNode node, int cullCS, 
-                      Model model, NodePlacementHook hook) 
-    { try {
+    //    public void render(VobScene vs, int into, 
+    //                AbstractViewContext context, int cullCS, 
+    //                Space space, NodePlacementHook hook) 
+    //{
+       /*
+         try {
        float[] bs = new float[2];
        cursorBox = -1;
 
-       /*
-       // something like
-       CellView orig_cv = context.getCellView();
-
-       NodeView nv = Util.getNodeView(node);
-       */
+       RDFNode node = context.getAccurse();
+       
 
-       /*
-         boolean ok = false;
+       NodeView orig_nv = context.getNodeView();
 
-         // check rdf type 
-         Selector slctr = new SelectorImpl(node, RDF.type, (RDFNode) null);
-         StmtIterator iter = model.listStatements(slctr);
-         Statement stmt = null;
-         while (iter.hasNext()) {
-         stmt = iter.next();
-         if (stmt.getObject() == PP.PaperType) ok = true;
-         }
+       Selector slctr = new SelectorImpl(node, PP.contains, (RDFNode) null);
+       StmtIterator iter = model.listStatements(slctr);
+       Statement stmt = null;
+       while (iter.hasNext()) {
+           RDFNode node = ((Statement)iter.next()).getSubject();
+             
+           SimpleVStreamTexter sct = 
(SimpleVStreamTexter)space.getCellTexter();
+           Enfilade1DImpl enf = (Enfilade1DImpl)sct.getEnfilade(node, null);
+           java.util.List enfList= enf.getList();
+           Span1D span = (Span1D) enfList.get(0);
+           
+           if (span instanceof TextSpan) {
+               if(hook != null)
+                   context.setCellView(new NodeViewPlugin(orig_cv, hook));
+               else
+                   context.setCellView(orig_cv);
+           }  // PageSpan!!! 
+           else {
+               if(hook != null)
+                   context.setCellView(
+                                       new CellViewPlugin(new 
PageSpanCellView(), hook));
+               else
+                   context.setCellView(new PageSpanCellView());
+               drawFrame = true;
+           }
+       }
 
-         if (!ok) throw new Error("Not a papertype on planeview!");
-       */
+       NodeView nv = context.getNodeView();
 
        Selector slctr = new SelectorImpl((Resource)node, PP.contains, 
(RDFNode) null);
        StmtIterator iter = model.listStatements(slctr);
@@ -102,7 +119,7 @@
            
            */
 
-
+       /*
            Pair matchKey = new Pair(node, note);
            
            int box;
@@ -124,13 +141,15 @@
            vs.activate(box);
 
            // XXX
-           /*
-             if(item.equals(cur))
-             cursorBox = box;
-           */
+           //  if(item.equals(cur))
+           //  cursorBox = box;
+
        }
     } catch (RDFException e) {
        pa("Exception ocurred!: "+e);
        throw new Error("PPLinker error: Failed to doLink!!");
-    }}
+    }
+       */
+    //}
+
 }
Index: fenfire/org/fenfire/vocab/ALPH.java
diff -u fenfire/org/fenfire/vocab/ALPH.java:1.3 
fenfire/org/fenfire/vocab/ALPH.java:1.4
--- fenfire/org/fenfire/vocab/ALPH.java:1.3     Wed Mar 26 21:26:40 2003
+++ fenfire/org/fenfire/vocab/ALPH.java Thu Mar 27 04:02:32 2003
@@ -5,7 +5,7 @@
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
 public class ALPH {
-public static final String rcsid = "$Id: ALPH.java,v 1.3 2003/03/27 02:26:40 
mudyc Exp $";
+public static final String rcsid = "$Id: ALPH.java,v 1.4 2003/03/27 09:02:32 
mudyc Exp $";
     protected static void pa(String s) { System.out.println("ALPH: "+s); }
     
     static public Property content;
@@ -14,6 +14,7 @@
     static public Property xuLinkTo;
 
     static public Resource xuType;
+    static public Resource xuLinkType;
     static public Resource cloneType;
     static public Resource dataType;
     
@@ -25,6 +26,7 @@
            xuLinkTo = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#xuLinkTo";);
 
            xuType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#xuType";);
+           xuLinkType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#xuLinkType";);
            cloneType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#cloneType";);
            dataType = new 
ResourceImpl("http://fenfire.org/vocabulary/alph.html#dataType";);