[Gzz-commits] fenfire/org/fenfire util/AlphContent.java vocab...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/15 11:09:22

Modified files:
        org/fenfire/util: AlphContent.java 
        org/fenfire/vocab: ALPH.java 
Removed files:
        org/fenfire/impl: AbstractSpace.java ModularNodeTexter.java 
                          ModularSpace.java 

Log message:
        More work towards new system compiling

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/ALPH.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/AlphContent.java
diff -u fenfire/org/fenfire/util/AlphContent.java:1.4 
fenfire/org/fenfire/util/AlphContent.java:1.5
--- fenfire/org/fenfire/util/AlphContent.java:1.4       Wed Mar 26 18:48:15 2003
+++ fenfire/org/fenfire/util/AlphContent.java   Tue Apr 15 11:09:22 2003
@@ -1,180 +1,71 @@
-//(c): Matti J. Katila and Tuomas J. Lukka
+// (c) Matti J. Katila and Tuomas J. Lukka
 
 package org.fenfire.util;
 import org.fenfire.vocab.ALPH;
+import org.fenfire.*;
 import org.nongnu.alph.*;
 import org.nongnu.alph.xml.*;
-import com.hp.hpl.mesa.rdf.jena.vocabulary.RDF;
-import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.common.*;
 
 import java.util.*;
 import java.io.*;
