[Fencommits] fenfire patch from 30 to 31
fencommits at lists.cc.jyu.fi
fencommits at lists.cc.jyu.fi
Fri Aug 27 09:47:44 EEST 2004
* looking for fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-30 to compare with
* build pristine tree for fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-30
* from archive cached: fenfire at fenfire.org--2004a/fenfire--dev--0.1--base-0
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-1
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-2
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-3
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-4
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-5
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-6
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-7
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-8
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-9
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-10
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-11
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-12
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-13
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-14
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-15
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-16
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-17
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-18
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-19
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-20
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-21
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-22
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-23
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-24
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-25
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-26
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-27
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-28
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-29
* patching for revision: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-30
* comparing to fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-30
A org/fenfire/modules/init/.arch-ids/GlobalGraphLoader.java.id
A org/fenfire/modules/init/.arch-ids/SettingsLoader.java.id
A org/fenfire/modules/init/GlobalGraphLoader.java
A org/fenfire/modules/init/SettingsLoader.java
A org/fenfire/swamp/impl/.arch-ids/DelegateGraph.java.id
A org/fenfire/swamp/impl/.arch-ids/SynchronizedGraph.java.id
A org/fenfire/swamp/impl/DelegateGraph.java
A org/fenfire/swamp/impl/SynchronizedGraph.java
A {arch}/fenfire/fenfire--dev/fenfire--dev--0.1/fenfire at fenfire.org--2004a/patch-log/patch-31
M org/fenfire/swamp/cloudberry/StormGraph.java
M org/fenfire/modules/init/StormLoader.java
M org/fenfire/modules/init/SystemLoader.java
M org/fenfire/swamp/makeswamp.py
* modified files
--- orig/org/fenfire/modules/init/StormLoader.java
+++ mod/org/fenfire/modules/init/StormLoader.java
@@ -47,7 +47,7 @@
pool = new BerkeleyDBPool(d, Collections.singleton(PointerIndex.type));
if(!hasSignature(pool, d)) makeSignature(pool, d);
- ((BerkeleyDBPool) pool).flush();
+ //((BerkeleyDBPool) pool).flush();
// check whether there are any
/*
--- orig/org/fenfire/modules/init/SystemLoader.java
+++ mod/org/fenfire/modules/init/SystemLoader.java
@@ -10,7 +10,9 @@
public SystemLoader(FServer f, String [] args) {
this.f = f;
- try {
+ try { // chicken and egg problem!
+
+ new GlobalGraphLoader(f);
// how to get language/culture/country settings
// from the system? -> needed to translate user
@@ -19,7 +21,7 @@
new StormLoader(f);
new AlphLoader(f);
- //new SettingsLoader(f);
+ new SettingsLoader(f);
// once system settings has been loaded from
// private rdf block we know how to manage different pools
//new PoolManager(f);
--- orig/org/fenfire/swamp/cloudberry/StormGraph.java
+++ mod/org/fenfire/swamp/cloudberry/StormGraph.java
@@ -2,15 +2,15 @@
package org.fenfire.swamp.cloudberry;
import org.fenfire.swamp.*;
+import org.fenfire.swamp.impl.*;
import org.fenfire.vocab.RDF;
import org.nongnu.storm.references.PointerId;
import java.util.*;
/** An RDF graph used to store in storm pointer.
*/
-public class StormGraph {
+public class StormGraph extends DelegateGraph {
- Graph global;
PointerId ptr;
final Object id;
final Object pred =
@@ -18,49 +18,53 @@
// import the rdf in the system
public StormGraph(Graph g, PointerId ptr) {
- global = g;
+ super(g);
id = Nodes.N();
// take the latest version..
}
public void add(Object s, Object p, Object o) {
- if(!global.contains(s,p,o))
- global.add(s,p,o);
+ if(!super.contains(s,p,o))
+ super.add(s,p,o);
Object triple = Nodes.N();
- global.add(triple, RDF.subject, s);
- global.add(triple, RDF.predicate, p);
- global.add(triple, RDF.object, o);
- global.add(triple, pred, id);
+ super.add(triple, RDF.subject, s);
+ super.add(triple, RDF.predicate, p);
+ super.add(triple, RDF.object, o);
+ super.add(triple, pred, id);
+ }
+
+ public void rm_111(Object s, Object p, Object o) {
+ throw new Error("Not implemented");
}
public void remove() {
- for(Iterator i=global.findN_X11_Iter(pred, id); i.hasNext(); ) {
+ for(Iterator i=super.findN_X11_Iter(pred, id); i.hasNext(); ) {
Object t = i.next();
Object s,p,o;
- s = global.find1_11X(t, RDF.subject);
- p = global.find1_11X(t, RDF.predicate);
- o = global.find1_11X(t, RDF.object);
-
- global.rm_111(t, pred, id);
- global.rm_111(t, RDF.object, o);
- global.rm_111(t, RDF.predicate, p);
- global.rm_111(t, RDF.subject, s);
+ s = super.find1_11X(t, RDF.subject);
+ p = super.find1_11X(t, RDF.predicate);
+ o = super.find1_11X(t, RDF.object);
+
+ super.rm_111(t, pred, id);
+ super.rm_111(t, RDF.object, o);
+ super.rm_111(t, RDF.predicate, p);
+ super.rm_111(t, RDF.subject, s);
// shall proceed with rm s,p,o?
// check whether any other pointer refers to it..
boolean remove = true;
- for (Iterator j=global.findN_X11_Iter(RDF.subject, s); j.hasNext();) {
+ for (Iterator j=super.findN_X11_Iter(RDF.subject, s); j.hasNext();) {
Object other = j.next();
- if (global.contains(other, RDF.predicate, p) &&
- global.contains(other, RDF.object, o) &&
- global.findN_11X_Iter(other, pred).hasNext())
+ if (super.contains(other, RDF.predicate, p) &&
+ super.contains(other, RDF.object, o) &&
+ super.findN_11X_Iter(other, pred).hasNext())
remove = false;
}
if (remove)
- global.rm_111(s,p,o);
+ super.rm_111(s,p,o);
}
}
--- orig/org/fenfire/swamp/makeswamp.py
+++ mod/org/fenfire/swamp/makeswamp.py
@@ -133,6 +133,26 @@
graph_callother = "".join([ callObs(g, "graph", ret=0) for g in graph ])
+
+def delegate_proto(g, sync="synchronized ", obs=0):
+ ret = ""
+ if g["FRet"] in ["Object", "Iterator"]: ret = "return"
+ pars = []
+ pars.extend(["Object "+i for i in g["Params"]])
+ if obs:
+ pars.append("Obs o")
+ if len(pars) == 1: obs = 'o'
+ else: obs = ',o'
+ else: obs = ''
+ return ("public "+sync + g["FRet"] + " "+g["FName"]+"("+
+ ",".join(pars) +
+ ") {\n "+ret+" graph." + g["FName"]+"("+",".join([i for i in g["Params"]])+ obs+"); }\n\n")
+delegate_calls = "".join([delegate_proto(g, "") for g in constgraph])
+delegate_calls += "".join([delegate_proto(g, "", 1) for g in constgraph])
+synch_delegate_calls = "".join([delegate_proto(g) for g in graph])
+synch_delegate_calls += "".join([delegate_proto(g) for g in constgraph])
+synch_delegate_calls += "".join([delegate_proto(g,obs=1) for g in constgraph])
+
def mkFile(a,b):
f = open(a,"w")
f.write("// AUTOGENERATED By makeswamp.py - DO NOT EDIT.\n")
@@ -302,6 +322,80 @@
""" % locals())
+
+mkFile("org/fenfire/swamp/impl/SynchronizedGraph.java", """
+package org.fenfire.swamp.impl;
+import org.nongnu.navidoc.util.Obs;
+import org.fenfire.swamp.*;
+import java.util.Iterator;
+
+public class SynchronizedGraph implements Graph {
+ Graph graph;
+
+ public SynchronizedGraph(Graph graph) {
+ this.graph = graph;
+ }
+ public synchronized void close() { graph.close(); }
+ public synchronized Obs getObserver() { return graph.getObserver(); }
+ public synchronized ConstGraph getOriginalConstGraph() {
+ return graph.getOriginalConstGraph(); }
+ public synchronized ConstGraph getObservedConstGraph(Obs o) {
+ return graph.getObservedConstGraph(o); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2) {
+ return graph.contains(e0,e1,e2); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ return graph.contains(e0,e1,e2, o); }
+ public synchronized Graph getObservedGraph(org.nongnu.navidoc.util.Obs o) {
+ return graph.getObservedGraph(o); }
+ public synchronized void set1_11X(Object subject, Object predicate, Object object) {
+ graph.set1_11X(subject, predicate, object); }
+ public synchronized void add(Object subject, Object predicate, Object object) {
+ graph.add(subject, predicate, object); }
+
+ %(synch_delegate_calls)s
+}
+
+""" % locals())
+
+
+mkFile("org/fenfire/swamp/impl/DelegateGraph.java", """
+package org.fenfire.swamp.impl;
+import org.nongnu.navidoc.util.Obs;
+import org.fenfire.swamp.*;
+import java.util.Iterator;
+
+public abstract class DelegateGraph extends AbstractGraph {
+ Graph graph;
+
+ public DelegateGraph(Graph graph) {
+ this.graph = graph;
+ }
+
+ public synchronized void close() { graph.close(); }
+ public synchronized Obs getObserver() { return graph.getObserver(); }
+ public synchronized ConstGraph getOriginalConstGraph() {
+ return graph.getOriginalConstGraph(); }
+ public synchronized ConstGraph getObservedConstGraph(Obs o) {
+ return graph.getObservedConstGraph(o); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2) {
+ return graph.contains(e0,e1,e2); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ return graph.contains(e0,e1,e2, o); }
+ public synchronized Graph getObservedGraph(org.nongnu.navidoc.util.Obs o) {
+ return graph.getObservedGraph(o); }
+ public synchronized void set1_11X(Object subject, Object predicate, Object object) {
+ graph.set1_11X(subject, predicate, object); }
+ public synchronized void add(Object subject, Object predicate, Object object) {
+ graph.add(subject, predicate, object); }
+ public synchronized void rm_111(Object subject, Object predicate, Object object) {
+ graph.rm_111(subject, predicate, object); }
+
+
+ %(delegate_calls)s
+}
+
+""" % locals())
+
##########################################################3
#
# Now, the tough part: the actual structure
* added files
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/modules/init/.arch-ids/GlobalGraphLoader.java.id
@@ -0,0 +1 @@
+Matti J. Katila <mudyc at iki.fi> Fri Aug 27 09:39:04 2004 4996.0
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/modules/init/.arch-ids/SettingsLoader.java.id
@@ -0,0 +1 @@
+Matti J. Katila <mudyc at iki.fi> Fri Aug 27 09:39:04 2004 4996.1
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/modules/init/GlobalGraphLoader.java
@@ -0,0 +1,29 @@
+// (c): Matti J. Katila
+
+package org.fenfire.modules.init;
+import org.fenfire.view.management.*;
+import org.fenfire.swamp.impl.*;
+import org.fenfire.swamp.*;
+
+
+public class GlobalGraphLoader implements FServer.RequestHandler {
+
+ private SynchronizedGraph g;
+ private FServer f;
+ public GlobalGraphLoader(FServer f) {
+ this.f = f;
+
+ this.g = new SynchronizedGraph(new HashGraph());
+ if (f.environment.createRequest("global graph", this))
+ throw new Error("Storm loader already inited!");
+ }
+
+
+
+ public void handleRequest(Object req, Applitude app) {
+ }
+ public void handleRequest(Object req, Object[] o, Applitude app) {
+ if (req.equals("global graph"))
+ if (o instanceof Graph[]) o[0] = this.g;
+ }
+}
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/modules/init/SettingsLoader.java
@@ -0,0 +1,50 @@
+// (c): Matti J. Katila
+
+package org.fenfire.modules.init;
+import org.fenfire.view.management.*;
+import org.nongnu.storm.*;
+import org.nongnu.storm.references.*;
+
+import java.io.*;
+
+public class SettingsLoader {
+
+ private StormPool pool;
+ private FServer f;
+ public SettingsLoader(FServer f) {
+ // get private pool ... get settings ptr ..
+
+ // private storm pool is just "storm"
+ StormPool[] p = new StormPool[1];
+ f.environment.request("storm", (Object[]) p, null);
+ if (p[0] == null) throw new Error("pool undefined!");
+ pool = p[0];
+
+ String dir = System.getProperty("fenfire.settings.dir");
+ if (dir==null)
+ throw new Error("property 'fenfire.settings.dir' not defined!");
+ File d = new File(dir);
+ d.mkdirs();
+ if (! d.isDirectory())
+ throw new Error("directory creation failed!");
+
+ if(!hasSettingsPtr(d)) makeSettingsPtr(d);
+
+ // use pointer to create StormGraph
+ }
+
+
+ private boolean hasSettingsPtr(File dir) {
+ return (new File(dir, "settings-ptr")).exists();
+ }
+
+ private void makeSettingsPtr(File dir) {
+ PointerSigner[] p = new PointerSigner[1];
+ f.environment.request("storm-pointer-signer", (Object[]) p, null);
+ if (p[0] == null) throw new Error("block signer undefined!");
+ PointerSigner s = p[0];
+
+ //s....
+ }
+
+}
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/swamp/impl/.arch-ids/DelegateGraph.java.id
@@ -0,0 +1 @@
+Matti J. Katila <mudyc at iki.fi> Fri Aug 27 09:24:49 2004 4907.0
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/swamp/impl/.arch-ids/SynchronizedGraph.java.id
@@ -0,0 +1 @@
+Matti J. Katila <mudyc at iki.fi> Fri Aug 27 09:24:45 2004 4906.0
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/swamp/impl/DelegateGraph.java
@@ -0,0 +1,109 @@
+// AUTOGENERATED By makeswamp.py - DO NOT EDIT.
+
+package org.fenfire.swamp.impl;
+import org.nongnu.navidoc.util.Obs;
+import org.fenfire.swamp.*;
+import java.util.Iterator;
+
+public abstract class DelegateGraph extends AbstractGraph {
+ Graph graph;
+
+ public DelegateGraph(Graph graph) {
+ this.graph = graph;
+ }
+
+ public synchronized void close() { graph.close(); }
+ public synchronized Obs getObserver() { return graph.getObserver(); }
+ public synchronized ConstGraph getOriginalConstGraph() {
+ return graph.getOriginalConstGraph(); }
+ public synchronized ConstGraph getObservedConstGraph(Obs o) {
+ return graph.getObservedConstGraph(o); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2) {
+ return graph.contains(e0,e1,e2); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ return graph.contains(e0,e1,e2, o); }
+ public synchronized Graph getObservedGraph(org.nongnu.navidoc.util.Obs o) {
+ return graph.getObservedGraph(o); }
+ public synchronized void set1_11X(Object subject, Object predicate, Object object) {
+ graph.set1_11X(subject, predicate, object); }
+ public synchronized void add(Object subject, Object predicate, Object object) {
+ graph.add(subject, predicate, object); }
+ public synchronized void rm_111(Object subject, Object predicate, Object object) {
+ graph.rm_111(subject, predicate, object); }
+
+
+ public Object find1_11X(Object e0,Object e1) {
+ return graph.find1_11X(e0,e1); }
+
+public Object find1_1X1(Object e0,Object e2) {
+ return graph.find1_1X1(e0,e2); }
+
+public Object find1_X11(Object e1,Object e2) {
+ return graph.find1_X11(e1,e2); }
+
+public Object find1_1XA(Object e0) {
+ return graph.find1_1XA(e0); }
+
+public Object find1_XAA() {
+ return graph.find1_XAA(); }
+
+public Object find1_X1A(Object e1) {
+ return graph.find1_X1A(e1); }
+
+public Iterator findN_11X_Iter(Object e0,Object e1) {
+ return graph.findN_11X_Iter(e0,e1); }
+
+public Iterator findN_1X1_Iter(Object e0,Object e2) {
+ return graph.findN_1X1_Iter(e0,e2); }
+
+public Iterator findN_X11_Iter(Object e1,Object e2) {
+ return graph.findN_X11_Iter(e1,e2); }
+
+public Iterator findN_1XA_Iter(Object e0) {
+ return graph.findN_1XA_Iter(e0); }
+
+public Iterator findN_XAA_Iter() {
+ return graph.findN_XAA_Iter(); }
+
+public Iterator findN_X1A_Iter(Object e1) {
+ return graph.findN_X1A_Iter(e1); }
+
+public Object find1_11X(Object e0,Object e1,Obs o) {
+ return graph.find1_11X(e0,e1,o); }
+
+public Object find1_1X1(Object e0,Object e2,Obs o) {
+ return graph.find1_1X1(e0,e2,o); }
+
+public Object find1_X11(Object e1,Object e2,Obs o) {
+ return graph.find1_X11(e1,e2,o); }
+
+public Object find1_1XA(Object e0,Obs o) {
+ return graph.find1_1XA(e0,o); }
+
+public Object find1_XAA(Obs o) {
+ return graph.find1_XAA(o); }
+
+public Object find1_X1A(Object e1,Obs o) {
+ return graph.find1_X1A(e1,o); }
+
+public Iterator findN_11X_Iter(Object e0,Object e1,Obs o) {
+ return graph.findN_11X_Iter(e0,e1,o); }
+
+public Iterator findN_1X1_Iter(Object e0,Object e2,Obs o) {
+ return graph.findN_1X1_Iter(e0,e2,o); }
+
+public Iterator findN_X11_Iter(Object e1,Object e2,Obs o) {
+ return graph.findN_X11_Iter(e1,e2,o); }
+
+public Iterator findN_1XA_Iter(Object e0,Obs o) {
+ return graph.findN_1XA_Iter(e0,o); }
+
+public Iterator findN_XAA_Iter(Obs o) {
+ return graph.findN_XAA_Iter(o); }
+
+public Iterator findN_X1A_Iter(Object e1,Obs o) {
+ return graph.findN_X1A_Iter(e1,o); }
+
+
+}
+
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./org/fenfire/swamp/impl/SynchronizedGraph.java
@@ -0,0 +1,117 @@
+// AUTOGENERATED By makeswamp.py - DO NOT EDIT.
+
+package org.fenfire.swamp.impl;
+import org.nongnu.navidoc.util.Obs;
+import org.fenfire.swamp.*;
+import java.util.Iterator;
+
+public class SynchronizedGraph implements Graph {
+ Graph graph;
+
+ public SynchronizedGraph(Graph graph) {
+ this.graph = graph;
+ }
+ public synchronized void close() { graph.close(); }
+ public synchronized Obs getObserver() { return graph.getObserver(); }
+ public synchronized ConstGraph getOriginalConstGraph() {
+ return graph.getOriginalConstGraph(); }
+ public synchronized ConstGraph getObservedConstGraph(Obs o) {
+ return graph.getObservedConstGraph(o); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2) {
+ return graph.contains(e0,e1,e2); }
+ public synchronized boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ return graph.contains(e0,e1,e2, o); }
+ public synchronized Graph getObservedGraph(org.nongnu.navidoc.util.Obs o) {
+ return graph.getObservedGraph(o); }
+ public synchronized void set1_11X(Object subject, Object predicate, Object object) {
+ graph.set1_11X(subject, predicate, object); }
+ public synchronized void add(Object subject, Object predicate, Object object) {
+ graph.add(subject, predicate, object); }
+
+ public synchronized void rm_111(Object e0,Object e1,Object e2) {
+ graph.rm_111(e0,e1,e2); }
+
+public synchronized void rm_11A(Object e0,Object e1) {
+ graph.rm_11A(e0,e1); }
+
+public synchronized void rm_A11(Object e1,Object e2) {
+ graph.rm_A11(e1,e2); }
+
+public synchronized void rm_1AA(Object e0) {
+ graph.rm_1AA(e0); }
+
+public synchronized Object find1_11X(Object e0,Object e1) {
+ return graph.find1_11X(e0,e1); }
+
+public synchronized Object find1_1X1(Object e0,Object e2) {
+ return graph.find1_1X1(e0,e2); }
+
+public synchronized Object find1_X11(Object e1,Object e2) {
+ return graph.find1_X11(e1,e2); }
+
+public synchronized Object find1_1XA(Object e0) {
+ return graph.find1_1XA(e0); }
+
+public synchronized Object find1_XAA() {
+ return graph.find1_XAA(); }
+
+public synchronized Object find1_X1A(Object e1) {
+ return graph.find1_X1A(e1); }
+
+public synchronized Iterator findN_11X_Iter(Object e0,Object e1) {
+ return graph.findN_11X_Iter(e0,e1); }
+
+public synchronized Iterator findN_1X1_Iter(Object e0,Object e2) {
+ return graph.findN_1X1_Iter(e0,e2); }
+
+public synchronized Iterator findN_X11_Iter(Object e1,Object e2) {
+ return graph.findN_X11_Iter(e1,e2); }
+
+public synchronized Iterator findN_1XA_Iter(Object e0) {
+ return graph.findN_1XA_Iter(e0); }
+
+public synchronized Iterator findN_XAA_Iter() {
+ return graph.findN_XAA_Iter(); }
+
+public synchronized Iterator findN_X1A_Iter(Object e1) {
+ return graph.findN_X1A_Iter(e1); }
+
+public synchronized Object find1_11X(Object e0,Object e1,Obs o) {
+ return graph.find1_11X(e0,e1,o); }
+
+public synchronized Object find1_1X1(Object e0,Object e2,Obs o) {
+ return graph.find1_1X1(e0,e2,o); }
+
+public synchronized Object find1_X11(Object e1,Object e2,Obs o) {
+ return graph.find1_X11(e1,e2,o); }
+
+public synchronized Object find1_1XA(Object e0,Obs o) {
+ return graph.find1_1XA(e0,o); }
+
+public synchronized Object find1_XAA(Obs o) {
+ return graph.find1_XAA(o); }
+
+public synchronized Object find1_X1A(Object e1,Obs o) {
+ return graph.find1_X1A(e1,o); }
+
+public synchronized Iterator findN_11X_Iter(Object e0,Object e1,Obs o) {
+ return graph.findN_11X_Iter(e0,e1,o); }
+
+public synchronized Iterator findN_1X1_Iter(Object e0,Object e2,Obs o) {
+ return graph.findN_1X1_Iter(e0,e2,o); }
+
+public synchronized Iterator findN_X11_Iter(Object e1,Object e2,Obs o) {
+ return graph.findN_X11_Iter(e1,e2,o); }
+
+public synchronized Iterator findN_1XA_Iter(Object e0,Obs o) {
+ return graph.findN_1XA_Iter(e0,o); }
+
+public synchronized Iterator findN_XAA_Iter(Obs o) {
+ return graph.findN_XAA_Iter(o); }
+
+public synchronized Iterator findN_X1A_Iter(Object e1,Obs o) {
+ return graph.findN_X1A_Iter(e1,o); }
+
+
+}
+
--- /dev/null
+++ /home/majukati/src/current/,,what-changed.fenfire--dev--0.1--patch-30--fenfire at fenfire.org--2004a/new-files-archive/./{arch}/fenfire/fenfire--dev/fenfire--dev--0.1/fenfire at fenfire.org--2004a/patch-log/patch-31
@@ -0,0 +1,23 @@
+Revision: fenfire--dev--0.1--patch-31
+Archive: fenfire at fenfire.org--2004a
+Creator: Matti J. Katila <mudyc at iki.fi>
+Date: Fri Aug 27 09:45:03 EEST 2004
+Standard-date: 2004-08-27 06:45:03 GMT
+New-files: org/fenfire/modules/init/.arch-ids/GlobalGraphLoader.java.id
+ org/fenfire/modules/init/.arch-ids/SettingsLoader.java.id
+ org/fenfire/modules/init/GlobalGraphLoader.java
+ org/fenfire/modules/init/SettingsLoader.java
+ org/fenfire/swamp/impl/.arch-ids/DelegateGraph.java.id
+ org/fenfire/swamp/impl/.arch-ids/SynchronizedGraph.java.id
+ org/fenfire/swamp/impl/DelegateGraph.java
+ org/fenfire/swamp/impl/SynchronizedGraph.java
+Modified-files: org/fenfire/modules/init/StormLoader.java
+ org/fenfire/modules/init/SystemLoader.java
+ org/fenfire/swamp/cloudberry/StormGraph.java
+ org/fenfire/swamp/makeswamp.py
+New-patches: fenfire at fenfire.org--2004a/fenfire--dev--0.1--patch-31
+Summary: graph improvemnts. init improvemnts - it's a chicken and egg problem!
+Keywords:
+
+graph improvemnts. init improvemnts - it's a chicken and egg problem!
+
More information about the Fencommits
mailing list