[Jigs-commits] CVS: jigs/src/edu/whitman/halfway/jigs/renderers/swigs DesertRenderEngine.java, 1.10, 1.11

[Brendan M. <mc...@us...>]

Update of /cvsroot/jigs/jigs/src/edu/whitman/halfway/jigs/renderers/swigs
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12721/src/edu/whitman/halfway/jigs/renderers/swigs

Modified Files:
	DesertRenderEngine.java 
Log Message:


Index: DesertRenderEngine.java
===================================================================
RCS file: /cvsroot/jigs/jigs/src/edu/whitman/halfway/jigs/renderers/swigs/DesertRenderEngine.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DesertRenderEngine.java	2 Aug 2006 21:36:16 -0000	1.10
--- DesertRenderEngine.java	6 Aug 2006 01:27:18 -0000	1.11
***************
*** 23,27 ****
      //DesertThumbnailPage thumbnailPage; //see thumbnailPage in superclass
  
!     DesertRenderUtil renderUtil = new DesertRenderUtil();
  
      boolean stripLeadingNumbers = JigsPrefs.getBoolean(JigsPrefs.REMOVE_LEADING_FILE_NUMS);
--- 23,27 ----
      //DesertThumbnailPage thumbnailPage; //see thumbnailPage in superclass
  
!     //DesertRenderUtil DesertRenderUtil = new DesertRenderUtil();
  
      boolean stripLeadingNumbers = JigsPrefs.getBoolean(JigsPrefs.REMOVE_LEADING_FILE_NUMS);
***************
*** 39,43 ****
          treePage = new DesertTreePage(getTemplateFile("tree.html"));
  
!         thumbType = renderUtil.getThumbType(types);
  
          System.out.println("Using " + (useBrentsOptions ? "Brent's " : "Brendan's ") + "render options.");
--- 39,43 ----
          treePage = new DesertTreePage(getTemplateFile("tree.html"));
  
!         thumbType = DesertRenderUtil.getThumbType(types);
  
          System.out.println("Using " + (useBrentsOptions ? "Brent's " : "Brendan's ") + "render options.");
***************
*** 78,82 ****
              //log.warn("Getting treeTable.");
              Map subs = new HashMap(2);            
!             subs.put("<!--treeTable-->", renderUtil.getAlbumTree(album, outputDir, stripLeadingNumbers));
              return subs;
          }
--- 78,82 ----
              //log.warn("Getting treeTable.");
              Map subs = new HashMap(2);            
!             subs.put("<!--treeTable-->", DesertRenderUtil.getAlbumTree(album, outputDir, stripLeadingNumbers));
              return subs;
          }
***************
*** 99,123 ****
              
              subs.put("<!--pathlinks-->", useBrentsOptions ?
!                      renderUtil.getPathLinks(album, outputDir, null, false, stripLeadingNumbers, null)
!                      : renderUtil.getPathLinks(album, outputDir, null, false, stripLeadingNumbers, null));
  
  
!             subs.put("<!--album_title-->", renderUtil.getTitle(album, stripLeadingNumbers));
!             subs.put("<!--album_date-->", renderUtil.getAlbumDateRange(album));
!             subs.put("<!--album_num_pictures_string-->", renderUtil.numPicsString(album));
!             subs.put("<!--album_desc-->", renderUtil.getShortDesc(album));
  
  
!             subs.put("<!--n-->", renderUtil.getNumPicturesAndAlbums(album));
!             subs.put("<!--dateNumInfo-->", renderUtil.getNumDateInfo(album));
            
  	    
  
!             subs.put("<!--thumb_page_links-->", renderUtil.getNumPageLinks(album, page, outputDir));
  
           
!             String next = renderUtil.makeRelativeLinkEnd(page, page.NEXT, 
                                                           "next", "first", outputDir);
!             String prev = renderUtil.makeRelativeLinkEnd(page, page.PREV, 
                                                           "prev", "last", outputDir);
              subs.put("<!--next_thumb_page-->", next);
