[Gzz-commits] gzz gzz/media/impl/Enfilade1DImpl.java gzz/modu...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/07 19:56:56

Modified files:
        gzz/media/impl : Enfilade1DImpl.java 
        gzz/modules/email: EmailCellMaker.java 
        test/gzz/impl  : saving.test 

Log message:
        Should work now, except that we're still missing a test for 
PermanentTextScroll.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/Enfilade1DImpl.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/EmailCellMaker.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/impl/saving.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gzz/gzz/media/impl/Enfilade1DImpl.java
diff -u gzz/gzz/media/impl/Enfilade1DImpl.java:1.11 
gzz/gzz/media/impl/Enfilade1DImpl.java:1.12
--- gzz/gzz/media/impl/Enfilade1DImpl.java:1.11 Tue Oct  1 09:10:18 2002
+++ gzz/gzz/media/impl/Enfilade1DImpl.java      Sat Dec  7 19:56:55 2002
@@ -29,7 +29,7 @@
 /** A simple tree implementation of enfilades.
  */
 public class Enfilade1DImpl implements Enfilade1D {
-static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.11 2002/10/01 
13:10:18 benja Exp $";
+static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.12 2002/12/08 
00:56:55 benja Exp $";
 
     /** The char used to represent non-textual spans.
      */
@@ -312,6 +312,9 @@
         Object last = i.next();
         while(i.hasNext()) {
             Object next = i.next();
+           if(next instanceof Span1D && ((Span1D)next).length() < 1)
+               continue;
+
             if(next instanceof Span1D && last instanceof Span1D) {
                 Span1D app = ((Span1D)last).append((Span1D)next);
                 if(app != null) {
Index: gzz/gzz/modules/email/EmailCellMaker.java
diff -u gzz/gzz/modules/email/EmailCellMaker.java:1.2 
gzz/gzz/modules/email/EmailCellMaker.java:1.3
--- gzz/gzz/modules/email/EmailCellMaker.java:1.2       Wed Nov 27 20:14:31 2002
+++ gzz/gzz/modules/email/EmailCellMaker.java   Sat Dec  7 19:56:56 2002
@@ -20,19 +20,27 @@
                Cell fromCell = c.N(d_contain,1);
                Enfilade1D fromText = mail.getFrom();
                
((VStreamCellTexter)space.getCellTexter()).setEnfilade(fromCell, fromText);
+               fromCell.insertText(0, "From: ");
+               fromCell.insertText(fromCell.t().length(), insertText("\n"))
                Dim d_contain_list = space.getDim(Ids.d_contain_list);
 
                Cell toCell = fromCell.N(d_contain_list,1);
                Enfilade1D toText = mail.getTo();
                ((VStreamCellTexter)space.getCellTexter()).setEnfilade(toCell, 
toText);
+               toCell.insertText(0, "To: ");
+               toCell.insertText(toCell.t().length(), insertText("\n"))
 
                Cell dateCell = toCell.N(d_contain_list,1);
                Enfilade1D dateText = mail.getDate();
                
((VStreamCellTexter)space.getCellTexter()).setEnfilade(dateCell, dateText);
+               dateCell.insertText(0, "Date: ");
+               dateCell.insertText(dateCell.t().length(), insertText("\n"))
 
                Cell subCell = dateCell.N(d_contain_list,1);
                Enfilade1D subText = mail.getSubject();
                ((VStreamCellTexter)space.getCellTexter()).setEnfilade(subCell, 
subText);
+               subCell.insertText(0, "Subject: ");
+               subCell.insertText(subCell.t().length(), insertText("\n\n"))
 
                Cell bodyCell = subCell.N(d_contain_list,1);
                Enfilade1D bodyText = mail.getBody();
Index: gzz/test/gzz/impl/saving.test
diff -u gzz/test/gzz/impl/saving.test:1.11 gzz/test/gzz/impl/saving.test:1.12
--- gzz/test/gzz/impl/saving.test:1.11  Sat Dec  7 18:40:32 2002
+++ gzz/test/gzz/impl/saving.test       Sat Dec  7 19:56:56 2002
@@ -104,8 +104,10 @@
     c.insertText(0, "f")
     c.insertText(1, "oo")
     c.insertText(3, "bar")
+    c.insertText(3, ""); # empty spans must be removed, too
 
     assert c.t() == "foobar"
+    assert space.getCellTexter().getEnfilade(c, None).getList().size() == 4
 
     v = space.getSlicer().export(space.getSlicer().getSlice0())
     enf = v.contents.get(c.getId())