[Gzz-commits] fenfire/org/fenfire Fen.java NodeContent.java s...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/24 08:59:07

Modified files:
        org/fenfire    : Fen.java NodeContent.java 
        org/fenfire/swamp: ConstGraph.java makeswamp.py 
        org/fenfire/swamp/impl: AbstractConstGraph.java 
                                StdObservedConstGraph.java 
                                StdObservedGraph.java 

Log message:
        Swamp: access to observed graphs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Fen.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/NodeContent.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/ConstGraph.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/makeswamp.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/StdObservedGraph.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/Fen.java
diff -u fenfire/org/fenfire/Fen.java:1.6 fenfire/org/fenfire/Fen.java:1.7
--- fenfire/org/fenfire/Fen.java:1.6    Tue Apr 15 23:29:22 2003
+++ fenfire/org/fenfire/Fen.java        Thu Apr 24 08:59:07 2003
@@ -13,6 +13,10 @@
      */
     public org.fenfire.swamp.ConstGraph constgraph;
 
+    /** The NodeFunction implementation by the NodeContent.
+     */
+    public org.fenfire.swamp.NodeFunction txtfunc;
+
     /** The object managing the enfilade content for nodes.
      */
     public NodeContent txt;
Index: fenfire/org/fenfire/NodeContent.java
diff -u fenfire/org/fenfire/NodeContent.java:1.2 
fenfire/org/fenfire/NodeContent.java:1.3
--- fenfire/org/fenfire/NodeContent.java:1.2    Sun Apr 13 03:49:05 2003
+++ fenfire/org/fenfire/NodeContent.java        Thu Apr 24 08:59:07 2003
@@ -6,6 +6,9 @@
  */
 
 public interface NodeContent {
+
+//    public NodeFunction getNodeFunction() ;
+
     /** Get the vstream in this node.
      *  Never returns <code>null</code>.
      */
Index: fenfire/org/fenfire/swamp/ConstGraph.java
diff -u fenfire/org/fenfire/swamp/ConstGraph.java:1.4 
fenfire/org/fenfire/swamp/ConstGraph.java:1.5
--- fenfire/org/fenfire/swamp/ConstGraph.java:1.4       Tue Apr 15 07:51:07 2003
+++ fenfire/org/fenfire/swamp/ConstGraph.java   Thu Apr 24 08:59:07 2003
@@ -10,6 +10,15 @@
     ConstGraph getObservedConstGraph(org.fenfire.Obs o);
     void close();
 
+    /** If this graph is observed (returned from getObservedConstGraph),
+     * get the observer.
+     */
+    Obs getObserver();
+    /** If this graph is observed (returned from getObservedConstGraph),
+     * get the original.
+     */
+    ConstGraph getOriginalConstGraph();
+
     boolean contains(Object e0, Object e1, Object e2);
     boolean contains(Object e0, Object e1, Object e2, Obs o);
 
Index: fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java
diff -u fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java:1.3 
fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java:1.4
--- fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java:1.3  Tue Apr 15 
07:51:08 2003
+++ fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java      Thu Apr 24 
08:59:07 2003
@@ -11,6 +11,8 @@
        return new StdObservedConstGraph(this, obs);
     }
     public void close() { }
+    public Obs getObserver() { return null; }
+    public ConstGraph getOriginalConstGraph() { return null; }
     public boolean contains(Object e0, Object e1, Object e2) {
        return contains(e0, e1, e2, null);
     }
Index: fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java
diff -u fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java:1.3 
fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java:1.4
--- fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java:1.3       Tue Apr 
15 07:51:08 2003
+++ fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java   Thu Apr 24 
08:59:07 2003
@@ -14,15 +14,19 @@
        this.obs = obs;
     }
 
-    public Graph getObservedGraph(Obs obs) {
-       throw new Error("DoubleObs");
-    }
-
     public ConstGraph getObservedConstGraph(Obs obs) {
        throw new Error("DoubleObs");
     }
 
     public void close() { }
+
+    public Obs getObserver() {
+       return obs;
+    }
+
+    public ConstGraph getOriginalConstGraph() {
+       return constgraph;
+    }
 
     public boolean contains(Object e0, Object e1, Object e2) {
        return constgraph.contains(e0, e1, e2, obs);
Index: fenfire/org/fenfire/swamp/impl/StdObservedGraph.java
diff -u fenfire/org/fenfire/swamp/impl/StdObservedGraph.java:1.4 
fenfire/org/fenfire/swamp/impl/StdObservedGraph.java:1.5
--- fenfire/org/fenfire/swamp/impl/StdObservedGraph.java:1.4    Tue Apr 15 
06:39:40 2003
+++ fenfire/org/fenfire/swamp/impl/StdObservedGraph.java        Thu Apr 24 
08:59:07 2003
@@ -13,6 +13,11 @@
        this.graph = graph;
        this.obs = obs;
     }
+
+    public Graph getObservedGraph(Obs obs) {
+       throw new Error("DoubleObs");
+    }
+
     public void set1_11X(Object subject, Object predicate, Object object) {
        graph.set1_11X(subject, predicate, object);
     }
Index: fenfire/org/fenfire/swamp/makeswamp.py
diff -u fenfire/org/fenfire/swamp/makeswamp.py:1.5 
fenfire/org/fenfire/swamp/makeswamp.py:1.6
--- fenfire/org/fenfire/swamp/makeswamp.py:1.5  Tue Apr 15 07:51:07 2003
+++ fenfire/org/fenfire/swamp/makeswamp.py      Thu Apr 24 08:59:07 2003
@@ -130,6 +130,15 @@
     ConstGraph getObservedConstGraph(org.fenfire.Obs o);
     void close();
 
+    /** If this graph is observed (returned from getObservedConstGraph),
+     * get the observer.
+     */
+    Obs getObserver();
+    /** If this graph is observed (returned from getObservedConstGraph),
+     * get the original.
+     */
+    ConstGraph getOriginalConstGraph();
+
     boolean contains(Object e0, Object e1, Object e2);
     boolean contains(Object e0, Object e1, Object e2, Obs o);
 
@@ -170,6 +179,8 @@
        return new StdObservedConstGraph(this, obs);
     }
     public void close() { }
+    public Obs getObserver() { return null; }
+    public ConstGraph getOriginalConstGraph() { return null; }
     public boolean contains(Object e0, Object e1, Object e2) {
        return contains(e0, e1, e2, null);
     }
@@ -194,16 +205,20 @@
        this.obs = obs;
     }
 
-    public Graph getObservedGraph(Obs obs) {
-       throw new Error("DoubleObs");
-    }
-
     public ConstGraph getObservedConstGraph(Obs obs) {
        throw new Error("DoubleObs");
     }
 
     public void close() { }
 
+    public Obs getObserver() {
+       return obs;
+    }
+
+    public ConstGraph getOriginalConstGraph() {
+       return constgraph;
+    }
+
     public boolean contains(Object e0, Object e1, Object e2) {
        return constgraph.contains(e0, e1, e2, obs);
     }
@@ -233,6 +248,11 @@
        this.graph = graph;
        this.obs = obs;
     }
+
+    public Graph getObservedGraph(Obs obs) {
+       throw new Error("DoubleObs");
+    }
+
     public void set1_11X(Object subject, Object predicate, Object object) {
        graph.set1_11X(subject, predicate, object);
     }