[Gzz-commits] fenfire/org/fenfire/view RSTText.test

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/09 09:12:57

Modified files:
        org/fenfire/view: RSTText.test 

Log message:
        clean a bit

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/RSTText.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/RSTText.test
diff -u fenfire/org/fenfire/view/RSTText.test:1.4 
fenfire/org/fenfire/view/RSTText.test:1.5
--- fenfire/org/fenfire/view/RSTText.test:1.4   Fri May  9 09:11:45 2003
+++ fenfire/org/fenfire/view/RSTText.test       Fri May  9 09:12:57 2003
@@ -18,28 +18,14 @@
     fail: GL
     """
     vs = gfx.getvs()
-
-    pool = storm.impl.TransientPool(java.util.HashSet())
-    myalph = alph.impl.StormAlph(pool)
-    sc = myalph.addFile(java.io.File('../alph/testdata/test1.pdf'), 
'application/pdf')
-    enfMaker = alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()
     
     # Create fen with swamps.
-    fen = ff.Fen()
-    fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
-    fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
-    fen.txtfunc = fen.txt.getNodeFunction()
-    fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
+    fen = ff.test.fen.newFen()
     rst = ff.modules.pp.RSTActionsImpl(fen)
 
     textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
     textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 1)
-    pagenodeview = ff.view.PageNodeView(fen.txtfunc)
-    dispnodeview = ff.view.DispatchingNodeView(fen.txtfunc,
-                                               textnodeview,
-                                               pagenodeview)
-    nodeview = ff.swamp.CachedNodeFunction(50, fen.constgraph, dispnodeview);
-    view = ff.view.CanvasView2D(fen, nodeview)
+    view = ff.view.CanvasView2D(fen, textnodeview)
     view.cull = 1
     paperview = ff.view.PaperView2D(gfx.win, view)
 
@@ -53,7 +39,7 @@
     mainNode = ff.view.buoy.MainNode2D(canvas, paperview)
 
     # set context...
-    context = ff.view.FenPDFContext(fen, rst, nodeview)
+    context = ff.view.FenPDFContext(fen, rst, textnodeview)
     context.setAccursed(note)
     context.setRSTNode(senten)
     context.setCursorOffset(3)
@@ -66,7 +52,7 @@
         mainNode.keystroke('Space')
         mainNode.keystroke('Space')
         mainNode.keystroke('Return')
-    rst.util.generateBasicSpatialCoords(canvas, nodeview)
+    rst.util.generateBasicSpatialCoords(canvas, textnodeview)
 
     vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.green))
     into = vs.orthoBoxCS(0, "FocusFrame", 0,