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/webapp/ImageAction.java @ 1248

  → /PhotoAlbum/trunk/src/ak/photoalbum/webapp/ImageAction.java @ 1249

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1248 → Rev 1249

/PhotoAlbum/trunk/src/ak/photoalbum/webapp/ImageAction.java
7,6 → 7,7
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.log4j.Logger;
import ak.photoalbum.logic.Logic;
public final class ImageAction
extends BaseAction
18,6 → 19,7
throws Exception
{
PathForm theForm = (PathForm)form;
String branch = theForm.getBranch();
String path = theForm.getPath();
Logic logic = Logic.getLogic();
24,20 → 26,20
logger.info("get image " + mapping.getParameter() + " for " + path);
if("dir".equals(mapping.getParameter())) {
response.setContentType(logic.getThumbnailMime());
logic.writeDir(path, response.getOutputStream());
response.setContentType(logic.getThumbnailMime(branch));
logic.writeDir(branch, path, response.getOutputStream());
}
else if("small".equals(mapping.getParameter())) {
response.setContentType(logic.getThumbnailMime());
logic.writeSmall(path, response.getOutputStream());
response.setContentType(logic.getThumbnailMime(branch));
logic.writeSmall(branch, path, response.getOutputStream());
}
else if("medium".equals(mapping.getParameter())) {
response.setContentType(logic.getThumbnailMime());
logic.writeMedium(path, response.getOutputStream());
response.setContentType(logic.getThumbnailMime(branch));
logic.writeMedium(branch, path, response.getOutputStream());
}
else if("origin".equals(mapping.getParameter())) {
response.setContentType(logic.getOriginMime(path));
logic.writeOrigin(path, response.getOutputStream());
response.setContentType(logic.getOriginMime(branch, path));
logic.writeOrigin(branch, path, response.getOutputStream());
}
return null;