[Gzz-commits] alph/org/nongnu/alph/impl AbstractScrollBlock.j...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/21 15:55:52

Modified files:
        org/nongnu/alph/impl: AbstractScrollBlock.java 
                              PermanentTextScroll.java 
                              TransientTextScroll.java stormalph.test 

Log message:
        TEST PASSES

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/AbstractScrollBlock.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PermanentTextScroll.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/TransientTextScroll.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/stormalph.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/impl/AbstractScrollBlock.java
diff -u alph/org/nongnu/alph/impl/AbstractScrollBlock.java:1.3 
alph/org/nongnu/alph/impl/AbstractScrollBlock.java:1.4
--- alph/org/nongnu/alph/impl/AbstractScrollBlock.java:1.3      Mon Apr 21 
12:56:05 2003
+++ alph/org/nongnu/alph/impl/AbstractScrollBlock.java  Mon Apr 21 15:55:52 2003
@@ -43,17 +43,20 @@
     }
 
 
-    static final String gzz1 = "application/x-gzigzag-GZZ1";
+    static final String gzz1 = "application/x-gzigzag-gzz1";
+    static final String plainText = "text/plain;charset=utf-8";
+
     public static ScrollBlock createBlock(Alph alph, Object id, 
                                String ct) {
 
+       ct = ct.toLowerCase();
        int ind = ct.indexOf('/');
        if(ind < 0)
         throw new IllegalArgumentException("Can't parse mediatype "+ ct);
        String type = ct.substring(0,ind);
 
        if(type.equals("text") &&
-           !ct.equals("text/plain; charset=UTF-8"))
+           !ct.equals(plainText))
             throw new IllegalArgumentException(
                     "Unknown text mime type '"+ct+"'");
 
Index: alph/org/nongnu/alph/impl/PermanentTextScroll.java
diff -u alph/org/nongnu/alph/impl/PermanentTextScroll.java:1.5 
alph/org/nongnu/alph/impl/PermanentTextScroll.java:1.6
--- alph/org/nongnu/alph/impl/PermanentTextScroll.java:1.5      Mon Apr 21 
14:50:35 2003
+++ alph/org/nongnu/alph/impl/PermanentTextScroll.java  Mon Apr 21 15:55:52 2003
@@ -38,7 +38,7 @@
 public class PermanentTextScroll extends AbstractScrollBlock
        implements TextScrollBlock
                   {
-String rcsid = "$Id: PermanentTextScroll.java,v 1.5 2003/04/21 18:50:35 tjl 
Exp $";
+String rcsid = "$Id: PermanentTextScroll.java,v 1.6 2003/04/21 19:55:52 tjl 
Exp $";
 
     char[] chars;
     boolean loadingFailed;
@@ -60,8 +60,8 @@
         // Note: for the legacy string content to work, we need to be able
         // to load GZZ1 diffs as text blocks (see GZZ1Handler.LegacyContent
         // javadoc for more info).
-       if(!contentType.equals("text/plain; charset=UTF-8") &&
-          !contentType.equals("application/x-gzigzag-GZZ1") &&
+       if(!contentType.equals(AbstractScrollBlock.plainText) &&
+          !contentType.equals(AbstractScrollBlock.gzz1) &&
           !contentType.equals("message/rfc822")) {
            throw new Error("Unknown text block content type '"+
                        contentType+"'");
Index: alph/org/nongnu/alph/impl/TransientTextScroll.java
diff -u alph/org/nongnu/alph/impl/TransientTextScroll.java:1.5 
alph/org/nongnu/alph/impl/TransientTextScroll.java:1.6
--- alph/org/nongnu/alph/impl/TransientTextScroll.java:1.5      Mon Apr 21 
14:50:35 2003
+++ alph/org/nongnu/alph/impl/TransientTextScroll.java  Mon Apr 21 15:55:52 2003
@@ -35,10 +35,10 @@
 
 public class TransientTextScroll extends AbstractScrollBlock
        implements TextScrollBlock, ScrollBlockManager.StormSaveableScrollBlock 
{
-String rcsid = "$Id: TransientTextScroll.java,v 1.5 2003/04/21 18:50:35 tjl 
Exp $";
+String rcsid = "$Id: TransientTextScroll.java,v 1.6 2003/04/21 19:55:52 tjl 
Exp $";
 
     public TransientTextScroll() {
-       super(null, null, "text/plain; charset=UTF-8");
+       super(null, null, AbstractScrollBlock.plainText);
     }
 
     boolean finalized = false;
Index: alph/org/nongnu/alph/impl/stormalph.test
diff -u alph/org/nongnu/alph/impl/stormalph.test:1.1 
alph/org/nongnu/alph/impl/stormalph.test:1.2
--- alph/org/nongnu/alph/impl/stormalph.test:1.1        Mon Apr 21 15:33:30 2003
+++ alph/org/nongnu/alph/impl/stormalph.test    Mon Apr 21 15:55:52 2003
@@ -18,11 +18,9 @@
     f.write(string)
     f.close()
 
-    id = salph.addFile(file, "text/plain; charset=UTF8")
+    sb = salph.addFile(file, "text/plain;charset=UTF-8")
 
-    sb = salph.getScrollBlock(id)
-
-    assert teststring == sb.getCurrent().getText()
+    assert string == sb.getCurrent().getText()