[ff-cvs] alph/org/nongnu/alph AudioSpan.java Enfilade1D....

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/10/31 02:23:43

Modified files:
        org/nongnu/alph: AudioSpan.java Enfilade1D.java 
                         FakeTextSpan.java ImmutableException.java 
                         ScrollBlock.java Span.java Span1D.java 
                         TString.java TextScrollBlock.java TextSpan.java 
                         VideoSpan.java tstring.test 
        org/nongnu/alph/impl: AbstractSpan.java AbstractSpan1D.java 
                              Enfilade1DImpl.java PageImageScroll.java 
                              PermanentTextScroll.java 
                              ScrollBlockManager.java 
                              SimpleImageScroll.java 
                              TransientTextScroll.java 

Log message:
        sync

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/AudioSpan.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/Enfilade1D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/FakeTextSpan.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/ImmutableException.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/ScrollBlock.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/Span.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/Span1D.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/TString.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/TextScrollBlock.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/TextSpan.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/VideoSpan.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/tstring.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/AbstractSpan.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/AbstractSpan1D.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/Enfilade1DImpl.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PageImageScroll.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PermanentTextScroll.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/ScrollBlockManager.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/SimpleImageScroll.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/TransientTextScroll.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/AudioSpan.java
diff -u alph/org/nongnu/alph/AudioSpan.java:1.2 
alph/org/nongnu/alph/AudioSpan.java:1.3
--- alph/org/nongnu/alph/AudioSpan.java:1.2     Tue Mar 25 07:25:29 2003
+++ alph/org/nongnu/alph/AudioSpan.java Fri Oct 31 02:23:42 2003
@@ -39,7 +39,6 @@
  */
 
 public interface AudioSpan extends Span1D {
-String rcsid = "$Id: AudioSpan.java,v 1.2 2003/03/25 12:25:29 tjl Exp $";
 
 
 }
