[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire Fen.java modules/pp/PPActio...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire Fen.java modules/pp/PPActio... |
Date: |
Tue, 15 Apr 2003 15:10:10 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/04/15 15:10:10
Modified files:
org/fenfire : Fen.java
org/fenfire/modules/pp: PPActionsImpl.java
org/fenfire/util: AlphContent.java
Log message:
Alphcontent makes some things easy...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Fen.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/Fen.java
diff -u fenfire/org/fenfire/Fen.java:1.4 fenfire/org/fenfire/Fen.java:1.5
--- fenfire/org/fenfire/Fen.java:1.4 Tue Apr 15 14:26:50 2003
+++ fenfire/org/fenfire/Fen.java Tue Apr 15 15:10:09 2003
@@ -25,6 +25,15 @@
*/
public org.nongnu.alph.SpanMaker userSpanMaker;
+ /** The span maker for computer-generated spans.
+ */
+ public org.nongnu.alph.SpanMaker fakeSpanMaker;
+
+ /** The enfilade maker.
+ */
+ public org.nongnu.alph.Enfilade1D.Maker enfMaker;
+
+
/** For use with recursed Fens: indicate
* that this Fen will not be used again
* and may be recycled.
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.16
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.17
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.16 Tue Apr 15
14:09:18 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java Tue Apr 15 15:10:09 2003
@@ -12,13 +12,17 @@
/** The implementation of PPActions.
*/
public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.16 2003/04/15
18:09:18 mudyc Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.17 2003/04/15
19:10:09 tjl Exp $";
public static final boolean dbg = false;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println("PPActionsImpl:
"+s); }
private Fen fen = null;
- public void setSwamp(Fen fen) { this.fen = fen; }
+ private AlphContent alphContent;
+ public void setSwamp(Fen fen) {
+ this.fen = fen;
+ this.alphContent = new AlphContent(fen);
+ }
public PPActionsImpl(Fen fen) throws RemoteException {
super();
@@ -90,6 +94,9 @@
// set depth...
fen.graph.set1_11X(note, PP.depth, Nodes.getStringLiteral("10") );
+ // Set text
+ alphContent.setText(note, text, true);
+
// scale etc.. XXX
return note.toString();
}}
@@ -215,87 +222,17 @@
public void insertText(String noteURI, int offs, String text)
throws RemoteException
- { synchronized(fen) { //try {
- /*
- Cell note = space.getCell(noteId);
- note.insertText(offs, text);
- */
-
- /*
- Resource note = model.getResource(noteURI);
-
- // find actual data
- Selector s =
- new SelectorImpl(note, PP.LinkToContentRef, (RDFNode) null);
- StmtIterator iter = model.listStatements(s);
- Statement stmt = null;
- while (iter.hasNext()) {
- if (stmt != null) throw new Error("Too many data!!");
- stmt = iter.next();
- }
-
- Resource data = (Resource) stmt.getObject();
-
- // find literal
- s = new SelectorImpl(data, PP.Data, (RDFNode) null);
- iter = model.listStatements(s);
- stmt = null;
- while (iter.hasNext()) {
- if (stmt != null) throw new Error("Too many data!!");
- stmt = iter.next();
- }
-
- StringBuffer str = new StringBuffer(stmt.getObject().toString());
- model.remove(stmt);
- str.insert(offs, text);
- data.addProperty(PP.Data, str.toString());
-
- } catch (RDFException e) {
- pa("Fault inserting text to note: "+e);
- } */
+ { synchronized(fen) {
+ alphContent.insertText(
+ Nodes.get(noteURI), offs, text, true
+ );
}}
public void deleteText(String noteURI, int begin, int end)
throws RemoteException
- { synchronized(fen) { // try {
- /*
- Cell note = space.getCell(noteId);
- note.deleteText(begin, end);
- */
-
- /*
- Resource note = model.getResource(noteURI);
-
- // find actual data
- Selector s =
- new SelectorImpl(note, PP.LinkToContentRef, (RDFNode) null);
- StmtIterator iter = model.listStatements(s);
- Statement stmt = null;
- while (iter.hasNext()) {
- if (stmt != null) throw new Error("Too many data!!");
- stmt = iter.next();
- }
-
- Resource data = (Resource) stmt.getObject();
-
- // find literal
- s = new SelectorImpl(data, PP.Data, (RDFNode) null);
- iter = model.listStatements(s);
- stmt = null;
- while (iter.hasNext()) {
- if (stmt != null) throw new Error("Too many data!!");
- stmt = iter.next();
- }
-
- StringBuffer str = new StringBuffer(stmt.getObject().toString());
- model.remove(stmt);
- str.delete(begin, end);
- data.addProperty(PP.Data, str.toString());
-
- } catch (RDFException e) {
- pa("Fault deleting text from the note: "+e);
- }
- */
+ { synchronized(fen) {
+ alphContent.deleteText(
+ Nodes.get(noteURI), begin, end);
}}
}
Index: fenfire/org/fenfire/util/AlphContent.java
diff -u fenfire/org/fenfire/util/AlphContent.java:1.5
fenfire/org/fenfire/util/AlphContent.java:1.6
--- fenfire/org/fenfire/util/AlphContent.java:1.5 Tue Apr 15 11:09:22 2003
+++ fenfire/org/fenfire/util/AlphContent.java Tue Apr 15 15:10:10 2003
@@ -13,60 +13,46 @@
/** Help class to work with Alph
*/
public class AlphContent {
-public static final String rcsid = "$Id: AlphContent.java,v 1.5 2003/04/15
15:09:22 tjl Exp $";
+public static final String rcsid = "$Id: AlphContent.java,v 1.6 2003/04/15
19:10:10 tjl Exp $";
private static void pa(String s) { System.out.println("AlphContent: "+s); }
-
-
-
-
- protected Map contents = new HashMap();
- private SpanMaker spanMaker;
- private Enfilade1D.Maker enfMaker;
//private XuIndexer xuIndex;
private Fen fen;
- public AlphContent(SpanMaker spanMaker, Enfilade1D.Maker enfMaker,
- Fen fen) {
- this.spanMaker = spanMaker;
- this.enfMaker = enfMaker;
+ public AlphContent( Fen fen) {
this.fen = fen;
}
public String getText(Object node) {
Enfilade1D enf = fen.txt.get(node);
- if(enf == null) return "";
return enf.makeString();
}
- public void setText(Object node, String s) {
- fen.txt.set(node, enfMaker.makeEnfilade(spanMaker.makeTextSpan(s)));
+ public void setText(Object node, String s, boolean user) {
+ fen.txt.set(node, fen.enfMaker.makeEnfilade(
+ (user ? fen.userSpanMaker : fen.fakeSpanMaker)
+ .makeTextSpan(s)));
}
- public void insertText(Object node, int ind, String s) {
+ public void insertText(Object node, int ind, String s, boolean user) {
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));
-
- fen.txt.set(node, enf);
- } else {
- setText(node, s);
- }
+ Enfilade1D enf = old.sub(0, ind);
+ enf = enf.plus(
+ (user ? fen.userSpanMaker : fen.fakeSpanMaker)
+ .makeTextSpan(s));
+ enf = enf.plus(old.sub(ind));
+
+ fen.txt.set(node, enf);
}
public void deleteText(Object node, int begin, int end) {
Enfilade1D old = fen.txt.get(node);
+ Enfilade1D enf = old.sub(0, begin);
+ enf = enf.plus(old.sub(end));
- if(old != null) {
- Enfilade1D enf = old.sub(0, begin);
- enf = enf.plus(old.sub(end));
-
- fen.txt.set(node, enf);
- }
+ fen.txt.set(node, enf);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire Fen.java modules/pp/PPActio...,
Tuomas J. Lukka <=