[Gzz-commits] fenfire ./build.xml org/fenfire/VStreamNodeText...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/27 02:53:07

Modified files:
        .              : build.xml 
        org/fenfire    : VStreamNodeTexter.java 
        org/fenfire/impl: AbstractSpace.java IdentityManager.java 
                          ModularSpace.java SimpleVStreamTexter.java 
        org/fenfire/util: pagespanpaper.test 
Added files:
        org/fenfire/demo: __init__.py buoyoing.py 
        org/fenfire/view: NodeView.java __init__.py pagespanlayout.test 
        org/fenfire/view/buoy: ScrollBlockNodeLinker.java __init__.py 
                               pagespanNodes.py 

Log message:
        The demo almost works now

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/VStreamNodeTexter.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/AbstractSpace.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/IdentityManager.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/ModularSpace.java.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.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodeView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/pagespanlayout.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/ScrollBlockNodeLinker.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/pagespanNodes.py?rev=1.1

Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.20 fenfire/build.xml:1.21
--- fenfire/build.xml:1.20      Wed Mar 26 13:14:28 2003
+++ fenfire/build.xml   Thu Mar 27 02:53:07 2003
@@ -7,6 +7,7 @@
     <property name="dep" location="../fenfire-depends"/>
     <property name="releasetag" value="snapshot"/>
     <property name="test" value="org"/>
+    <property name="demo" value="org.fenfire.demo.buoyoing"/>
 
     <!-- A filename can be passed to Loom at startup by
          overriding this property -->
@@ -78,6 +79,17 @@
            <env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>
            <arg value="${file}"/>
            <classpath refid="theClassPath"/>
+       </java>
+    </target>
+
+    <target name="rundemo">
+       <java classname="org.python.util.jython" fork="true"
+               failonerror="true">
+           <sysproperty key="python.path" value="${pythonpath}"/>
+           <env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>
+           <classpath refid="theClassPath"/>
+           <arg value="../libvob/rundemo.py"/>
+           <arg value="${demo}"/>
        </java>
     </target>
 
Index: fenfire/org/fenfire/VStreamNodeTexter.java
diff -u fenfire/org/fenfire/VStreamNodeTexter.java:1.1 
fenfire/org/fenfire/VStreamNodeTexter.java:1.2
--- fenfire/org/fenfire/VStreamNodeTexter.java:1.1      Wed Mar 26 18:48:14 2003
+++ fenfire/org/fenfire/VStreamNodeTexter.java  Thu Mar 27 02:53:07 2003
@@ -2,21 +2,22 @@
 NodeTexter.java
  *    
  *    Copyright (c) 2001, Ted Nelson and Tuomas Lukka
+ *    Copyright (c) 2003, Matti Katila
  *
- *    This file is part of Gzz.
+ *    This file is part of fenfire.
  *    
- *    Gzz is free software; you can redistribute it and/or modify it under
+ *    fenfire is free software; you can redistribute it and/or modify it under
  *    the terms of the GNU Lesser General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *    
- *    Gzz is distributed in the hope that it will be useful, but WITHOUT
+ *    fenfire is distributed in the hope that it will be useful, but WITHOUT
  *    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  *    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
  *    Public License for more details.
  *    
  *    You should have received a copy of the GNU Lesser General
- *    Public License along with Gzz; if not, write to the Free
+ *    Public License along with fenfire; if not, write to the Free
  *    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *    
@@ -30,7 +31,6 @@
 import org.nongnu.storm.*;
 import org.nongnu.alph.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
-// XXX import gzz.fuzzy.EnfiladeAligner;
 
 import java.util.*;
 
@@ -57,7 +57,13 @@
     void setEnfilade(RDFNode node, Enfilade1D vstream);
 
     /** Create an enfilade aligner instance for the enfilade in a given cell.
-     *  This can be used to externalize the content of a cell.
+     *  This can be used to edit the content of a cell externally with an 
editor
+     *  that does not understand Xanalogical media. The EnfiladeAligner
+     *  will give a string to edit and receive the edited string
+     *  and search for a good match between them.
+     *  XXX
+     *  This needs to be moved to the right place! This is the wrong API
+     *  for this call.
      */
     // XXX EnfiladeAligner.Instance startEnfiladeAligner(RDFNode node);
 