Index: alph/org/nongnu/alph/Enfilade1D.java
diff -u alph/org/nongnu/alph/Enfilade1D.java:1.2 
alph/org/nongnu/alph/Enfilade1D.java:1.3
--- alph/org/nongnu/alph/Enfilade1D.java:1.2    Tue Mar 25 07:25:29 2003
+++ alph/org/nongnu/alph/Enfilade1D.java        Fri Oct 31 02:23:42 2003
@@ -47,7 +47,6 @@
  * with log(L) efficiency.
  */
 public interface Enfilade1D extends java.io.Serializable {
-String rcsid = "$Id: Enfilade1D.java,v 1.2 2003/03/25 12:25:29 tjl Exp $";
 
     static public interface Maker {
        Enfilade1D makeEnfilade(Span span);
Index: alph/org/nongnu/alph/FakeTextSpan.java
diff -u alph/org/nongnu/alph/FakeTextSpan.java:1.1 
alph/org/nongnu/alph/FakeTextSpan.java:1.2
--- alph/org/nongnu/alph/FakeTextSpan.java:1.1  Sat Oct  4 07:58:52 2003
+++ alph/org/nongnu/alph/FakeTextSpan.java      Fri Oct 31 02:23:42 2003
@@ -38,7 +38,6 @@
  */
 
 public class FakeTextSpan implements TextSpan, java.io.Serializable {
-public static final String rcsid = "$Id: FakeTextSpan.java,v 1.1 2003/10/04 
11:58:52 tjl Exp $";
 
     String text;
     transient char[] textarr;
Index: alph/org/nongnu/alph/ImmutableException.java
diff -u alph/org/nongnu/alph/ImmutableException.java:1.2 
alph/org/nongnu/alph/ImmutableException.java:1.3
--- alph/org/nongnu/alph/ImmutableException.java:1.2    Tue Mar 25 09:36:12 2003
+++ alph/org/nongnu/alph/ImmutableException.java        Fri Oct 31 02:23:42 2003
@@ -35,7 +35,6 @@
  */
 
 public class ImmutableException extends Error {
-public static final String rcsid = "$Id: ImmutableException.java,v 1.2 
2003/03/25 14:36:12 tjl Exp $";
        public ImmutableException() { super(); }
        public ImmutableException(String s) { super(s); }
 }
Index: alph/org/nongnu/alph/ScrollBlock.java
diff -u alph/org/nongnu/alph/ScrollBlock.java:1.6 
alph/org/nongnu/alph/ScrollBlock.java:1.7
--- alph/org/nongnu/alph/ScrollBlock.java:1.6   Tue Apr 22 15:42:12 2003
+++ alph/org/nongnu/alph/ScrollBlock.java       Fri Oct 31 02:23:42 2003
@@ -37,7 +37,6 @@
  */
 
 public interface ScrollBlock {
-String rcsid = "$Id: ScrollBlock.java,v 1.6 2003/04/22 19:42:12 tjl Exp $";
 
     /** Get the content type of this scrollblock.
      */
Index: alph/org/nongnu/alph/Span.java
diff -u alph/org/nongnu/alph/Span.java:1.4 alph/org/nongnu/alph/Span.java:1.5
--- alph/org/nongnu/alph/Span.java:1.4  Sat Oct  4 07:58:52 2003
+++ alph/org/nongnu/alph/Span.java      Fri Oct 31 02:23:42 2003
@@ -62,7 +62,6 @@
  */
 
 public interface Span {
-String rcsid = "$Id: Span.java,v 1.4 2003/10/04 11:58:52 tjl Exp $";
 
     /** Get a string representation of this span.
      * For text spans, this representation is <em>not</em>
Index: alph/org/nongnu/alph/Span1D.java
diff -u alph/org/nongnu/alph/Span1D.java:1.3 
alph/org/nongnu/alph/Span1D.java:1.4
--- alph/org/nongnu/alph/Span1D.java:1.3        Sat Oct  4 07:58:52 2003
+++ alph/org/nongnu/alph/Span1D.java    Fri Oct 31 02:23:42 2003
@@ -34,7 +34,6 @@
  */
 
 public interface Span1D extends Span {
-String rcsid = "$Id: Span1D.java,v 1.3 2003/10/04 11:58:52 tjl Exp $";
 
     /** Get the offset of this span inside the scrollblock,
      *  in natural units starting at zero.
Index: alph/org/nongnu/alph/TString.java
diff -u alph/org/nongnu/alph/TString.java:1.1 
alph/org/nongnu/alph/TString.java:1.2
--- alph/org/nongnu/alph/TString.java:1.1       Sat Oct  4 07:58:52 2003
+++ alph/org/nongnu/alph/TString.java   Fri Oct 31 02:23:42 2003
@@ -2,7 +2,7 @@
 
 package org.nongnu.alph;
 
-/** A Transcludable String - the most important user-visible
+/** (INCOMPLETE) A Transcludable String - the most important user-visible
  * class in Alph Lite.
  * A transcludable replacement for the java.lang.String object.
  * <p>
@@ -21,6 +21,7 @@
 
     /** The spans that this TString consists of.
      * The value null is not allowed.
+     * INVARIANT: no adjacent spans can be append()ed to each other.
      */
     private final TextSpan[] spans;
 
@@ -111,6 +112,25 @@
        return new TString(newSpans);
     }
 
+    /** As String.charAt(int).
+     */
+    public char charAt(int offset) {
+       // Can't rely on getSpanIndex check since we throw
+       // error on the *first* pos beyond.
+       if(offset < 0 || offset >= offsets[offsets.length-1]) 
+           throw new StringIndexOutOfBoundsException(offset);
+       int spi = getSpanIndex(offset);
+       return spans[spi].getText().charAt(offset - offsets[spi]);
+    }
+
+    /** As String.length().
+     */
+    public int length() {
+       return offsets[offsets.length-1];
+    }
+
+    /** Return this TString as a non-transcludable string.
+     */
     public String toString() {
        StringBuffer buf = new StringBuffer();
        for(int i=0; i<spans.length; i++) {
Index: alph/org/nongnu/alph/TextScrollBlock.java
diff -u alph/org/nongnu/alph/TextScrollBlock.java:1.2 
alph/org/nongnu/alph/TextScrollBlock.java:1.3
--- alph/org/nongnu/alph/TextScrollBlock.java:1.2       Tue Mar 25 07:25:29 2003
+++ alph/org/nongnu/alph/TextScrollBlock.java   Fri Oct 31 02:23:42 2003
@@ -32,7 +32,6 @@
  */
 
 public interface TextScrollBlock extends ScrollBlock {
-String rcsid = "$Id: TextScrollBlock.java,v 1.2 2003/03/25 12:25:29 tjl Exp $";
 
     TextSpan append(char ch) throws ImmutableException;
     TextSpan append(String s) throws ImmutableException;
Index: alph/org/nongnu/alph/TextSpan.java
diff -u alph/org/nongnu/alph/TextSpan.java:1.2 
alph/org/nongnu/alph/TextSpan.java:1.3
--- alph/org/nongnu/alph/TextSpan.java:1.2      Tue Mar 25 07:25:29 2003
+++ alph/org/nongnu/alph/TextSpan.java  Fri Oct 31 02:23:42 2003
@@ -33,7 +33,6 @@
  */
 
 public interface TextSpan extends Span1D {
-String rcsid = "$Id: TextSpan.java,v 1.2 2003/03/25 12:25:29 tjl Exp $";
 
     /** Get the string contained in the span.
      */
Index: alph/org/nongnu/alph/VideoSpan.java
diff -u alph/org/nongnu/alph/VideoSpan.java:1.2 
alph/org/nongnu/alph/VideoSpan.java:1.3
--- alph/org/nongnu/alph/VideoSpan.java:1.2     Tue Mar 25 07:25:29 2003
+++ alph/org/nongnu/alph/VideoSpan.java Fri Oct 31 02:23:42 2003
@@ -34,7 +34,6 @@
  */
 
 public interface VideoSpan extends AudioSpan, ImageSpan  {
-String rcsid = "$Id: VideoSpan.java,v 1.2 2003/03/25 12:25:29 tjl Exp $";
 
 
 }
Index: alph/org/nongnu/alph/impl/AbstractSpan.java
diff -u alph/org/nongnu/alph/impl/AbstractSpan.java:1.2 
alph/org/nongnu/alph/impl/AbstractSpan.java:1.3
--- alph/org/nongnu/alph/impl/AbstractSpan.java:1.2     Wed Jun 11 13:50:18 2003
+++ alph/org/nongnu/alph/impl/AbstractSpan.java Fri Oct 31 02:23:42 2003
@@ -33,7 +33,6 @@
  * Simply stores the ScrollBlock.
  */
 abstract public class AbstractSpan implements Span {
-private static final String rcsid = "$Id: AbstractSpan.java,v 1.2 2003/06/11 
17:50:18 tjl Exp $";
 
     protected ScrollBlock scrollBlock;
     public AbstractSpan(ScrollBlock scrollBlock) { 
Index: alph/org/nongnu/alph/impl/AbstractSpan1D.java
diff -u alph/org/nongnu/alph/impl/AbstractSpan1D.java:1.3 
alph/org/nongnu/alph/impl/AbstractSpan1D.java:1.4
--- alph/org/nongnu/alph/impl/AbstractSpan1D.java:1.3   Sat Oct  4 07:58:52 2003
+++ alph/org/nongnu/alph/impl/AbstractSpan1D.java       Fri Oct 31 02:23:42 2003
@@ -32,7 +32,6 @@
 /** An abstract base class for 1D spans.
  */
 abstract class AbstractSpan1D extends AbstractSpan implements Span1D {
-private static final String rcsid = "$Id: AbstractSpan1D.java,v 1.3 2003/10/04 
11:58:52 tjl Exp $";
     public static boolean dbg = false;
     final static void pa(String s) { System.out.println(s); }
 
Index: alph/org/nongnu/alph/impl/Enfilade1DImpl.java
diff -u alph/org/nongnu/alph/impl/Enfilade1DImpl.java:1.1 
alph/org/nongnu/alph/impl/Enfilade1DImpl.java:1.2
--- alph/org/nongnu/alph/impl/Enfilade1DImpl.java:1.1   Tue Mar 25 09:36:12 2003
+++ alph/org/nongnu/alph/impl/Enfilade1DImpl.java       Fri Oct 31 02:23:42 2003
@@ -33,7 +33,6 @@
 /** A simple tree implementation of enfilades.
  */
 public class Enfilade1DImpl implements Enfilade1D {
-static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.1 2003/03/25 
14:36:12 tjl Exp $";
 
     /** The char used to represent non-textual spans.
      */
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.17 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.18
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.17 Tue Aug 26 14:10:41 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Fri Oct 31 02:23:42 2003
@@ -45,7 +45,6 @@
  */
 
 public class PageImageScroll extends AbstractScrollBlock implements 
PageScrollBlock{
-String rcsid = "$Id: PageImageScroll.java,v 1.17 2003/08/26 18:10:41 tjl Exp 
$";
     public static boolean dbg = false;
     final static void pa(String s) { System.out.println(s); }
 
Index: alph/org/nongnu/alph/impl/PermanentTextScroll.java
diff -u alph/org/nongnu/alph/impl/PermanentTextScroll.java:1.6 
alph/org/nongnu/alph/impl/PermanentTextScroll.java:1.7
--- alph/org/nongnu/alph/impl/PermanentTextScroll.java:1.6      Mon Apr 21 
15:55:52 2003
+++ alph/org/nongnu/alph/impl/PermanentTextScroll.java  Fri Oct 31 02:23:42 2003
@@ -38,7 +38,6 @@
 public class PermanentTextScroll extends AbstractScrollBlock
        implements TextScrollBlock
                   {
-String rcsid = "$Id: PermanentTextScroll.java,v 1.6 2003/04/21 19:55:52 tjl 
Exp $";
 
     char[] chars;
     boolean loadingFailed;
Index: alph/org/nongnu/alph/impl/ScrollBlockManager.java
diff -u alph/org/nongnu/alph/impl/ScrollBlockManager.java:1.7 
alph/org/nongnu/alph/impl/ScrollBlockManager.java:1.8
--- alph/org/nongnu/alph/impl/ScrollBlockManager.java:1.7       Mon Apr 21 
14:50:35 2003
+++ alph/org/nongnu/alph/impl/ScrollBlockManager.java   Fri Oct 31 02:23:42 2003
@@ -41,7 +41,6 @@
  */
 
 public class ScrollBlockManager {
-String rcsid = "$Id: ScrollBlockManager.java,v 1.7 2003/04/21 18:50:35 tjl Exp 
$";
     public static boolean dbg = false;
     final static void pa(String s) { System.out.println(s); }
 
Index: alph/org/nongnu/alph/impl/SimpleImageScroll.java
diff -u alph/org/nongnu/alph/impl/SimpleImageScroll.java:1.6 
alph/org/nongnu/alph/impl/SimpleImageScroll.java:1.7
--- alph/org/nongnu/alph/impl/SimpleImageScroll.java:1.6        Mon Sep  8 
08:28:29 2003
+++ alph/org/nongnu/alph/impl/SimpleImageScroll.java    Fri Oct 31 02:23:42 2003
@@ -39,7 +39,6 @@
  */
 
 public class SimpleImageScroll extends AbstractScrollBlock implements 
ImageScrollBlock{
-String rcsid = "$Id: SimpleImageScroll.java,v 1.6 2003/09/08 12:28:29 humppake 
Exp $";
 
     int width=-1, height=-1;
 
Index: alph/org/nongnu/alph/impl/TransientTextScroll.java
diff -u alph/org/nongnu/alph/impl/TransientTextScroll.java:1.6 
alph/org/nongnu/alph/impl/TransientTextScroll.java:1.7
--- alph/org/nongnu/alph/impl/TransientTextScroll.java:1.6      Mon Apr 21 
15:55:52 2003
+++ alph/org/nongnu/alph/impl/TransientTextScroll.java  Fri Oct 31 02:23:42 2003
@@ -35,7 +35,6 @@
 
 public class TransientTextScroll extends AbstractScrollBlock
        implements TextScrollBlock, ScrollBlockManager.StormSaveableScrollBlock 
{
-String rcsid = "$Id: TransientTextScroll.java,v 1.6 2003/04/21 19:55:52 tjl 
Exp $";
 
     public TransientTextScroll() {
        super(null, null, AbstractScrollBlock.plainText);
Index: alph/org/nongnu/alph/tstring.test
diff -u alph/org/nongnu/alph/tstring.test:1.1 
alph/org/nongnu/alph/tstring.test:1.2
--- alph/org/nongnu/alph/tstring.test:1.1       Sat Oct  4 07:58:52 2003
+++ alph/org/nongnu/alph/tstring.test   Fri Oct 31 02:23:42 2003
@@ -5,35 +5,43 @@
 
 dbg = 0
 
-def substringComparison(tstr, str, o0, o1, allowExc = 1):
-    if dbg: print "Run: ",tstr,str,o0,o1,allowExc
+def methodComparison(tstr, str, method, params, allowExc = 1):
+    if dbg: print "Run: ",tstr,str,params,allowExc
     exc = 0
     texc = 0
     try:
-       res = str.substring(o0, o1)
+       res = getattr(str, method)(*params)
     except java.lang.Throwable, e:
        #print "Exception",e
        #e.printStackTrace()
        exc = 1
     try:
-       tres = tstr.substring(o0, o1)
+       tres = getattr(tstr, method)(*params)
     except java.lang.Throwable, e:
        texc = 1
        if not exc:
            print "UNEXPECTED Exception",e
            e.printStackTrace()
 
-    assert exc == texc, (tstr, str, o0, o1)
+    assert exc == texc, (tstr, str, params)
     if not exc:
-       assert tres.toString() == res, (tstr, str, o0, o1, tres.toString(), res)
+       if isinstance(tres, TString):
+           assert tres.toString() == res, (tstr, str, params, tres, res)
+       else:
+           assert tres == res, (tstr, str, params, tres, res)
 
 def substringMany(tstr, str):
-    substringComparison(tstr, str, 0, 1, 0)
+    methodComparison(tstr, str, "substring", [0, 1], 0)
     for i in range(-1, str.length() + 2):
        for j in range(-1, str.length() + 2):
-           substringComparison(tstr, str, i, j)
+           methodComparison(tstr, str, "substring", [i, j])
 
-def testSubstring():
+def charAtMany(tstr, str):
+    for i in range(-1, str.length() + 2):
+       methodComparison(tstr, str, "charAt", [i])
+
+
+def testSubstring_Charat_Length():
     str0 = java.lang.String("ABCDE")
     tstr0 = [
        TString.newRICC("ABCDE"),
@@ -45,3 +53,6 @@
 
     for t in tstr0:
        substringMany(t, str0)
+    for t in tstr0:
+       charAtMany(t, str0)
+