upd: Cleanup lang-string locations

Change-Id: Ibbc6cd4d2871633abaf3489e23f094a62b1cacd2

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 717865454ee4bba7a39001bd0467d1d74e1ae3f8..b80f9c7596808c63cdfe92213ea51897d14f72ba 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -108,7 +108,7 @@ public final class Gigi extends HttpServlet {
         public MenuCollector generateMenu() throws ServletException {
             putPage("/denied", new AccessDenied(), null);
             putPage("/error", new PageNotFound(), null);
         public MenuCollector generateMenu() throws ServletException {
             putPage("/denied", new AccessDenied(), null);
             putPage("/error", new PageNotFound(), null);

-            putPage("/login", new LoginPage("Password Login"), null);
+            putPage("/login", new LoginPage(), null);

             getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") {
 
                 @Override
             getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") {
 
                 @Override


@@ -123,7 +123,7 @@ public final class Gigi extends HttpServlet {
                     return ac == null;
                 }
             });
                     return ac == null;
                 }
             });

-            putPage("/", new MainPage("SomeCA - Home"), null);
+            putPage("/", new MainPage(), null);

             putPage("/roots", new RootCertPage(truststore), "SomeCA.org");
 
             putPage("/secure", new TestSecure(), null);
             putPage("/roots", new RootCertPage(truststore), "SomeCA.org");
 
             putPage("/secure", new TestSecure(), null);


@@ -131,8 +131,8 @@ public final class Gigi extends HttpServlet {
             putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
             putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org");
             putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
             putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
             putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org");
             putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");

-            putPage(MailOverview.DEFAULT_PATH, new MailOverview("Email addresses"), "Certificates");
-            putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates");
+            putPage(MailOverview.DEFAULT_PATH, new MailOverview(), "Certificates");
+            putPage(DomainOverview.PATH + "*", new DomainOverview(), "Certificates");

 
             putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
             putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");
 
             putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
             putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");


@@ -144,12 +144,12 @@ public final class Gigi extends HttpServlet {
             putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
 
             putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
             putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
 
             putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");

-            putPage(FindUserPage.PATH, new FindUserPage("Find User"), "Support Console");
-            putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "Support Console");
+            putPage(FindUserPage.PATH, new FindUserPage(), "Support Console");
+            putPage(FindDomainPage.PATH, new FindDomainPage(), "Support Console");

 
 

-            putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
+            putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null);

             putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
             putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");

-            putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account");
+            putPage(LogoutPage.PATH, new LogoutPage(), "My Account");

             putPage(History.PATH, new History(false), "My Account");
             putPage(History.SUPPORT_PATH, new History(true), null);
             putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");
             putPage(History.PATH, new History(false), "My Account");
             putPage(History.SUPPORT_PATH, new History(true), null);
             putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");


@@ -430,7 +430,7 @@ public final class Gigi extends HttpServlet {
         csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure());
         csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure());

-        //csp.append(";report-url https://api.cacert.org/security/csp/report");
+        // csp.append(";report-url https://api.cacert.org/security/csp/report");

         return csp.toString();
     }
 
         return csp.toString();
     }
 


@@ -443,7 +443,7 @@ public final class Gigi extends HttpServlet {
         csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePort());
         csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePort());

-        //csp.append(";report-url http://api.cacert.org/security/csp/report");
+        // csp.append(";report-url http://api.cacert.org/security/csp/report");

         return csp.toString();
     }
 
         return csp.toString();
     }
 

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 23a703ef603a5ac5c80a1ec1ec0d4acada471717..97a0c29f313d5b89b9999f99f46afb25562aba90 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -48,8 +48,8 @@ public class LoginPage extends Page {
 
     public static final String LOGIN_RETURNPATH = "login-returnpath";
 
 
     public static final String LOGIN_RETURNPATH = "login-returnpath";
 

-    public LoginPage(String title) {
-        super(title);
+    public LoginPage() {
+        super("Password Login");

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/LogoutPage.java b/src/org/cacert/gigi/pages/LogoutPage.java
index 1a854837a57e7c45a3b213c10949c1534d9bebee..6f568f128158a0190305cba5c28ded26a4a7d885 100644 (file)
--- a/src/org/cacert/gigi/pages/LogoutPage.java
+++ b/src/org/cacert/gigi/pages/LogoutPage.java
@@ -13,8 +13,8 @@ public class LogoutPage extends Page {
 
     public static final String PATH = "/logout";
 
 
     public static final String PATH = "/logout";
 

-    public LogoutPage(String title) {
-        super(title);
+    public LogoutPage() {
+        super("Logout");

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
index 6e4d8ea2b729d9dd87b2a7636017e16efb972cf9..44930b0861cc11434332e8a8c02bef40a2b6ddf1 100644 (file)
--- a/src/org/cacert/gigi/pages/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -12,8 +12,8 @@ public class MainPage extends Page {
 
     Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
 
 
     Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
 

-    public MainPage(String title) {
-        super(title);
+    public MainPage() {
+        super("SomeCA - Home");

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
index ed707612cc227d3f6b9d96e93e3ef5bde2a0fc29..41fa5c4d2a1e793e4d43465e170f5f62587e198a 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
@@ -18,8 +18,8 @@ public class DomainOverview extends Page {
 
     public static final String PATH = "/account/domains/";
 
 
     public static final String PATH = "/account/domains/";
 

-    public DomainOverview(String title) {
-        super(title);
+    public DomainOverview() {
+        super("Domains");

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
index 61f583ab9d84471807a359e90f4958f00c48a0d4..e3b59916403ccbb64a933af0c3964acc6442aed0 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
@@ -17,8 +17,8 @@ public class MailOverview extends Page {
 
     public static final String DEFAULT_PATH = "/account/mails";
 
 
     public static final String DEFAULT_PATH = "/account/mails";
 

-    public MailOverview(String title) {
-        super(title);
+    public MailOverview() {
+        super("Email addresses");

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java b/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java
index ac3d9f73e61fbc3bd2962e5473d5f228063afd80..06d41621def5495df91c8c4a5ce923fa600da601 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java
@@ -11,8 +11,8 @@ public class FindDomainPage extends OneFormPage {
 
     public static final String PATH = "/support/find/domain";
 
 
     public static final String PATH = "/support/find/domain";
 

-    public FindDomainPage(String title) {
-        super(title, FindDomainForm.class);
+    public FindDomainPage() {
+        super("Find Domain", FindDomainForm.class);

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserPage.java
index 562f0e89460f028f0518990d33b6849db1aa0a89..059298f8227c556f4230a56c26e7f4d4c741685f 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserPage.java
@@ -19,8 +19,8 @@ public class FindUserPage extends Page {
 
     public static final String PATH = "/support/find/user";
 
 
     public static final String PATH = "/support/find/user";
 

-    public FindUserPage(String title) {
-        super(title);
+    public FindUserPage() {
+        super("Find User");

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index 5cc35b53a9698c7c581d01c6292bbf973e31e86b..726bdd391566bd740b29faf426048d06047e9a5d 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -22,8 +22,8 @@ public class SupportUserDetailsPage extends Page {
 
     public static final String PATH = "/support/user/";
 
 
     public static final String PATH = "/support/user/";
 

-    public SupportUserDetailsPage(String title) {
-        super(title);
+    public SupportUserDetailsPage() {
+        super("Support: User Details");

     }
 
     @Override
     }
 
     @Override