[Gzz-commits] fenfire/org/fenfire impl/AbstractSpace.java ind...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/31 09:29:15

Modified files:
        org/fenfire/impl: AbstractSpace.java 
        org/fenfire/index/impl: SpaceXuIndexer.java 
        org/fenfire/util: ShortRDF.java 
        org/fenfire/view: SpatialPlane.java 

Log message:
        fix compile bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/AbstractSpace.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/index/impl/SpaceXuIndexer.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/impl/AbstractSpace.java
diff -u fenfire/org/fenfire/impl/AbstractSpace.java:1.3 
fenfire/org/fenfire/impl/AbstractSpace.java:1.4
--- fenfire/org/fenfire/impl/AbstractSpace.java:1.3     Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/impl/AbstractSpace.java Mon Mar 31 09:29:15 2003
@@ -43,7 +43,7 @@
  */
 
 public abstract class AbstractSpace implements Space{
-public static final String rcsid = "$Id: AbstractSpace.java,v 1.3 2003/03/31 
12:37:47 mudyc Exp $";
+public static final String rcsid = "$Id: AbstractSpace.java,v 1.4 2003/03/31 
14:29:15 mudyc Exp $";
     private static void pa(String s) { 
System.out.println("AbstractSpace::"+s); }
 
     protected ModularNodeTexter nodeTexter;
@@ -66,7 +66,7 @@
 
        RDFNode n = node;
        if (ShortRDF.isNodeType(model, n, ALPH.cloneType))
-           n = ShortRDF.getRes(model, n, ALPH.clone);
+           n = ShortRDF.getObj(model, n, ALPH.clone);
        
        return ((VStreamNodeTexter)nodeTexter).getEnfilade(n, null);
     }
Index: fenfire/org/fenfire/index/impl/SpaceXuIndexer.java
diff -u fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.3 
fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.4
--- fenfire/org/fenfire/index/impl/SpaceXuIndexer.java:1.3      Thu Mar 27 
04:02:32 2003
+++ fenfire/org/fenfire/index/impl/SpaceXuIndexer.java  Mon Mar 31 09:29:15 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.3 2003/03/27 
09:02:32 mudyc Exp $";
+public static final String rcsid = "$Id: SpaceXuIndexer.java,v 1.4 2003/03/31 
14:29:15 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); }
@@ -74,10 +74,10 @@
        if (res == null) {
            if(ShortRDF.isNodeType(space.getModel(), node, ALPH.xuType)) {
                RDFNode from = 
-                   ShortRDF.getRes(space.getModel(), 
+                   ShortRDF.getObj(space.getModel(), 
                                    node, ALPH.xuLinkFrom);
                RDFNode to = 
-                   ShortRDF.getRes(space.getModel(), 
+                   ShortRDF.getObj(space.getModel(), 
                                    node, ALPH.xuLinkTo);
                res = new XuLink(texter.getEnfilade(from, null),
                                 texter.getEnfilade(to, null));
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.16 
fenfire/org/fenfire/util/ShortRDF.java:1.17
--- fenfire/org/fenfire/util/ShortRDF.java:1.16 Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/util/ShortRDF.java      Mon Mar 31 09:29:15 2003
@@ -8,10 +8,10 @@
 
 
 public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.16 2003/03/31 
12:37:47 mudyc Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.17 2003/03/31 
14:29:15 mudyc Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
-    public static Resource getRes(Model model, RDFNode node, Property 
predicate) 
+    public static Resource getObj(Model model, RDFNode node, Property 
predicate) 
     { try {
        Selector selector = new SelectorImpl((Resource)node, predicate, 
(RDFNode) null);
         StmtIterator iter = model.listStatements(selector);
@@ -178,7 +178,7 @@
        if (isNodeType(model,node,ALPH.cloneType))
            throw new Error("Wrong type!");
 
-       RDFNode data = getRes(model, (Resource)node, ALPH.clone);
+       RDFNode data = getObj(model, (Resource)node, ALPH.clone);
        if (!isNodeType(model, node, ALPH.dataType))
        throw new Error("Wrong type!");
        return data;
@@ -198,7 +198,7 @@
        if (!isNodeType(model, node, ALPH.cloneType))
            throw new Error("Wrong type!");
 
-       Resource res = getRes(model, node, ALPH.clone);
+       Resource res = getObj(model, node, ALPH.clone);
        res =  (Resource) newNodeToNode(model, (Resource)res, ALPH.clone);
        return res.addProperty(RDF.type, ALPH.cloneType);
     } catch (RDFException e) {
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.1 
fenfire/org/fenfire/view/SpatialPlane.java:1.2
--- fenfire/org/fenfire/view/SpatialPlane.java:1.1      Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Mon Mar 31 09:29:15 2003
@@ -26,7 +26,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.1 2003/03/31 
12:37:47 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.2 2003/03/31 
14:29:15 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
@@ -79,15 +79,6 @@
            java.util.List enfList = enf.getList();
            Span1D span = (Span1D) enfList.get(0);
 
-           if (span instanceof TextSpan) {
-               // nothing
-               pa("Text!, ooh..");
-           }  // PageSpan!!! 
-           else {
-               pa("pagespan!, ooh..");
-               drawFrame = true;
-           }
-
            int[] coords = new int[2];
 
            // get coords
@@ -102,6 +93,20 @@
            box = vs.orthoBoxCS(into, matchKey, 0, 
                                coords[0], coords[1],
                                1, 1, bs[0], bs[1]);
+
+
+           if (span instanceof TextSpan) {
+               String s = enf.toString();
+               
+
+               // nothing
+               pa("Text!, ooh..");
+           }  // PageSpan!!! 
+           else {
+               pa("pagespan!, ooh..");
+               drawFrame = true;
+           }
+
 
            //if (drawFrame)
            //  vs.map.put(frame, box);