-import javax.xml.parsers.*;
 
 
 /** Help class to work with Alph
  */
 public class AlphContent {
-public static final String rcsid = "$Id: AlphContent.java,v 1.4 2003/03/26 
23:48:15 mudyc Exp $";
+public static final String rcsid = "$Id: AlphContent.java,v 1.5 2003/04/15 
15:09:22 tjl Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
 
 
-    // Static helpers..
 
 
-    /** helper to determinate the type of span, i.e. PageSpan or TextSpan
-     * @return the first span in enfilade.
-     */
-    public Span getSpan(Model model, RDFNode node) 
-    { try {
-
-       NodeIterator iter = model.listObjectsOfProperty((Resource)node, 
ALPH.content);
-       if (iter.hasNext()) {
-           Literal lit = (Literal)iter.next();
-
-           try {
-               SpanReader sr = new SpanReader();
-               SAXParser parser = 
SAXParserFactory.newInstance().newSAXParser();
-               parser.parse(new StringBufferInputStream(lit.getString()), sr);
-
-               ArrayList l = (ArrayList)sr.getSpans();
-               return (Span)l.get(0);
-               
-           } catch (Exception e) {
-               pa("Exception!: "+e);
-               throw new Error("getspan has an Exception!");
-           } 
-       }
-       else throw new Error("No available content!");
-
-    } catch (RDFException e) {
-       pa("Exception ocurred!: "+e);
-       throw new Error("Alph has an RDFException!");
-    }} 
-
-
-    /** helper to present text contents on screen
-     * Content MUST be TextSpan so check it put first.
-     */
-    public String getString(Model model, RDFNode node) 
-    { try {
-
-       NodeIterator iter = model.listObjectsOfProperty((Resource)node, 
ALPH.content);
-       if (iter.hasNext()) {
-           Literal lit = (Literal)iter.next();
-
-           try {
-               SpanReader sr = new SpanReader();
-               SAXParser parser = 
SAXParserFactory.newInstance().newSAXParser();
-               parser.parse(new StringBufferInputStream(lit.getString()), sr);
-
-               String text="";
-               
-               ArrayList l = (ArrayList)sr.getSpans();
-               for (int i=0; i<l.size(); i++) {
-                   text += ((TextSpan)l.get(i)).getText();
-                   pa(i+" Xml: "+ text);
-               }
-               return text;
-               
-           } catch (Exception e) {
-               pa("Exception!: "+e);
-               throw new Error("getspan has an Exception!");
-           } 
-       }
-       else throw new Error("No available content!");
-
-    } catch (RDFException e) {
-       pa("Exception ocurred!: "+e);
-       throw new Error("Alph has an RDFException!");
-    }} 
 
 
-
-    // Old VStreamer or something...
-
     protected Map contents = new HashMap();
     private SpanMaker spanMaker;
     private Enfilade1D.Maker enfMaker;
     //private XuIndexer xuIndex;
-    private Model model;
+    private Fen fen;
 
-    public AlphContent(SpanMaker spanMaker, Enfilade1D.Maker enfMaker, Model 
model) {
+    public AlphContent(SpanMaker spanMaker, Enfilade1D.Maker enfMaker, 
+                   Fen fen) {
        this.spanMaker = spanMaker;
        this.enfMaker = enfMaker;
-       this.model = model;
-    }
-
-
-    /** The innermost routine that uses the actual map.
-     * For keeping change lists etc, override this and getFromMap.
-     */
-    protected void setMap(RDFNode node, Enfilade1D enf) {
-       contents.put(node, enf);
-    }
-
-    public final Enfilade1D getEnfilade(RDFNode node) {
-       Enfilade1D enf = (Enfilade1D)contents.get(node);
-        if(enf == null) return enfMaker.makeEnfilade();
-        else return enf;
-    }
-
-    private final void setEnfilade(RDFNode node, Enfilade1D vstream) {
-       setMap(node, vstream);
-
-       try {
-           SpanSerializer sr = new SpanSerializer();
-           
-           String xml = "";
-           ArrayList l = (ArrayList)vstream.getList();
-           for (int i=0; i<l.size(); i++) {
-               xml = sr.span2xml((Span)l.get(i));
-               xml += " "; 
-           }
-           pa("Xml: "+xml);
-           
-           Literal lit = new LiteralImpl(xml);
-           model.add(new StatementImpl((Resource)node, ALPH.content, 
(RDFNode)lit));
-       
-       } catch (RDFException e) {
-           pa("Exception ocurred!: "+e);
-           throw new Error("setTextContent got RDFException!");
-       }
+       this.fen = fen;
     }
 
-    public String getText(RDFNode node) {
-       Enfilade1D enf = getEnfilade(node);
+    public String getText(Object node) {
+       Enfilade1D enf = fen.txt.get(node);
        if(enf == null) return "";
        return enf.makeString();
     }
 
-    public void setText(RDFNode node, String s) {
-       setEnfilade(node, enfMaker.makeEnfilade(spanMaker.makeTextSpan(s)));
+    public void setText(Object node, String s) {
+       fen.txt.set(node, enfMaker.makeEnfilade(spanMaker.makeTextSpan(s)));
     }
 
-    public void insertText(RDFNode node, int ind, String s) {
-        Enfilade1D old = getEnfilade(node);
+    public void insertText(Object node, int ind, String s) {
+        Enfilade1D old = fen.txt.get(node);
 
         if(old != null) {
             Enfilade1D enf = old.sub(0, ind);
             enf = enf.plus(spanMaker.makeTextSpan(s));
             enf = enf.plus(old.sub(ind));
 
-            setEnfilade(node, enf);
+            fen.txt.set(node, enf);
         } else {
             setText(node, s);
         }
     }
 
-    public void deleteText(RDFNode node, int begin, int end) {
-        Enfilade1D old = getEnfilade(node);
+    public void deleteText(Object node, int begin, int end) {
+        Enfilade1D old = fen.txt.get(node);
 
         if(old != null) {
             Enfilade1D enf = old.sub(0, begin);
             enf = enf.plus(old.sub(end));
 
-            setEnfilade(node, enf);
+            fen.txt.set(node, enf);
         }
     }
 
Index: fenfire/org/fenfire/vocab/ALPH.java
diff -u fenfire/org/fenfire/vocab/ALPH.java:1.5 
fenfire/org/fenfire/vocab/ALPH.java:1.6
--- fenfire/org/fenfire/vocab/ALPH.java:1.5     Sun Apr  6 09:05:19 2003
+++ fenfire/org/fenfire/vocab/ALPH.java Tue Apr 15 11:09:22 2003
@@ -1,37 +1,32 @@
 // (c): Matti Katila
 
 package org.fenfire.vocab;
-import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.common.*;
+import org.fenfire.swamp.Nodes;
 
 public class ALPH {
-public static final String rcsid = "$Id: ALPH.java,v 1.5 2003/04/06 13:05:19 
tjl Exp $";
+public static final String rcsid = "$Id: ALPH.java,v 1.6 2003/04/15 15:09:22 
tjl Exp $";
     protected static void pa(String s) { System.out.println("ALPH: "+s); }
     
-    static public Property content;
-    static public Property clone;
-    static public Property xuLinkFrom;
-    static public Property xuLinkTo;
+    static public Object content;
+    static public Object clone;
+    static public Object xuLinkFrom;
+    static public Object xuLinkTo;
 
-    static public Resource xuType;
-    static public Resource xuLinkType;
-    static public Resource cloneType;
-    static public Resource dataType;
+    static public Object xuType;
+    static public Object xuLinkType;
+    static public Object cloneType;
+    static public Object dataType;
     
     static {
-       try {
-           content = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#content";);
-           clone = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#clone";);
-           xuLinkFrom = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#xuLinkFrom";);
-           xuLinkTo = new 
PropertyImpl("http://fenfire.org/vocabulary/alph.html#xuLinkTo";);
+       content = Nodes.get("http://fenfire.org/vocabulary/alph.html#content";);
+       clone = Nodes.get("http://fenfire.org/vocabulary/alph.html#clone";);
+       xuLinkFrom = 
Nodes.get("http://fenfire.org/vocabulary/alph.html#xuLinkFrom";);
+       xuLinkTo = 
Nodes.get("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";);
+       xuType = Nodes.get("http://fenfire.org/vocabulary/alph.html#xuType";);
+       xuLinkType = 
Nodes.get("http://fenfire.org/vocabulary/alph.html#xuLinkType";);
+       cloneType = 
Nodes.get("http://fenfire.org/vocabulary/alph.html#cloneType";);
+       dataType = 
Nodes.get("http://fenfire.org/vocabulary/alph.html#dataType";);
 
-       } catch (RDFException e) {
-           pa("Failed: "+e);
-       }
     }
 }