[Gzz-commits] gzz gzz/modules/email/EmailCellMaker.java lava/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/09 14:01:14

Modified files:
        gzz/modules/email: EmailCellMaker.java 
        lava/gzz/potion/potions: Hop.java 
        test/gzz/modules/email: cellmaker.test 

Log message:
        more

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/EmailCellMaker.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/Hop.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/modules/email/cellmaker.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/email/EmailCellMaker.java
diff -u gzz/gzz/modules/email/EmailCellMaker.java:1.4 
gzz/gzz/modules/email/EmailCellMaker.java:1.5
--- gzz/gzz/modules/email/EmailCellMaker.java:1.4       Sat Dec  7 20:06:08 2002
+++ gzz/gzz/modules/email/EmailCellMaker.java   Mon Dec  9 14:01:13 2002
@@ -5,45 +5,80 @@
 
 public class EmailCellMaker {
 
-       public void makeCells(EmailInStorm mail,Space space) {
-               Cell home = space.getHomeCell();
+        public void makeCells(EmailInStorm mail,Space space) {
+                Cell home = space.getHomeCell();
 
-               Cell subjectList = space.getCell(Ids.c_email_subject);
-               Cell fromList = space.getCell(Ids.c_email_from);
-               Cell toList = space.getCell(Ids.c_email_to);
-               Cell dateList = space.getCell(Ids.c_email_date);
-               Cell bodyList = space.getCell(Ids.c_email_body);
-
-               Dim d_email =space.getDim(Ids.d_email);
-               Cell c = home.N(d_email,1);
-               Dim d_contain = space.getDim(Ids.d_contain);
-               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(), "\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(), "\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(), "\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(), "\n\n");
-
-               Cell bodyCell = subCell.N(d_contain_list,1);
-               Enfilade1D bodyText = mail.getBody();
-               
((VStreamCellTexter)space.getCellTexter()).setEnfilade(bodyCell, bodyText);
+                Cell subjectList = space.getCell(Ids.c_email_subject);
+                Cell fromList = space.getCell(Ids.c_email_from);
+                Cell toList = space.getCell(Ids.c_email_to);
+                Cell dateList = space.getCell(Ids.c_email_date);
+                Cell bodyList = space.getCell(Ids.c_email_body);
+
+                Dim d_email =space.getDim(Ids.d_email);
+                Dim d_2 = space.getDim(Ids.d_2);
+                Dim d_contain = space.getDim(Ids.d_contain);
+                Dim d_contain_list = space.getDim(Ids.d_contain_list);
+
+                Cell c = home.N(d_email,1);
+
+                Cell subCell = c.N(d_contain,1);
+                Enfilade1D subText = mail.getSubject();
+                
((VStreamCellTexter)space.getCellTexter()).setEnfilade(subCell, subText);
+                subCell.insertText(0, "Subject: ");
+                subCell.insertText(subCell.t().length(),"\n");
+                sortCell(d_2, subCell, subjectList);
+
+                Cell fromCell = subCell.N(d_contain_list,1);
+                Enfilade1D fromText = mail.getFrom();
+                
((VStreamCellTexter)space.getCellTexter()).setEnfilade(fromCell, fromText);
+                fromCell.insertText(0, "From: ");
+                fromCell.insertText(fromCell.t().length(), "\n");
+                sortCell(d_2, fromCell, fromList);
+
+                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(), "\n");
+                sortCell(d_2, toCell, toList);
+
+                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(), "\n\n");
+                sortCell(d_2, dateCell, dateList);
+
+                Cell bodyCell = dateCell.N(d_contain_list,1);
+                Enfilade1D bodyText = mail.getBody();
+                
((VStreamCellTexter)space.getCellTexter()).setEnfilade(bodyCell, bodyText);
+                sortCell(d_2, bodyCell, bodyList);
+        }
+
+       public void sortCell(Dim d_2, Cell start, Cell list){
+                String s1 = start.t().toLowerCase();
+               Cell d = list.s(d_2,1);
+               if(d==null){
+                       start.connect(d_2,-1,list);
+               }
+               else{
+                       while(d != null){
+                               String s2 = d.t().toLowerCase();
+                               int j = s1.compareTo(s2);
+                               if(j<=0){
+                                       d.insert(d_2,-1,start);
+                                       d = null;
+                               }
+                               else{
+                                       if(d.s(d_2,1)==null){
+                                               start.connect(d_2,-1,d);
+                                               d = null;
+                                       }
+                                       else{
+                                               d = d.s(d_2,1);
+                                       }
+                               }
+                       }
+               }
        }
 }
Index: gzz/lava/gzz/potion/potions/Hop.java
diff -u gzz/lava/gzz/potion/potions/Hop.java:1.1 
gzz/lava/gzz/potion/potions/Hop.java:1.2
--- gzz/lava/gzz/potion/potions/Hop.java:1.1    Tue Dec  3 16:58:10 2002
+++ gzz/lava/gzz/potion/potions/Hop.java        Mon Dec  9 14:01:14 2002
@@ -1,5 +1,6 @@
 //(c):Nico Lehmann
-package gzz.potion;
+package gzz.potion.potions;
+import gzz.potion.*;
 import java.util.*;
 import gzz.zzutil.*;
 import gzz.vob.linebreaking.HChain;
Index: gzz/test/gzz/modules/email/cellmaker.test
diff -u gzz/test/gzz/modules/email/cellmaker.test:1.2 
gzz/test/gzz/modules/email/cellmaker.test:1.3
--- gzz/test/gzz/modules/email/cellmaker.test:1.2       Wed Nov 27 20:14:31 2002
+++ gzz/test/gzz/modules/email/cellmaker.test   Mon Dec  9 14:01:14 2002
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (c) 2002, Benja Fallenstein
 # 
 # You may use and distribute under the terms of either the GNU Lesser
@@ -20,9 +20,6 @@
 from test.tools.tools import *
 
 def testEmailCellMaker():
-    """
-    fail: *
-    """
     sp = gzz.impl.ModularSpace(*spaceArgList())
     test = gzz.modules.email.EmailCellMakerTest()
     test.test(sp)