From bd0b46f9e2823d9e04a28fa886abca9307a536b0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 13 Nov 2011 18:10:20 +0100 Subject: [PATCH] fix bugs with empty tracking code --- .../sonia/scm/plugin/rest/ViewableResource.java | 14 ++++++++++---- .../src/main/webapp/template/header.html | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java index 9d278c389a..d4b3373646 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java @@ -33,13 +33,16 @@ package sonia.scm.plugin.rest; +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.plugin.BackendConfiguration; + //~--- JDK imports ------------------------------------------------------------ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletContext; -import sonia.scm.plugin.BackendConfiguration; /** * @@ -53,14 +56,14 @@ public class ViewableResource * * * @param context + * @param configuration */ - public ViewableResource(ServletContext context, BackendConfiguration configuration) + public ViewableResource(ServletContext context, + BackendConfiguration configuration) { this.contextPath = context.getContextPath(); this.configuration = configuration; } - - private BackendConfiguration configuration; //~--- methods -------------------------------------------------------------- @@ -85,6 +88,9 @@ public class ViewableResource //~--- fields --------------------------------------------------------------- + /** Field description */ + private BackendConfiguration configuration; + /** Field description */ private String contextPath; } diff --git a/scm-plugin-backend/src/main/webapp/template/header.html b/scm-plugin-backend/src/main/webapp/template/header.html index b675a200d9..a9eb351a48 100644 --- a/scm-plugin-backend/src/main/webapp/template/header.html +++ b/scm-plugin-backend/src/main/webapp/template/header.html @@ -48,7 +48,7 @@ - <#if configuration.trackingConde??> + <#if configuration.trackingCode??>