[Gzz-commits] alph/org/nongnu/alph/impl FakeTextSpan.java Scr...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/06 04:24:06

Modified files:
        org/nongnu/alph/impl: FakeTextSpan.java ScrollBlockManager.java 
                              URN5TextSpan.java 
Added files:
        org/nongnu/alph/impl: URN5SpanMaker.java 

Log message:
        Oops... now things compile again...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/URN5SpanMaker.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/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/impl/ScrollBlockManager.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/URN5TextSpan.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/impl/FakeTextSpan.java
diff -u alph/org/nongnu/alph/impl/FakeTextSpan.java:1.1 
alph/org/nongnu/alph/impl/FakeTextSpan.java:1.2
--- alph/org/nongnu/alph/impl/FakeTextSpan.java:1.1     Tue Mar 25 09:36:12 2003
+++ alph/org/nongnu/alph/impl/FakeTextSpan.java Sun Apr  6 04:24:06 2003
@@ -38,7 +38,7 @@
  */
 
 public class FakeTextSpan implements TextSpan, java.io.Serializable {
-public static final String rcsid = "$Id: FakeTextSpan.java,v 1.1 2003/03/25 
14:36:12 tjl Exp $";
+public static final String rcsid = "$Id: FakeTextSpan.java,v 1.2 2003/04/06 
08:24:06 tjl Exp $";
 
     String text;
     transient FakeTextScrollBlock sb;
@@ -77,6 +77,8 @@
 
     public String toString() { return "FAKESPAN "+text; }
     public boolean intersects(Span s) { return false; }
+
+    public String getScrollId() { return ""; }
 
     protected class FakeTextScrollBlock implements TextScrollBlock {
        /*
Index: alph/org/nongnu/alph/impl/ScrollBlockManager.java
diff -u alph/org/nongnu/alph/impl/ScrollBlockManager.java:1.1 
alph/org/nongnu/alph/impl/ScrollBlockManager.java:1.2
--- alph/org/nongnu/alph/impl/ScrollBlockManager.java:1.1       Tue Mar 25 
09:36:12 2003
+++ alph/org/nongnu/alph/impl/ScrollBlockManager.java   Sun Apr  6 04:24:06 2003
@@ -40,7 +40,7 @@
  */
 
 public class ScrollBlockManager {
-String rcsid = "$Id: ScrollBlockManager.java,v 1.1 2003/03/25 14:36:12 tjl Exp 
$";
+String rcsid = "$Id: ScrollBlockManager.java,v 1.2 2003/04/06 08:24:06 tjl Exp 
$";
     public static boolean dbg = false;
     final static void p(String s) { if(dbg) System.out.println(s); }
     final static void pa(String s) { System.out.println(s); }
@@ -60,6 +60,7 @@
        transient MediaserverScrollBlock sb;
        SpanBase(MediaserverScrollBlock sb) { this.sb = sb; }
        public ScrollBlock getScrollBlock() { return sb; }
+       public String getScrollId() { return sb.getID(); }
 
        private void writeObject(java.io.ObjectOutputStream out)
                                 throws java.io.IOException {
Index: alph/org/nongnu/alph/impl/URN5TextSpan.java
diff -u alph/org/nongnu/alph/impl/URN5TextSpan.java:1.1 
alph/org/nongnu/alph/impl/URN5TextSpan.java:1.2
--- alph/org/nongnu/alph/impl/URN5TextSpan.java:1.1     Sun Apr  6 04:15:05 2003
+++ alph/org/nongnu/alph/impl/URN5TextSpan.java Sun Apr  6 04:24:06 2003
@@ -30,7 +30,7 @@
     }
 
     public boolean intersects(Span s) {
-       if(!(s instanceof URN5Span)) return false;
+       if(!(s instanceof URN5TextSpan)) return false;
        URN5TextSpan other = (URN5TextSpan)s;
        // Because urn5 is interned, can do this
        if(other.urn5 != urn5) return false;
@@ -84,7 +84,7 @@
     }
 
     public Span1D append(Span s) {
-       if(!(s instanceof URN5Span)) return null;
+       if(!(s instanceof URN5TextSpan)) return null;
        URN5TextSpan other = (URN5TextSpan)s;
        if(other.urn5 != urn5) return null;
        if(offset + str.length() != other.offset) return null;