Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1272 → Rev 1274

/PhotoAlbum/trunk/src/ak/photoalbum/logic/PageItem.java
1,11 → 1,9
package ak.photoalbum.logic;
 
import java.io.File;
 
public class PageItem
{
private int number;
private boolean isCurrent;
private final int number;
private final boolean isCurrent;
 
public PageItem(int number, boolean isCurrent)
{
/PhotoAlbum/trunk/src/ak/photoalbum/logic/Branch.java
8,8 → 8,6
import java.io.File;
import java.io.IOException;
 
import org.apache.log4j.Logger;
 
import ak.photoalbum.images.Thumbnailer;
import ak.photoalbum.images.ThumbnailPosition;
import ak.photoalbum.util.FileNameComparator;
23,14 → 21,14
protected static final int DEFAULT_COLUMNS = 5;
protected static final int DEFAULT_ROWS = 4;
 
private Thumbnailer thumbnailer;
private ConfigBranch config;
private File imagesRoot;
private int columns = DEFAULT_COLUMNS;
private int rows = DEFAULT_ROWS;
private ImagesFilter imagesFilter;
private Comparator fileNameComparator = new FileNameComparator(true);
private Map metaInfos = new Hashtable(); // <File, MetaInfo>
private final Thumbnailer thumbnailer;
private final ConfigBranch config;
private final File imagesRoot;
private final int columns;
private final int rows;
private final ImagesFilter imagesFilter;
private final Comparator fileNameComparator = new FileNameComparator(true);
private final Map metaInfos = new Hashtable(); // <File, MetaInfo>
 
// FIXME use branch template
public Branch(ResourceFactory resourceFactory, ConfigBranch config)
39,9 → 37,17
this.config = config;
this.imagesRoot = new File(config.getImagesRoot());
this.imagesFilter = new ImagesFilter(config.getImagesMasks());
if(config.getColumns() > 0) this.columns = config.getColumns();
if(config.getRows() > 0) this.rows = config.getRows();
 
if(config.getColumns() > 0)
this.columns = config.getColumns();
else
this.columns = DEFAULT_COLUMNS;
 
if(config.getRows() > 0)
this.rows = config.getRows();
else
this.rows = DEFAULT_ROWS;
 
this.thumbnailer = new Thumbnailer();
this.thumbnailer.setImagesRoot(this.imagesRoot);
this.thumbnailer.setCacheDir(new File(config.getCacheDir()));
/PhotoAlbum/trunk/src/ak/photoalbum/logic/Logic.java
9,8 → 9,6
import java.io.File;
import java.io.IOException;
import java.io.FileInputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.FileNotFoundException;
import java.net.URLEncoder;
31,7 → 29,8
protected static final String URL_ENCODING = "UTF-8";
protected static final String META_FILE_NAME = "meta.xml"; // FIXME make configurable (?)
 
protected Logger logger;
private static final Logger logger = Logger.getLogger(Logic.class);
 
protected ConfigRoot config;
protected Map branches = new Hashtable(); // <String, Branch>
protected Digester configDigester = createConfigDigester();
39,7 → 38,6
 
protected Logic()
{
this.logger = Logger.getLogger(this.getClass());
}
 
protected Digester createConfigDigester()
/PhotoAlbum/trunk/src/ak/photoalbum/logic/MetaInfo.java
9,7 → 9,7
{
private File dir;
private String dirPath;
private Map items = new Hashtable(); // <String, MetaInfoItem>
private final Map items = new Hashtable(); // <String, MetaInfoItem>
 
public MetaInfo()
{