[Gzz-commits] fenfire/org/fenfire/view ContentHandler.java De...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/23 17:07:30

Modified files:
        org/fenfire/view: ContentHandler.java DefaultNodeView.java 
                          NodePlacementHook.java PageHandler.java 
                          SimplePage.java 
        org/fenfire/view/buoy: NodeBuoyViewNodeType.java 
                               ScrollBlockNodeLinker.java 
Removed files:
        org/fenfire/view: NodeContentView.java 
                          NodeContentViewHandler.java ViewContext.java 

Log message:
        remove jena and crud

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/ContentHandler.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/DefaultNodeView.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodePlacementHook.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageHandler.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SimplePage.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeBuoyViewNodeType.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/ContentHandler.java
diff -u fenfire/org/fenfire/view/ContentHandler.java:1.1 
fenfire/org/fenfire/view/ContentHandler.java:1.2
--- fenfire/org/fenfire/view/ContentHandler.java:1.1    Tue Apr  8 10:56:52 2003
+++ fenfire/org/fenfire/view/ContentHandler.java        Wed Apr 23 17:07:30 2003
@@ -6,8 +6,6 @@
 
 import org.nongnu.alph.*;
 
-import com.hp.hpl.mesa.rdf.jena.model.*;
-
 public interface ContentHandler {
     void place(VobScene vs, int box, Enfilade1D enf);
     void getSize(Enfilade1D enf, float[] size); 
Index: fenfire/org/fenfire/view/DefaultNodeView.java
diff -u fenfire/org/fenfire/view/DefaultNodeView.java:1.7 
fenfire/org/fenfire/view/DefaultNodeView.java:1.8
--- fenfire/org/fenfire/view/DefaultNodeView.java:1.7   Wed Apr 23 16:58:08 2003
+++ fenfire/org/fenfire/view/DefaultNodeView.java       Wed Apr 23 17:07:30 2003
@@ -3,7 +3,6 @@
 package org.fenfire.view;
 import org.fenfire.*;
 import org.nongnu.libvob.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 import org.nongnu.alph.*;
 import org.nongnu.alph.impl.*;
@@ -11,7 +10,7 @@
 import java.awt.*;
 
 public class DefaultNodeView extends NodeView {
-private static final String rcsid = "$Id: DefaultNodeView.java,v 1.7 
2003/04/23 20:58:08 mudyc Exp $";  
+private static final String rcsid = "$Id: DefaultNodeView.java,v 1.8 
2003/04/23 21:07:30 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("DefaultNodeView::"+s); }
     
@@ -33,8 +32,12 @@
     public void getSize(Object node, float[] size, float scale) {
        if (size == null) return;
 
-       // XXX
-       text.getSize(fen.txt.get(node), size);
+       Enfilade1D enf = fen.txt.get(node);
+       List l = enf.getList();
+       if (l.get(0) instanceof TextSpan)
+           text.getSize(fen.txt.get(node), size);
+       else // PageSpan
+           page.getSize(fen.txt.get(node), size);
 
        size[0] *= scale;
        size[1] *= scale;
Index: fenfire/org/fenfire/view/NodePlacementHook.java
diff -u fenfire/org/fenfire/view/NodePlacementHook.java:1.3 
fenfire/org/fenfire/view/NodePlacementHook.java:1.4
--- fenfire/org/fenfire/view/NodePlacementHook.java:1.3 Tue Apr 15 10:15:12 2003
+++ fenfire/org/fenfire/view/NodePlacementHook.java     Wed Apr 23 17:07:30 2003
@@ -2,14 +2,12 @@
 
 package org.fenfire.view;
 import org.nongnu.libvob.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 /** An interface for code to be run when a cell has been placed in a box.
  */
 public interface NodePlacementHook {
-String rcsid = "$Id: NodePlacementHook.java,v 1.3 2003/04/15 14:15:12 mudyc 
Exp $";
+String rcsid = "$Id: NodePlacementHook.java,v 1.4 2003/04/23 21:07:30 mudyc 
Exp $";
     /** A node was placed.
      */
-    // XXX void placed(RDFNode node, VobScene sc, int b, ViewContext context);
     void placed(Object node, VobScene vs, int b);
 }
Index: fenfire/org/fenfire/view/PageHandler.java
diff -u fenfire/org/fenfire/view/PageHandler.java:1.3 
fenfire/org/fenfire/view/PageHandler.java:1.4
--- fenfire/org/fenfire/view/PageHandler.java:1.3       Wed Apr 23 16:58:08 2003
+++ fenfire/org/fenfire/view/PageHandler.java   Wed Apr 23 17:07:30 2003
@@ -8,7 +8,6 @@
 
 import org.nongnu.alph.*;
 import java.awt.Color;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 public abstract class PageHandler implements ContentHandler, PageContext { // 
, PageState 
 
Index: fenfire/org/fenfire/view/SimplePage.java
diff -u fenfire/org/fenfire/view/SimplePage.java:1.1 
fenfire/org/fenfire/view/SimplePage.java:1.2
--- fenfire/org/fenfire/view/SimplePage.java:1.1        Wed Apr 23 16:58:08 2003
+++ fenfire/org/fenfire/view/SimplePage.java    Wed Apr 23 17:07:30 2003
@@ -8,7 +8,6 @@
 
 import org.nongnu.alph.*;
 import java.awt.Color;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 /** Caching page hanler, simple.
  */
Index: fenfire/org/fenfire/view/buoy/NodeBuoyViewNodeType.java
diff -u fenfire/org/fenfire/view/buoy/NodeBuoyViewNodeType.java:1.2 
fenfire/org/fenfire/view/buoy/NodeBuoyViewNodeType.java:1.3
--- fenfire/org/fenfire/view/buoy/NodeBuoyViewNodeType.java:1.2 Tue Apr 15 
10:15:12 2003
+++ fenfire/org/fenfire/view/buoy/NodeBuoyViewNodeType.java     Wed Apr 23 
17:07:30 2003
@@ -4,7 +4,6 @@
 import org.fenfire.view.*;
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.buoy.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 public interface NodeBuoyViewNodeType {
     /** True if this view "owns" a certain node.
Index: fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java
diff -u fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java:1.2 
fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java:1.3
--- fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java:1.2        Tue Apr 
15 10:59:08 2003
+++ fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java    Wed Apr 23 
17:07:30 2003
@@ -39,7 +39,6 @@
 import org.nongnu.alph.*;
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.buoy.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 /** Make links between cells that transclude from scrollblocks and
  * views of the scrollblocks.