[Gzz-commits] gzz/gzz/media/impl PageImageScroll.java

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/16 11:13:27

Modified files:
        gzz/media/impl : PageImageScroll.java 

Log message:
        Remove AWT code from PageImageScroll; it's old and didn't work too well 
even then. Publish imageFilename().

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/PageImageScroll.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gzz/media/impl/PageImageScroll.java
diff -c gzz/gzz/media/impl/PageImageScroll.java:1.3 
gzz/gzz/media/impl/PageImageScroll.java:1.4
*** gzz/gzz/media/impl/PageImageScroll.java:1.3 Fri Aug  9 19:02:26 2002
--- gzz/gzz/media/impl/PageImageScroll.java     Mon Sep 16 11:13:27 2002
***************
*** 38,44 ****
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.3 2002/08/09 23:02:26 benja Exp 
$";
      public static boolean dbg = true;
      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 PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.4 2002/09/16 15:13:27 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
***************
*** 53,61 ****
      Mediaserver ms;
      Mediaserver.Id id;
  
-     Image[] pageimages;
- 
- 
      public String getID() { return id.getString(); }
      public Mediaserver.Id saveOrGetId(Mediaserver ms) { return id; }
  
--- 53,58 ----
***************
*** 67,86 ****
      public int hashCode() {
        return getID().hashCode();
      }
- 
-     private Image getPageImage(int page) {
-       if(pageimages == null)
-           pageimages = new Image[pages];
-       if(pageimages[page] == null)
-           try {
-               pageimages[page] =
-                   GlobalToolkit.toolkit.getImage(kludgeFilename(page));
-           } catch (Exception _) {
-               pa("Exception when loading image: "+_);
-           }
-       return pageimages[page];
-     }
- 
      //    Mediaserver.Block block;
  
      public PageImageScroll(Mediaserver ms, Mediaserver.Id id) {
--- 64,69 ----
***************
*** 90,110 ****
        checkLen();
      }
  
!     /** 0-based page.
       */
!     protected String kludgeFilename(int page) {
        return new String(DIR+getID()+"-"+RESOLUTION+"-"+(page+1));
      }
  
!     public void checkLen() {
        int i=0;
!       while(new File(kludgeFilename(i)).exists())
            i++;
        pages = i;
        pa("Checked document of "+i+" pages");
      }
  
!     class SimplePageSpan extends ScrollBlockManager.PageSpanBase implements 
Runnable {
        SimplePageSpan(int p0, int p1, int x, int y, int w, int h) {
            super(PageImageScroll.this, p0, p1, x, y, w, h);
        }
--- 73,106 ----
        checkLen();
      }
  
!     /** Return the image file name for the given, 0-based page.
       */
!     public String imageFilename(int page) {
        return new String(DIR+getID()+"-"+RESOLUTION+"-"+(page+1));
      }
  
!     private void checkLen() {
        int i=0;
!       while(new File(imageFilename(i)).exists())
            i++;
        pages = i;
        pa("Checked document of "+i+" pages");
      }
  
!     public Span getCurrent() {
!       return new SimplePageSpan(0, pages, 0, 0, WIDTH, HEIGHT);
!     }
! 
!     public Span getSpan(int p0, int p1, int x, int y, int w, int h) {
!       return new SimplePageSpan(p0, p1, x, y, w, h);
!     }
! 
! 
!     public boolean isFinalized() { return true; }
! 
!     // ----- Spans --- 
! 
!     class SimplePageSpan extends ScrollBlockManager.PageSpanBase {
        SimplePageSpan(int p0, int p1, int x, int y, int w, int h) {
            super(PageImageScroll.this, p0, p1, x, y, w, h);
        }
***************
*** 114,181 ****
            return new SimplePageSpan(p0, p1, x, y, w, h);
        }
  
-       Image cached;
- 
-       Image loadImage() {
-           if(pages == 0) return null; // Don't even try if no pages avail.
-           Image img = getPageImage(offs0);
- 
-           if(img==null)
-               throw new Error("Couldn't load image from file 
"+kludgeFilename(offs0));
-           int count = 0;
-           while(img.getWidth(null) < 0 || img.getHeight(null) < 0) {
-               try {
-                   count++;
-                   if(count > 100)
-                       throw new Error("Timeout while loading file 
"+kludgeFilename(offs0));
-                   Thread.sleep(200);
-               } catch(InterruptedException e) {
-                   throw new Error("Interrupted");
-               }
-           }
-           pa("Returning image");
-           return img;
-       }
- 
        public Image getImage() {
!           if(cached != null) return cached;
!           if(length() != 1)
!               //              return null;
!               throw new ZZError("Must have only one page to show...");
!           run();
!           return cached;
!           // XXX
!           // Background.addTask(SimplePageSpan.this);
!           // p("GetImage returning null!!!!!");
!           // return null;
!       }
! 
!       public void run() {
!           p("Running page: "+cached);
!           if(cached != null) return;
!           cached = loadImage();
!           p("Loaded image: "+cached);
! 
!           if(x==0 && y==0 && w==WIDTH && h==HEIGHT)
!               return;
! 
!           ImageFilter filter = new CropImageFilter(x,y,w,h);
!           cached = GlobalToolkit.toolkit.createImage
!                   (new FilteredImageSource(cached.getSource(), filter));
!           p("Cropped image: "+cached);
        }
      }
  
-     public Span getCurrent() {
-       return new SimplePageSpan(0, pages, 0, 0, WIDTH, HEIGHT);
-     }
  
-     public Span getSpan(int p0, int p1, int x, int y, int w, int h) {
-       return new SimplePageSpan(p0, p1, x, y, w, h);
-     }
- 
- 
-     public boolean isFinalized() { return true; }
  }
  
  
--- 110,121 ----
            return new SimplePageSpan(p0, p1, x, y, w, h);
        }
  
        public Image getImage() {
!           throw new UnsupportedOperationException("Use gzz.client to create 
image");
        }
      }
  
  
  }