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/ @ 1272

  → /PhotoAlbum/trunk/src/ak/photoalbum/logic @ 1267

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1272 → Rev 1267

/PhotoAlbum/trunk/src/ak/photoalbum/logic/Logic.java
20,7 → 20,6
import org.apache.log4j.Logger;
import ak.photoalbum.util.FileUtils;
import ak.photoalbum.util.TimestampRecipient;
import ak.photoalbum.util.ResourceFactory;
import ak.photoalbum.config.ConfigRoot;
import ak.photoalbum.config.ConfigBranch;
244,8 → 243,7
return FileUtils.getMime(FileUtils.extractFileExt(path));
}
public boolean writeDir(String uri, String path, long ifModifiedSince,
OutputStream out, TimestampRecipient timestampRecipient)
public void writeDir(String uri, String path, OutputStream out)
throws IOException, LogicException
{
Branch branch = getBranch(uri);
252,12 → 250,10
File file = new File(branch.getImagesRoot(), path);
securePath(branch.getImagesRoot(), file);
return branch.getThumbnailer().writeDir(file, ifModifiedSince, out, timestampRecipient);
branch.getThumbnailer().writeDir(file, out);
}
public boolean writeSmall(String uri, String path, long ifModifiedSince,
OutputStream out, TimestampRecipient timestampRecipient)
public void writeSmall(String uri, String path, OutputStream out)
throws IOException, LogicException
{
Branch branch = getBranch(uri);
264,12 → 260,10
File file = new File(branch.getImagesRoot(), path);
securePath(branch.getImagesRoot(), file);
return branch.getThumbnailer().writeSmall(file, ifModifiedSince, out, timestampRecipient);
branch.getThumbnailer().writeSmall(file, out);
}
public boolean writeMedium(String uri, String path, long ifModifiedSince,
OutputStream out, TimestampRecipient timestampRecipient)
public void writeMedium(String uri, String path, OutputStream out)
throws IOException, LogicException
{
Branch branch = getBranch(uri);
276,12 → 270,10
File file = new File(branch.getImagesRoot(), path);
securePath(branch.getImagesRoot(), file);
return branch.getThumbnailer().writeMedium(file, ifModifiedSince, out, timestampRecipient);
branch.getThumbnailer().writeMedium(file, out);
}
public boolean writeOrigin(String uri, String path, long ifModifiedSince,
OutputStream out, TimestampRecipient timestampRecipient)
public void writeOrigin(String uri, String path, OutputStream out)
throws IOException, LogicException
{
Branch branch = getBranch(uri);
290,12 → 282,6
securePath(branch.getImagesRoot(), file);
if(ifModifiedSince >= 0 && ifModifiedSince <= file.lastModified()) return false;
if(timestampRecipient != null) {
timestampRecipient.setTimestamp(file.lastModified());
}
try {
in = new FileInputStream(file);
FileUtils.copyStreams(in, out);
303,8 → 289,6
finally {
if(in != null) in.close();
}
return true;
}
protected MetaInfo getMetaInfo(Branch branch, File dir)