--- 99,123 ----
              
              subs.put("<!--pathlinks-->", useBrentsOptions ?
!                      DesertRenderUtil.getPathLinks(album, outputDir, null, false, stripLeadingNumbers, null)
!                      : DesertRenderUtil.getPathLinks(album, outputDir, null, false, stripLeadingNumbers, null));
  
  
!             subs.put("<!--album_title-->", DesertRenderUtil.getTitle(album, stripLeadingNumbers));
!             subs.put("<!--album_date-->", DesertRenderUtil.getAlbumDateRange(album));
!             subs.put("<!--album_num_pictures_string-->", DesertRenderUtil.numPicsString(album));
!             subs.put("<!--album_desc-->", DesertRenderUtil.getShortDesc(album));
  
  
!             subs.put("<!--n-->", DesertRenderUtil.getNumPicturesAndAlbums(album));
!             subs.put("<!--dateNumInfo-->", DesertRenderUtil.getNumDateInfo(album));
            
  	    
  
!             subs.put("<!--thumb_page_links-->", DesertRenderUtil.getNumPageLinks(album, page, outputDir));
  
           
!             String next = DesertRenderUtil.makeRelativeLinkEnd(page, page.NEXT, 
                                                           "next", "first", outputDir);
!             String prev = DesertRenderUtil.makeRelativeLinkEnd(page, page.PREV, 
                                                           "prev", "last", outputDir);
              subs.put("<!--next_thumb_page-->", next);
***************
*** 154,163 ****
                          OutputPageSpec relpage = album.getOutputAlbum().getSpecForPicture(imagePage, pi);
                          String imagePageURL = relpage.getLink().getRelativePath(outputDir);
!                         Image thumb = p.getImage(renderUtil.getThumbType(p));
  
                          table.append("<td align=\"center\" class=\""+clasType
                                       + "\">" + StringUtil.newline 
                                       + "<a href=\"" + imagePageURL +"\">" 
!                                      + thumb.getLink().getLinkTag(renderUtil.getAlt(p, thumb), outputDir, "border=\"0\" class=\"thumbnail\"") 
                                       + "</a>" + StringUtil.newline 
                                       + "</td>" + StringUtil.newline);  
--- 154,163 ----
                          OutputPageSpec relpage = album.getOutputAlbum().getSpecForPicture(imagePage, pi);
                          String imagePageURL = relpage.getLink().getRelativePath(outputDir);
!                         Image thumb = p.getImage(DesertRenderUtil.getThumbType(p));
  
                          table.append("<td align=\"center\" class=\""+clasType
                                       + "\">" + StringUtil.newline 
                                       + "<a href=\"" + imagePageURL +"\">" 
!                                      + thumb.getLink().getLinkTag(DesertRenderUtil.getAlt(p, thumb), outputDir, "border=\"0\" class=\"thumbnail\"") 
                                       + "</a>" + StringUtil.newline 
                                       + "</td>" + StringUtil.newline);  
***************
*** 195,205 ****
              
              subs.put("<!--pathlinks-->",
!                      renderUtil.getPathLinks(album, outputDir, null, false, stripLeadingNumbers, null));
  
!             subs.put("<!--album_title-->", renderUtil.getTitle(album, stripLeadingNumbers));
!             subs.put("<!--album_date-->", renderUtil.getAlbumDateRange(album));
!             subs.put("<!--album_num_subalbums_string-->", renderUtil.numSubalbumsString(album));
  
!             subs.put("<!--album_desc-->", renderUtil.getShortDesc(album));
              subs.put("<!--subalbum_table-->", getSubalbumTable(album, outputDir));
              return subs;
--- 195,205 ----
              
              subs.put("<!--pathlinks-->",
!                      DesertRenderUtil.getPathLinks(album, outputDir, null, false, stripLeadingNumbers, null));
  
!             subs.put("<!--album_title-->", DesertRenderUtil.getTitle(album, stripLeadingNumbers));
!             subs.put("<!--album_date-->", DesertRenderUtil.getAlbumDateRange(album));
!             subs.put("<!--album_num_subalbums_string-->", DesertRenderUtil.numSubalbumsString(album));
  