Index: fenfire/org/fenfire/impl/AbstractSpace.java
diff -u fenfire/org/fenfire/impl/AbstractSpace.java:1.1 
fenfire/org/fenfire/impl/AbstractSpace.java:1.2
--- fenfire/org/fenfire/impl/AbstractSpace.java:1.1     Wed Mar 26 21:26:40 2003
+++ fenfire/org/fenfire/impl/AbstractSpace.java Thu Mar 27 02:53:07 2003
@@ -42,23 +42,20 @@
  */
 
 public abstract class AbstractSpace implements Space{
-public static final String rcsid = "$Id: AbstractSpace.java,v 1.1 2003/03/27 
02:26:40 mudyc Exp $";
+public static final String rcsid = "$Id: AbstractSpace.java,v 1.2 2003/03/27 
07:53:07 tjl Exp $";
 
     protected ModularNodeTexter nodeTexter;
     protected JavaObjector javaObjector;
-    protected ObsTrigger obsTrigger;
     protected Model model;
 
     public AbstractSpace(ModularNodeTexter nodeTexter,
-                         ObsTrigger obsTrigger, Model model) {
+                         Model model) {
        this.nodeTexter = nodeTexter;
-        this.obsTrigger = obsTrigger;
        this.model = model;
     }
 
     public NodeTexter getNodeTexter() { return nodeTexter; }
     public JavaObjector getJavaObjector() { return javaObjector; }
-    public ObsTrigger getObsTrigger() { return obsTrigger; }
 
     public Model getModel() { return model; }
 
Index: fenfire/org/fenfire/impl/IdentityManager.java
diff -u fenfire/org/fenfire/impl/IdentityManager.java:1.1 
fenfire/org/fenfire/impl/IdentityManager.java:1.2
--- fenfire/org/fenfire/impl/IdentityManager.java:1.1   Wed Mar 26 21:26:40 2003
+++ fenfire/org/fenfire/impl/IdentityManager.java       Thu Mar 27 02:53:07 2003
@@ -35,10 +35,11 @@
 
 
 /** The global identities in a RDF space.
+ * XXX SHOULDN"T EXIST!
  */
 
 public interface IdentityManager {
-String rcsid = "$Id: IdentityManager.java,v 1.1 2003/03/27 02:26:40 mudyc Exp 
$";
+String rcsid = "$Id: IdentityManager.java,v 1.2 2003/03/27 07:53:07 tjl Exp $";
 
     void setSpace(Space s);
 
Index: fenfire/org/fenfire/impl/ModularSpace.java
diff -u fenfire/org/fenfire/impl/ModularSpace.java:1.1 
fenfire/org/fenfire/impl/ModularSpace.java:1.2
--- fenfire/org/fenfire/impl/ModularSpace.java:1.1      Wed Mar 26 21:26:40 2003
+++ fenfire/org/fenfire/impl/ModularSpace.java  Thu Mar 27 02:53:07 2003
@@ -39,11 +39,9 @@
  * a DimManager.
  */
 public class ModularSpace extends AbstractSpace {
-public static final String rcsid = "$Id: ModularSpace.java,v 1.1 2003/03/27 
02:26:40 mudyc Exp $";
+public static final String rcsid = "$Id: ModularSpace.java,v 1.2 2003/03/27 
07:53:07 tjl Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
-    protected IdentityManager identityManager;
-
     /** Create a new ModularSpace and initialize it from a SliceVersion.
      *  XXX where would this fit well? Is it a Slicer responsibility?
      *  how to do it for slice.0?
@@ -55,11 +53,8 @@
      *  swapIn(getSlice0())...
      */
     public ModularSpace(ModularNodeTexter nodeTexter,
-                       IdentityManager identityManager,
-                       ObsTrigger obsTrigger, Model model) {
-       super(nodeTexter, obsTrigger, model);
-       this.identityManager = identityManager;
-       identityManager.setSpace(this);
+                       Model model) {
+       super(nodeTexter, model);
 
        if(nodeTexter != null)
            nodeTexter.setSpace(this);
@@ -142,7 +137,9 @@
        return null;
     }
 
+    /*
     public RDFNode getMSBlockNode(String msid, RDFNode node) {
        return identityManager.getMSBlockNode(msid, node);
     }
+    */
 }
Index: fenfire/org/fenfire/impl/SimpleVStreamTexter.java
diff -u fenfire/org/fenfire/impl/SimpleVStreamTexter.java:1.1 
fenfire/org/fenfire/impl/SimpleVStreamTexter.java:1.2
--- fenfire/org/fenfire/impl/SimpleVStreamTexter.java:1.1       Wed Mar 26 
21:26:40 2003
+++ fenfire/org/fenfire/impl/SimpleVStreamTexter.java   Thu Mar 27 02:53:07 2003
@@ -2,6 +2,7 @@
 SimpleVStreamTexter.java
  *
  *    Copyright (c) 1999-2001, Ted Nelson and Tuomas Lukka
+ *    Copyright (c) 2003, Matti Katila
  *
  *    This file is part of Gzz.
  *    
@@ -55,37 +56,10 @@
     EnfiladeOverlapIndex index;
     XuIndexer xuIndex;
 
-    /** Aligner
-     * @deprecated EnfiladeAligner should not be provided by Space: it's too
-     *                 complicated and ill-defined for that.
-     */
-    // XXX EnfiladeAligner enfAligner;
-
-    /** Create a new object with given new span maker.
-     * @param spanMaker In order to perform setText() and insertText(),
-     *                 this object needs to create new spans.
-     *                 The spanMaker interface allows us to polymorphize that.
-     * @deprecated EnfiladeAligner should not be provided by Space: it's too
-     *                 complicated and ill-defined for that.
-     */
-    /*
-XXX
-
-    public SimpleVStreamTexter(SpanMaker spanMaker, Enfilade1D.Maker enfMaker) 
-       // ,       EnfiladeAligner enfAligner) {
-    {
-       this.spanMaker = spanMaker;
-       this.enfMaker = enfMaker;
-       // XXX  this.enfAligner = enfAligner;
-       this.index = new EnfiladeOverlapIndex();
-    }
-    */
-
-
     /** Create a new object with given new span maker.
      * @param spanMaker In order to perform setText() and insertText(),
      *                 this object needs to create new spans.
-     *                 The spanMaker interface allows us to polymorphize that.
+     *                 The spanMaker interface allows us to encapsulate that.
      */
     public SimpleVStreamTexter(SpanMaker spanMaker, Enfilade1D.Maker enfMaker) 
{
        this.spanMaker = spanMaker;
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.3 
fenfire/org/fenfire/util/pagespanpaper.test:1.4
--- fenfire/org/fenfire/util/pagespanpaper.test:1.3     Wed Mar 26 14:12:12 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Thu Mar 27 02:53:07 2003
@@ -131,3 +131,6 @@
     # XXX Only without libpaper paper
     # checkPaper(0)
     checkPaper(1)
+
+
+# : vim: set syntax=python :