BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /PhotoAlbum/trunk/src/ak/photoalbum/logic/Branch.java @ 1251

  → /PhotoAlbum/trunk/src/ak/photoalbum/logic/Branch.java @ 1274

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1251 → Rev 1274

/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()));