From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 17 Jul 2016 14:09:38 +0000 (+0200)
Subject: upd: enforce pattern of making templates static and final.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=25f59f370978c0e9789821a15d89a83d5d702622

upd: enforce pattern of making templates static and final.

Change-Id: I235adf31a8fd4919cbe3a73ed8a43f01b65c91c6
---

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index ab0e1b6f..e55f97a2 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -187,7 +187,6 @@ public final class Gigi extends HttpServlet {
             } catch (UnsupportedEncodingException e) {
                 throw new ServletException(e);
             }
-            baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
             rootMenu = new MenuCollector();
 
             Menu languages = new Menu("Language");
@@ -223,7 +222,7 @@ public final class Gigi extends HttpServlet {
 
     private static Gigi instance;
 
-    private Template baseTemplate;
+    private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));;
 
     private PingerDaemon pinger;
 
diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 639197cd..9cd7558c 100644
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -11,16 +11,12 @@ import org.cacert.gigi.output.template.Template;
 
 public class AssurancesDisplay implements Outputable {
 
-    private static Template template;
+    private static final Template template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
 
     private boolean assurer;
 
     public String assuranceArray;
 
-    static {
-        template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
-    }
-
     public AssurancesDisplay(String assuranceArray, boolean assurer) {
         this.assuranceArray = assuranceArray;
         this.assurer = assurer;
diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index 440d2b0c..49be4259 100644
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -12,11 +12,7 @@ import org.cacert.gigi.util.ServerConstants;
 
 public class ClientCSRGenerate {
 
-    private static Template normal;
-
-    static {
-        normal = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerate.templ"));
-    }
+    private static final Template normal = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerate.templ"));
 
     public static void output(HttpServletRequest req, HttpServletResponse resp) {
         HashMap<String, Object> vars = new HashMap<String, Object>();
diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
index a24188a5..0cccbfb5 100644
--- a/src/org/cacert/gigi/pages/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -10,7 +10,7 @@ import org.cacert.gigi.output.template.Template;
 
 public class MainPage extends Page {
 
-    Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
+    private static final Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
 
     public MainPage() {
         super("Home");
diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/org/cacert/gigi/pages/PasswordResetPage.java
index 7ba5d73c..1be5643c 100644
--- a/src/org/cacert/gigi/pages/PasswordResetPage.java
+++ b/src/org/cacert/gigi/pages/PasswordResetPage.java
@@ -34,7 +34,7 @@ public class PasswordResetPage extends Page {
 
     public static class PasswordResetForm extends Form {
 
-        private static Template t = new Template(PasswordResetForm.class.getResource("PasswordResetForm.templ"));
+        private static final Template t = new Template(PasswordResetForm.class.getResource("PasswordResetForm.templ"));
 
         private User u;
 
diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index 8e73d3f2..667dc751 100644
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -21,10 +21,7 @@ public class ChangeForm extends Form {
         this.target = target;
     }
 
-    private static Template t;
-    static {
-        t = new Template(ChangePasswordPage.class.getResource("ChangePasswordForm.templ"));
-    }
+    private static final Template t = new Template(ChangePasswordPage.class.getResource("ChangePasswordForm.templ"));
 
     @Override
     public void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
diff --git a/src/org/cacert/gigi/pages/account/FindAgentAccess.java b/src/org/cacert/gigi/pages/account/FindAgentAccess.java
index 2f325ebb..98ee3ae3 100644
--- a/src/org/cacert/gigi/pages/account/FindAgentAccess.java
+++ b/src/org/cacert/gigi/pages/account/FindAgentAccess.java
@@ -24,10 +24,7 @@ public class FindAgentAccess extends Form {
 
     public static final String PATH = "/account/find-agent";
 
-    private static Template t;
-    static {
-        t = new Template(ChangePasswordPage.class.getResource("FindAgentAccess.templ"));
-    }
+    private static final Template t = new Template(ChangePasswordPage.class.getResource("FindAgentAccess.templ"));
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 9ea66b35..d35ba45e 100644
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -17,12 +17,9 @@ import org.cacert.gigi.util.HTMLEncoder;
 
 public class MyDetailsForm extends Form {
 
-    private static Template assured = new Template(MyDetails.class.getResource("MyDetailsFormAssured.templ"));
+    private static final Template assured = new Template(MyDetails.class.getResource("MyDetailsFormAssured.templ"));
 
-    private static Template templ;
-    static {
-        templ = new Template(MyDetailsForm.class.getResource("MyDetailsForm.templ"));
-    }
+    private static final Template templ = new Template(MyDetailsForm.class.getResource("MyDetailsForm.templ"));
 
     private User target;
 
diff --git a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.java b/src/org/cacert/gigi/pages/account/MyOrganisationsForm.java
index 443a9efe..706e9597 100644
--- a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyOrganisationsForm.java
@@ -26,11 +26,7 @@ public class MyOrganisationsForm extends Form {
         target = LoginPage.getAuthorizationContext(hsr);
     }
 
-    private static Template template;
-
-    static {
-        template = new Template(MyOrganisationsForm.class.getResource("MyOrganisationsForm.templ"));
-    }
+    private static final Template template = new Template(MyOrganisationsForm.class.getResource("MyOrganisationsForm.templ"));
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) {
diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index d40bbacc..9d05db4f 100644
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -25,7 +25,7 @@ import org.cacert.gigi.util.PEM;
 
 public class Certificates extends Page implements HandlesMixedRequest {
 
-    private Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
+    private static final Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
 
     public static final String PATH = "/account/certs";
 
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
index 954c5736..525cd125 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
@@ -18,7 +18,7 @@ import org.cacert.gigi.pages.LoginPage;
 
 public class DomainPinglogForm extends Form {
 
-    static Template t = new Template(DomainPinglogForm.class.getResource("DomainPinglogForm.templ"));
+    private static final Template t = new Template(DomainPinglogForm.class.getResource("DomainPinglogForm.templ"));
 
     Domain target;
 
diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
index 1810b7ae..5a13482f 100644
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
@@ -50,7 +50,7 @@ public class PingConfigForm extends Form {
 
     private SSLType[] sslTypes = new SSLType[MAX_SSL_TESTS];
 
-    private final Template t = new Template(PingConfigForm.class.getResource("PingConfigForm.templ"));
+    private static final Template t = new Template(PingConfigForm.class.getResource("PingConfigForm.templ"));
 
     public PingConfigForm(HttpServletRequest hsr, Domain target) throws GigiApiException {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
index eaf35f40..1a67f8e2 100644
--- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
@@ -16,12 +16,9 @@ import org.cacert.gigi.pages.Page;
 
 public class MailAddForm extends Form {
 
-    private static Template t;
+    private static final Template t = new Template(MailAddForm.class.getResource("MailAddForm.templ"));;
 
     private String mail;
-    static {
-        t = new Template(MailAddForm.class.getResource("MailAddForm.templ"));
-    }
 
     private User target;
 
diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index cbf14397..9a399884 100644
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -17,12 +17,9 @@ import org.cacert.gigi.pages.Page;
 
 public class MailManagementForm extends Form {
 
-    private static Template t;
+    private static final Template t = new Template(MailAddForm.class.getResource("MailManagementForm.templ"));
 
     private User target;
-    static {
-        t = new Template(MailAddForm.class.getResource("MailManagementForm.templ"));
-    }
 
     public MailManagementForm(HttpServletRequest hsr, User target) {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
index a52afed3..2c8b5719 100644
--- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
@@ -14,7 +14,7 @@ import org.cacert.gigi.pages.LoginPage;
 
 public class TTPAdminForm extends Form {
 
-    private static Template t = new Template(TTPAdminForm.class.getResource("TTPAdminForm.templ"));
+    private static final Template t = new Template(TTPAdminForm.class.getResource("TTPAdminForm.templ"));
 
     User u;
 
diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java b/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java
index 1096f3d7..93c4b0c1 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java
@@ -17,10 +17,7 @@ public class FindDomainForm extends Form {
 
     private CertificateOwner res = null;
 
-    private static Template t;
-    static {
-        t = new Template(FindDomainForm.class.getResource("FindDomainForm.templ"));
-    }
+    private static final Template t = new Template(FindDomainForm.class.getResource("FindDomainForm.templ"));
 
     public FindDomainForm(HttpServletRequest hsr) {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserForm.java b/src/org/cacert/gigi/pages/admin/support/FindUserForm.java
index 21276dba..3a7bf07c 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindUserForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserForm.java
@@ -16,10 +16,7 @@ public class FindUserForm extends Form {
 
     private User users[];
 
-    private static Template t;
-    static {
-        t = new Template(FindDomainForm.class.getResource("FindUserForm.templ"));
-    }
+    private static final Template t = new Template(FindDomainForm.class.getResource("FindUserForm.templ"));
 
     public FindUserForm(HttpServletRequest hsr) {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
index 5b57a1c7..18afc0c6 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.java
@@ -15,11 +15,7 @@ import org.cacert.gigi.util.AuthorizationContext;
 
 public class SupportEnterTicketForm extends Form {
 
-    private static Template t;
-
-    static {
-        t = new Template(SupportEnterTicketForm.class.getResource("SupportEnterTicketForm.templ"));
-    }
+    private static final Template t = new Template(SupportEnterTicketForm.class.getResource("SupportEnterTicketForm.templ"));
 
     public SupportEnterTicketForm(HttpServletRequest hsr) {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
index 32f52254..9c1f3f5b 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
@@ -20,12 +20,9 @@ import org.cacert.gigi.output.template.Template;
 
 public class SupportRevokeCertificatesForm extends Form {
 
-    private static Template t;
+    private static final Template t = new Template(SupportRevokeCertificatesForm.class.getResource("SupportRevokeCertificatesForm.templ"));
 
     private SupportedUser user;
-    static {
-        t = new Template(SupportRevokeCertificatesForm.class.getResource("SupportRevokeCertificatesForm.templ"));
-    }
 
     public SupportRevokeCertificatesForm(HttpServletRequest hsr, SupportedUser user) {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index 60251e7e..15ed2818 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -22,7 +22,7 @@ import org.cacert.gigi.pages.PasswordResetPage;
 
 public class SupportUserDetailsForm extends Form {
 
-    private static Template t;
+    private static final Template t = new Template(FindDomainForm.class.getResource("SupportUserDetailsForm.templ"));
 
     private SupportedUser user;
 
@@ -30,10 +30,6 @@ public class SupportUserDetailsForm extends Form {
 
     private GroupSelector value = new GroupSelector("groupToModify");
 
-    static {
-        t = new Template(FindDomainForm.class.getResource("SupportUserDetailsForm.templ"));
-    }
-
     public SupportUserDetailsForm(HttpServletRequest hsr, SupportedUser user) {
         super(hsr);
         this.user = user;
diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 4df3ba49..0fc04d8e 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -32,13 +32,13 @@ public class Signup extends Form {
 
     String email = "";
 
-    private Template t;
+    private static final Template t = new Template(Signup.class.getResource("Signup.templ"));
 
     boolean general = true, country = true, regional = true, radius = true;
 
     public Signup(HttpServletRequest hsr) {
         super(hsr);
-        t = new Template(Signup.class.getResource("Signup.templ"));
+
     }
 
     DateSelector myDoB = new DateSelector("day", "month", "year");
diff --git a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java b/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java
index b3df26eb..c18cf8f1 100644
--- a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java
+++ b/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.java
@@ -15,7 +15,7 @@ import org.cacert.gigi.pages.LoginPage;
 
 public class OrgDomainAddForm extends Form {
 
-    public static Template t = new Template(OrgDomainAddForm.class.getResource("OrgDomainAddForm.templ"));
+    private static final Template t = new Template(OrgDomainAddForm.class.getResource("OrgDomainAddForm.templ"));
 
     Organisation target;
 
diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index 49833e57..8dcc06d2 100644
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -23,9 +23,9 @@ import org.cacert.gigi.util.AuthorizationContext;
 
 public class ViewOrgPage extends Page {
 
-    private final Template orgas = new Template(ViewOrgPage.class.getResource("ViewOrgs.templ"));
+    private static final Template orgas = new Template(ViewOrgPage.class.getResource("ViewOrgs.templ"));
 
-    private final Template mainTempl = new Template(ViewOrgPage.class.getResource("EditOrg.templ"));
+    private static final Template mainTempl = new Template(ViewOrgPage.class.getResource("EditOrg.templ"));
 
     public static final String DEFAULT_PATH = "/orga";
 
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 9188013d..07a0fdc2 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -40,10 +40,7 @@ public class AssuranceForm extends Form {
 
     private AssuranceType type = AssuranceType.FACE_TO_FACE;
 
-    private static final Template templ;
-    static {
-        templ = new Template(AssuranceForm.class.getResource("AssuranceForm.templ"));
-    }
+    private static final Template templ = new Template(AssuranceForm.class.getResource("AssuranceForm.templ"));
 
     public AssuranceForm(HttpServletRequest hsr, User assuree) {
         super(hsr);
diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index dfd72b7b..4603e843 100644
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -25,7 +25,7 @@ public class AssurePage extends Page {
 
     DateSelector ds = new DateSelector("day", "month", "year");
 
-    Template t;
+    private final Template t;
 
     public AssurePage() {
         super("Assure someone");
diff --git a/util-testing/org/cacert/gigi/DevelLauncher.java b/util-testing/org/cacert/gigi/DevelLauncher.java
index f84d728b..6639635b 100644
--- a/util-testing/org/cacert/gigi/DevelLauncher.java
+++ b/util-testing/org/cacert/gigi/DevelLauncher.java
@@ -181,7 +181,7 @@ public class DevelLauncher {
     private static void addTicketPage(HashMap<String, Page> pages) {
         pages.put("/ticketWait", new Page("ticket") {
 
-            Template t = new Template(DevelLauncher.class.getResource("DevelTicketWait.templ"));
+            private final Template t = new Template(DevelLauncher.class.getResource("DevelTicketWait.templ"));
 
             @Override
             public boolean needsLogin() {
diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index dfa4b5a4..6a4a521a 100644
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -125,7 +125,7 @@ public class Manager extends Page {
 
     private static Manager instance;
 
-    Template t = new Template(Manager.class.getResource("ManagerMails.templ"));
+    private static final Template t = new Template(Manager.class.getResource("ManagerMails.templ"));
 
     HashMap<String, LinkedList<String>> emails = new HashMap<>();
 
@@ -367,7 +367,7 @@ public class Manager extends Page {
         }
     }
 
-    private Template form = new Template(Manager.class.getResource("Manager.templ"));
+    private static final Template form = new Template(Manager.class.getResource("Manager.templ"));
 
     @Override
     public boolean needsLogin() {