[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz media/impl/ScrollBlockManager.java medi...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] gzz/gzz media/impl/ScrollBlockManager.java medi... |
|
Date: |
Wed, 02 Oct 2002 13:29:17 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/10/02 13:29:17
Modified files:
gzz/media/impl : ScrollBlockManager.java
gzz/mediaserver: MediaserverFiler.java
gzz/slices : SliceVersion.java YAMLVersionFormatter.py
Log message:
Fix page span loading
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/ScrollBlockManager.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/MediaserverFiler.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/slices/SliceVersion.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/slices/YAMLVersionFormatter.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: gzz/gzz/media/impl/ScrollBlockManager.java
diff -c gzz/gzz/media/impl/ScrollBlockManager.java:1.5
gzz/gzz/media/impl/ScrollBlockManager.java:1.6
*** gzz/gzz/media/impl/ScrollBlockManager.java:1.5 Tue Aug 13 19:01:27 2002
--- gzz/gzz/media/impl/ScrollBlockManager.java Wed Oct 2 13:29:17 2002
***************
*** 38,44 ****
*/
public class ScrollBlockManager {
! String rcsid = "$Id: ScrollBlockManager.java,v 1.5 2002/08/13 23:01:27 benja
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); }
--- 38,44 ----
*/
public class ScrollBlockManager {
! String rcsid = "$Id: ScrollBlockManager.java,v 1.6 2002/10/02 17:29:17 benja
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); }
***************
*** 329,335 ****
PageSpanBase s = isSamePS(o);
if(s == null) return false;
return super.equals(o) &&
! s.sb == sb &&
s.x == x &&
s.y == y &&
s.w == w &&
--- 329,335 ----
PageSpanBase s = isSamePS(o);
if(s == null) return false;
return super.equals(o) &&
! //s.sb == sb &&
s.x == x &&
s.y == y &&
s.w == w &&
Index: gzz/gzz/mediaserver/MediaserverFiler.java
diff -c gzz/gzz/mediaserver/MediaserverFiler.java:1.10
gzz/gzz/mediaserver/MediaserverFiler.java:1.11
*** gzz/gzz/mediaserver/MediaserverFiler.java:1.10 Tue Oct 1 13:40:36 2002
--- gzz/gzz/mediaserver/MediaserverFiler.java Wed Oct 2 13:29:17 2002
***************
*** 24,29 ****
--- 24,30 ----
import gzz.media.MediaInputStream;
import gzz.media.MediaOutputStream;
+ import gzz.util.CopyUtil;
import gzz.util.Filer;
import gzz.util.HeaderUtil;
import gzz.util.Version;
***************
*** 33,38 ****
--- 34,41 ----
import java.util.*;
public class MediaserverFiler implements Filer {
+ public static boolean dbg = false;
+ private static void pa(String s) { System.out.println(s); }
public static final String versionContentType =
"application/x-GZZ2-version";
public static final String diffContentType =
"application/x-GZZ2-msfiler-diff";
***************
*** 112,122 ****
Version.Diff diff = fmt.readDiff(is);
Version v = diff.applyTo(from);
! if(!id.equals(getVersionId(v, headerTo)))
throw new IOException("Version doesn't match: "+v+"\n"+
"Wanted id = "+id+"\n"+
"Regenerated id = "+getVersionId(v, headerTo)+"\n"+
"Using diff: "+diffId+"\n");
if(hdr != null)
hdr[0] = headerTo;
--- 115,141 ----
Version.Diff diff = fmt.readDiff(is);
Version v = diff.applyTo(from);
! if(!id.equals(getVersionId(v, headerTo))) {
! if(dbg) {
! pa("============= DIFF ===============");
! pa(new
String(CopyUtil.readBytes(diffBlock.getInputStream())));
! pa("==================================");
! pa("Diff: "+diff);
! pa("");
! pa("From: "+from);
! pa("");
! pa("Gives: "+v);
! pa("============== BAD ===============");
! ByteArrayOutputStream bos = new
ByteArrayOutputStream();
! fmt.writeVersion(bos, v);
! pa(new String(bos.toByteArray()));
! pa("==================================");
! }
throw new IOException("Version doesn't match: "+v+"\n"+
"Wanted id = "+id+"\n"+
"Regenerated id = "+getVersionId(v, headerTo)+"\n"+
"Using diff: "+diffId+"\n");
+ }
if(hdr != null)
hdr[0] = headerTo;
***************
*** 195,200 ****
--- 214,224 ----
fmt.writeVersion(bos, v);
ms.addDatum(bos.toByteArray(),
versionContentType, current);
+ if(dbg) {
+ pa("============ CORRECT =============");
+ pa(new String(bos.toByteArray()));
+ pa("==================================");
+ }
t.printStackTrace();
throw new Error("Problem with re-loading: "+t);
}
Index: gzz/gzz/slices/SliceVersion.java
diff -c gzz/gzz/slices/SliceVersion.java:1.4
gzz/gzz/slices/SliceVersion.java:1.5
*** gzz/gzz/slices/SliceVersion.java:1.4 Tue Aug 13 19:01:27 2002
--- gzz/gzz/slices/SliceVersion.java Wed Oct 2 13:29:17 2002
***************
*** 32,38 ****
* @see SliceVersion.Diff
*/
public class SliceVersion implements java.io.Serializable, Version {
! public static final String rcsid = "$Id: SliceVersion.java,v 1.4 2002/08/13
23:01:27 benja Exp $";
public static boolean dbg = true;
private static void pa(String s) { ZZLogger.log(s); }
--- 32,38 ----
* @see SliceVersion.Diff
*/
public class SliceVersion implements java.io.Serializable, Version {
! public static final String rcsid = "$Id: SliceVersion.java,v 1.5 2002/10/02
17:29:17 benja Exp $";
public static boolean dbg = true;
private static void pa(String s) { ZZLogger.log(s); }
***************
*** 268,273 ****
--- 268,278 ----
this.contents = contents;
this.discontents = discontents;
+ }
+
+ public String toString() {
+ return "SliceDiff("+connects+", "+disconnects+", "
+ +contents+", "+discontents+")";
}
}
}
Index: gzz/gzz/slices/YAMLVersionFormatter.py
diff -c gzz/gzz/slices/YAMLVersionFormatter.py:1.7
gzz/gzz/slices/YAMLVersionFormatter.py:1.8
*** gzz/gzz/slices/YAMLVersionFormatter.py:1.7 Wed Sep 4 00:53:48 2002
--- gzz/gzz/slices/YAMLVersionFormatter.py Wed Oct 2 13:29:17 2002
***************
*** 105,111 ****
block = ScrollBlockManager.getTextScrollBlock(ms, id)
spans.add(block.getSpan(*spanDef[2:]))
elif t == 'ImageSpan' or t == 'PageSpan':
! span = ScrollBlockManager.getSpan(ms, id, *spanDef[2:])
else:
raise NotImplementedError("Unknown span type: %s" % (t,))
--- 105,111 ----
block = ScrollBlockManager.getTextScrollBlock(ms, id)
spans.add(block.getSpan(*spanDef[2:]))
elif t == 'ImageSpan' or t == 'PageSpan':
! spans.add(ScrollBlockManager.getSpan(ms, id, *spanDef[2:]))
else:
raise NotImplementedError("Unknown span type: %s" % (t,))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz media/impl/ScrollBlockManager.java medi...,
Benja Fallenstein <=