From 699e71e76b15081baf746c6ce9c9144f7e5f1ff9 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 30 Sep 2013 09:30:04 -0400 Subject: Trim trailing whitespace and organize imports Change-Id: I9f91138b20219be6e3c4b28251487df262bff6cc --- src/main/java/com/gitblit/DownloadZipServlet.java | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main/java/com/gitblit/DownloadZipServlet.java') diff --git a/src/main/java/com/gitblit/DownloadZipServlet.java b/src/main/java/com/gitblit/DownloadZipServlet.java index 7cdc54b8..c8da267d 100644 --- a/src/main/java/com/gitblit/DownloadZipServlet.java +++ b/src/main/java/com/gitblit/DownloadZipServlet.java @@ -37,25 +37,25 @@ import com.gitblit.utils.StringUtils; /** * Streams out a zip file from the specified repository for any tree path at any * revision. - * + * * @author James Moger - * + * */ public class DownloadZipServlet extends HttpServlet { private static final long serialVersionUID = 1L; private transient Logger logger = LoggerFactory.getLogger(DownloadZipServlet.class); - + public static enum Format { zip(".zip"), tar(".tar"), gz(".tar.gz"), xz(".tar.xz"), bzip2(".tar.bzip2"); - + public final String extension; - + Format(String ext) { this.extension = ext; } - + public static Format fromName(String name) { for (Format format : values()) { if (format.name().equalsIgnoreCase(name)) { @@ -72,7 +72,7 @@ public class DownloadZipServlet extends HttpServlet { /** * Returns an url to this servlet for the specified parameters. - * + * * @param baseURL * @param repository * @param objectId @@ -92,7 +92,7 @@ public class DownloadZipServlet extends HttpServlet { /** * Creates a zip stream from the repository of the requested data. - * + * * @param request * @param response * @throws javax.servlet.ServletException @@ -106,7 +106,7 @@ public class DownloadZipServlet extends HttpServlet { response.sendError(HttpServletResponse.SC_FORBIDDEN); return; } - + Format format = Format.zip; String repository = request.getParameter("r"); String basePath = request.getParameter("p"); @@ -115,7 +115,7 @@ public class DownloadZipServlet extends HttpServlet { if (!StringUtils.isEmpty(f)) { format = Format.fromName(f); } - + try { String name = repository; if (name.indexOf('/') > -1) { @@ -129,7 +129,7 @@ public class DownloadZipServlet extends HttpServlet { if (!StringUtils.isEmpty(objectId)) { name += "-" + objectId; } - + Repository r = GitBlit.self().getRepository(repository); if (r == null) { if (GitBlit.self().isCollectingGarbage(repository)) { @@ -174,14 +174,14 @@ public class DownloadZipServlet extends HttpServlet { CompressionUtils.bzip2(r, basePath, objectId, response.getOutputStream()); break; } - + response.flushBuffer(); } catch (IOException t) { String message = t.getMessage() == null ? "" : t.getMessage().toLowerCase(); if (message.contains("reset") || message.contains("broken pipe")) { logger.error("Client aborted zip download: " + message); } else { - logger.error("Failed to write attachment to client", t); + logger.error("Failed to write attachment to client", t); } } catch (Throwable t) { logger.error("Failed to write attachment to client", t); -- cgit v1.2.3