Move helper methods closer

This commit is contained in:
Oscar Gonzalez Fernandez 2013-06-06 18:27:45 +02:00
parent f86c9d8aa0
commit 64b6781895

View file

@ -141,6 +141,15 @@ public class CutyPrint {
private static class CutyCaptParameters {
private static String buildCaptureDestination(String extension) {
if (extension == null || extension.equals("")) {
extension = ".pdf";
}
return "/print/"
+ new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())
+ extension;
}
private final HttpServletRequest request = (HttpServletRequest) Executions
.getCurrent().getNativeRequest();
private final ServletContext context = request.getSession()
@ -248,8 +257,17 @@ public class CutyPrint {
}
private int buildMinWidthParam() {
return calculatePlannerWidthForPrintingScreen(planner,
minWidthForTaskNameColumn);
if (planner != null && planner.getTimeTracker() != null) {
return planner.getTimeTracker().getHorizontalSize()
+ calculateTaskDetailsWidth();
}
return 0;
}
private int calculateTaskDetailsWidth() {
return TASKDETAILS_BASE_WIDTH
+ Math.max(0, minWidthForTaskNameColumn
- BASE_TASK_NAME_PIXELS);
}
private int buildMinHeightParam() {
@ -398,29 +416,6 @@ public class CutyPrint {
}
}
private static String buildCaptureDestination(String extension) {
if (extension == null || extension.equals("")) {
extension = ".pdf";
}
return "/print/"
+ new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())
+ extension;
}
private static int calculatePlannerWidthForPrintingScreen(Planner planner,
int minWidthForTaskNameColumn) {
if (planner != null && planner.getTimeTracker() != null) {
return planner.getTimeTracker().getHorizontalSize()
+ calculateTaskDetailsWidth(minWidthForTaskNameColumn);
}
return 0;
}
private static int calculateTaskDetailsWidth(int minWidthForTaskNameColumn) {
return TASKDETAILS_BASE_WIDTH
+ Math.max(0, minWidthForTaskNameColumn - BASE_TASK_NAME_PIXELS);
}
private static IServletRequestHandler executeOnOriginalContext(
final IServletRequestHandler original) {
final SecurityContext originalContext = SecurityContextHolder