[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire Fen.java impl/SimpleNodeCon...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire Fen.java impl/SimpleNodeCon... |
Date: |
Tue, 15 Apr 2003 23:29:22 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/04/15 23:29:22
Modified files:
org/fenfire : Fen.java
org/fenfire/impl: SimpleNodeContent.java
org/fenfire/swamp/impl: StdLiteral.java
org/fenfire/util: AlphContent.java
Log message:
More debug info
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Fen.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleNodeContent.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/StdLiteral.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/Fen.java
diff -u fenfire/org/fenfire/Fen.java:1.5 fenfire/org/fenfire/Fen.java:1.6
--- fenfire/org/fenfire/Fen.java:1.5 Tue Apr 15 15:10:09 2003
+++ fenfire/org/fenfire/Fen.java Tue Apr 15 23:29:22 2003
@@ -23,15 +23,18 @@
/** The span maker for user-typed spans.
*/
- public org.nongnu.alph.SpanMaker userSpanMaker;
+ public org.nongnu.alph.SpanMaker userSpanMaker =
+ new org.nongnu.alph.impl.FakeSpanMaker(); // XXX
/** The span maker for computer-generated spans.
*/
- public org.nongnu.alph.SpanMaker fakeSpanMaker;
+ public org.nongnu.alph.SpanMaker fakeSpanMaker =
+ new org.nongnu.alph.impl.FakeSpanMaker();
/** The enfilade maker.
*/
- public org.nongnu.alph.Enfilade1D.Maker enfMaker;
+ public org.nongnu.alph.Enfilade1D.Maker enfMaker =
+ new org.nongnu.alph.impl.Enfilade1DImpl.Enfilade1DImplMaker();
/** For use with recursed Fens: indicate
Index: fenfire/org/fenfire/impl/SimpleNodeContent.java
diff -u fenfire/org/fenfire/impl/SimpleNodeContent.java:1.3
fenfire/org/fenfire/impl/SimpleNodeContent.java:1.4
--- fenfire/org/fenfire/impl/SimpleNodeContent.java:1.3 Tue Apr 15 12:02:08 2003
+++ fenfire/org/fenfire/impl/SimpleNodeContent.java Tue Apr 15 23:29:22 2003
@@ -20,7 +20,7 @@
public class SimpleNodeContent implements NodeContent {
public static boolean dbg = true;
-public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.3
2003/04/15 16:02:08 tjl Exp $";
+public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.4
2003/04/16 03:29:22 tjl Exp $";
private static void pa(String s) { System.out.println("AlphContent: "+s); }
SpanReader spanReader = new SpanReader();
@@ -53,11 +53,15 @@
}
public org.nongnu.alph.Enfilade1D enfiladeFromLiteral(Literal l) {
+ if(dbg) pa("EnfiladeFromLiteral: "+l);
try {
- saxParser.parse(new StringBufferInputStream(
- (l).getRawXMLString()), spanReader);
+ String xml = l.getRawXMLString();
+ if(dbg) pa("Parse: "+saxParser+" "+xml+" "+spanReader);
+ saxParser.parse(new StringBufferInputStream(xml),
+ spanReader);
} catch (Exception e) {
+ e.printStackTrace();
pa("Exception!: "+e);
throw new Error("Get enfilade: parse Exception!");
}
Index: fenfire/org/fenfire/swamp/impl/StdLiteral.java
diff -u fenfire/org/fenfire/swamp/impl/StdLiteral.java:1.2
fenfire/org/fenfire/swamp/impl/StdLiteral.java:1.3
--- fenfire/org/fenfire/swamp/impl/StdLiteral.java:1.2 Tue Apr 15 14:17:49 2003
+++ fenfire/org/fenfire/swamp/impl/StdLiteral.java Tue Apr 15 23:29:22 2003
@@ -51,4 +51,8 @@
}
return txtcontent;
}
+
+ public String toString() {
+ return "StdLiteral('"+xmlcontent+"', '"+txtcontent+"')";
+ }
}
Index: fenfire/org/fenfire/util/AlphContent.java
diff -u fenfire/org/fenfire/util/AlphContent.java:1.6
fenfire/org/fenfire/util/AlphContent.java:1.7
--- fenfire/org/fenfire/util/AlphContent.java:1.6 Tue Apr 15 15:10:10 2003
+++ fenfire/org/fenfire/util/AlphContent.java Tue Apr 15 23:29:22 2003
@@ -13,7 +13,7 @@
/** Help class to work with Alph
*/
public class AlphContent {
-public static final String rcsid = "$Id: AlphContent.java,v 1.6 2003/04/15
19:10:10 tjl Exp $";
+public static final String rcsid = "$Id: AlphContent.java,v 1.7 2003/04/16
03:29:22 tjl Exp $";
private static void pa(String s) { System.out.println("AlphContent: "+s); }
@@ -31,7 +31,7 @@
public void setText(Object node, String s, boolean user) {
fen.txt.set(node, fen.enfMaker.makeEnfilade(
- (user ? fen.userSpanMaker : fen.fakeSpanMaker)
+ (user ? fen.userSpanMaker : fen.fakeSpanMaker)
.makeTextSpan(s)));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire Fen.java impl/SimpleNodeCon...,
Tuomas J. Lukka <=