[Gzz-commits] fenfire docs/design_SpanImages.rst org/fenfire/...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/06/11 12:55:09

Modified files:
        docs           : design_SpanImages.rst 
        org/fenfire/spanimages: SpanImageFactory.java 
        org/fenfire/spanimages/gl: MuxSpanImageFactory.java 

Log message:
        Complete mux class

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/design_SpanImages.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/SpanImageFactory.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/MuxSpanImageFactory.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/docs/design_SpanImages.rst
diff -u fenfire/docs/design_SpanImages.rst:1.1 
fenfire/docs/design_SpanImages.rst:1.2
--- fenfire/docs/design_SpanImages.rst:1.1      Wed Jun 11 08:53:34 2003
+++ fenfire/docs/design_SpanImages.rst  Wed Jun 11 12:55:08 2003
@@ -165,7 +165,7 @@
 
     vertically(80, xx, PageScrollBlockImager, ImageScrollBlockImager);
 
-    horizontally(200, yy, ScrollBlockImager, xx, SingleImage);
+    horizontally(150, yy, ScrollBlockImager, xx, SingleImage);
 
     vertically(80, zz, SingleImage, org.nongnu.libvob.gl.MipzipLoader);
 
Index: fenfire/org/fenfire/spanimages/SpanImageFactory.java
diff -u fenfire/org/fenfire/spanimages/SpanImageFactory.java:1.1 
fenfire/org/fenfire/spanimages/SpanImageFactory.java:1.2
--- fenfire/org/fenfire/spanimages/SpanImageFactory.java:1.1    Wed Jun 11 
08:53:34 2003
+++ fenfire/org/fenfire/spanimages/SpanImageFactory.java        Wed Jun 11 
12:55:08 2003
@@ -8,7 +8,6 @@
  * The backend of this interface takes care of all caching and other
  * operations necessary.
  */
-
 public abstract class SpanImageFactory {
     public static SpanImageFactory getDefaultInstance() {
        return null;
Index: fenfire/org/fenfire/spanimages/gl/MuxSpanImageFactory.java
diff -u fenfire/org/fenfire/spanimages/gl/MuxSpanImageFactory.java:1.1 
fenfire/org/fenfire/spanimages/gl/MuxSpanImageFactory.java:1.2
--- fenfire/org/fenfire/spanimages/gl/MuxSpanImageFactory.java:1.1      Wed Jun 
11 08:53:34 2003
+++ fenfire/org/fenfire/spanimages/gl/MuxSpanImageFactory.java  Wed Jun 11 
12:55:09 2003
@@ -3,9 +3,18 @@
 package org.fenfire.spanimages;
 import org.nongnu.alph.*;
 
+/** A spanimagefactory that redirects pageimage and image spans
+ * to different factories.
+ */
 public class MuxSpanImageFactory extends SpanImageFactory {
-    SpanImageFactory imageFactory;
-    SpanImageFactory pageImageFactory;
+    private final SpanImageFactory imageFactory;
+    private final SpanImageFactory pageImageFactory;
+
+    public MuxSpanImageFactory(SpanImageFactory imageFactory,
+                               SpanImageFactory pageImageFactory) {
+       this.imageFactory = imageFactory;
+       this.pageImageFactory = pageImageFactory;
+    }
 
     public SpanImageVob getSpanImageVob(ImageSpan s) {
        if(s instanceof PageImageSpan)