!             subs.put("<!--album_desc-->", DesertRenderUtil.getShortDesc(album));
              subs.put("<!--subalbum_table-->", getSubalbumTable(album, outputDir));
              return subs;
***************
*** 224,247 ****
  
                          subs.put("<!--subalbum_title_link-->", 
!                                  sub.getOutputAlbum().getLink().getLinkTag(renderUtil.getTitle(sub, stripLeadingNumbers), outputDir));
  
!                         subs.put("<!--subalbum_date-->", renderUtil.getAlbumDateRange(sub));
  
  
                          //subs.put("<!--subalbum_date_range-->", renderUtil.getAlbumDateRange(sub));
  
!                         Picture samplePic = renderUtil.getSamplePicture(sub);
!                         Image sampleImage = samplePic.getImage(renderUtil.getThumbType(samplePic));
                          subs.put("<!--subalbum_thumbnail_img_link-->",
                                   sub.getOutputAlbum().getLink().getLinkTag
                                   (sampleImage.getLink().getLinkTag
!                                   (renderUtil.getAlt(samplePic, sampleImage), 
                                     outputDir, " border=\"0\" class=\"subalbum_thumbnail\""), outputDir));
  
                          if(!useBrentsOptions){
!                             subs.put("<!--subalbum_desc-->", renderUtil.getShortDesc(sub));
                          }else{
                          
!                             String s = renderUtil.getShortDesc(sub);
                              if (s == null || s.trim().equals("")) {
                                  subs.put("<!--subalbum_desc-->", "");
--- 224,247 ----
  
                          subs.put("<!--subalbum_title_link-->", 
!                                  sub.getOutputAlbum().getLink().getLinkTag(DesertRenderUtil.getTitle(sub, stripLeadingNumbers), outputDir));
  
!                         subs.put("<!--subalbum_date-->", DesertRenderUtil.getAlbumDateRange(sub));
  
  
                          //subs.put("<!--subalbum_date_range-->", renderUtil.getAlbumDateRange(sub));
  
!                         Picture samplePic = DesertRenderUtil.getSamplePicture(sub);
!                         Image sampleImage = samplePic.getImage(DesertRenderUtil.getThumbType(samplePic));
                          subs.put("<!--subalbum_thumbnail_img_link-->",
                                   sub.getOutputAlbum().getLink().getLinkTag
                                   (sampleImage.getLink().getLinkTag
!                                   (DesertRenderUtil.getAlt(samplePic, sampleImage), 
                                     outputDir, " border=\"0\" class=\"subalbum_thumbnail\""), outputDir));
  
                          if(!useBrentsOptions){
!                             subs.put("<!--subalbum_desc-->", DesertRenderUtil.getShortDesc(sub));
                          }else{
                          
!                             String s = DesertRenderUtil.getShortDesc(sub);
                              if (s == null || s.trim().equals("")) {
                                  subs.put("<!--subalbum_desc-->", "");
***************
*** 259,263 ****
                          }
  
!                         subs.put("<!--subalbum_num_info-->", renderUtil.getNumPicturesAndAlbums(sub));                    
  
                          table.append(RenderUtil.doSubs(subAlbBlockString, subs, true));
--- 259,263 ----
                          }
  
!                         subs.put("<!--subalbum_num_info-->", DesertRenderUtil.getNumPicturesAndAlbums(sub));                    
  
                          table.append(RenderUtil.doSubs(subAlbBlockString, subs, true));
***************
*** 332,337 ****
  	    
              subs.put("<!--image_pathlinks-->", 
!                      renderUtil.getPathLinks
!                      (album, outputDir, renderUtil.getTitle(p, stripLeadingNumbers), true, 
                        stripLeadingNumbers, thumbPages[index]));
  
--- 332,337 ----
  	    
              subs.put("<!--image_pathlinks-->", 
!                      DesertRenderUtil.getPathLinks
!                      (album, outputDir, DesertRenderUtil.getTitle(p, stripLeadingNumbers), true, 
                        stripLeadingNumbers, thumbPages[index]));
  
***************
*** 350,356 ****
              
              // Brents (now Brendan's too) Nav Strings
!             next = renderUtil.makeRelativeLinkEnd(page, page.NEXT, 
                                                    "next", "first", outputDir);
!             prev = renderUtil.makeRelativeLinkEnd(page, page.PREV, 
                                                    "prev", "last", outputDir);
              if( next != null && prev != null) navString = prev +" | " + next;
--- 350,356 ----
              
              // Brents (now Brendan's too) Nav Strings
!             next = DesertRenderUtil.makeRelativeLinkEnd(page, page.NEXT, 
                                                    "next", "first", outputDir);
!             prev = DesertRenderUtil.makeRelativeLinkEnd(page, page.PREV, 
                                                    "prev", "last", outputDir);
              if( next != null && prev != null) navString = prev +" | " + next;
***************
*** 360,372 ****
  
  
!             subs.put("<!--photographer-->", renderUtil.getPhotographer(p));
  
  
              //we want to decide these strings all at once
!             String title = renderUtil.getTitle(p, stripLeadingNumbers);
              //String btitle = renderUtil.getTitle(p, false);
!             String dateTime = renderUtil.getPicDateString(p);
              String location = (String)p.getDescriptionInfo().getData("location");
!             String desc = renderUtil.getShortDesc(p);
  
              Image origImage = ImageSourceProvider.getDefaultImageSource().getImage(p.getMediaKey(), 
--- 360,372 ----
  
  
!             subs.put("<!--photographer-->", DesertRenderUtil.getPhotographer(p));
  
  
              //we want to decide these strings all at once
!             String title = DesertRenderUtil.getTitle(p, stripLeadingNumbers);
              //String btitle = renderUtil.getTitle(p, false);
!             String dateTime = DesertRenderUtil.getPicDateString(p);
              String location = (String)p.getDescriptionInfo().getData("location");
!             String desc = DesertRenderUtil.getShortDesc(p);
  
              Image origImage = ImageSourceProvider.getDefaultImageSource().getImage(p.getMediaKey(), 
***************
*** 375,381 ****
  
              subs.put("<!--image_desc-->", useBrentsOptions ? 
!                      renderUtil.getDesc(p) : desc);
  
!             subs.put("<!--borig_image_size-->", renderUtil.getImageSizeFileSize(origImage));
              subs.put("<!--borig_image_link-->", origImage.getLink().getRelativePath(outputDir));
  
--- 375,381 ----
  
              subs.put("<!--image_desc-->", useBrentsOptions ? 
!                      DesertRenderUtil.getDesc(p) : desc);
  
!             subs.put("<!--borig_image_size-->", DesertRenderUtil.getImageSizeFileSize(origImage));
              subs.put("<!--borig_image_link-->", origImage.getLink().getRelativePath(outputDir));
  
***************
*** 439,446 ****
              Image[] images = p.getImageArray();
              Arrays.sort(images);
!             ImageType thumbType = renderUtil.getThumbType(p);
  
              int nsil = images.length/2;
!             noscriptImageLink = images[nsil].getLink().getLinkTag(renderUtil.getAlt(p, images[nsil]), outputDir, " border=\"0\" ");
  
              StringBuffer fb = new StringBuffer("[");
--- 439,446 ----
              Image[] images = p.getImageArray();
              Arrays.sort(images);
!             ImageType thumbType = DesertRenderUtil.getThumbType(p);
  
              int nsil = images.length/2;
!             noscriptImageLink = images[nsil].getLink().getLinkTag(DesertRenderUtil.getAlt(p, images[nsil]), outputDir, " border=\"0\" ");
  
              StringBuffer fb = new StringBuffer("[");
***************
*** 464,468 ****
                      na++;
  
!                     String alt = renderUtil.getAlt(p, images[i]);
                      ImageLink link = (ImageLink)images[i].getLink();
  
--- 464,468 ----
                      na++;
  
!                     String alt = DesertRenderUtil.getAlt(p, images[i]);
                      ImageLink link = (ImageLink)images[i].getLink();