Move Template to another package for moving AST-classes out.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 38a2f0ab35abf5633806205b34a0c22c81990c08..447e808a84fedebe57246d5cbe176a9619ab831a 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -18,8 +18,8 @@ import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.MenuItem;
 import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.Template;
 import org.cacert.gigi.output.Form.CSRFError;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index 23869f7750dbe8baab1271671bfef9f6e22c22ba..5b474a1eed98ff14ce4f3ba86178a09fb7a11946 100644 (file)
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.ServerConstants;
 

diff --git a/src/org/cacert/gigi/output/Template.java b/src/org/cacert/gigi/output/template/Template.java
similarity index 98%
rename from src/org/cacert/gigi/output/Template.java
rename to src/org/cacert/gigi/output/template/Template.java
index 6e3d2e5f16541a65a080ca02e79c748893a12a74..57cbd6f2a23439d56849694894760939bfb8871f 100644 (file)
--- a/src/org/cacert/gigi/output/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.output;
+package org.cacert.gigi.output.template;
 
 import java.io.EOFException;
 import java.io.File;
@@ -16,6 +16,7 @@ import java.util.regex.Pattern;
 
 import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.Language;
+import org.cacert.gigi.output.Outputable;
 
 public class Template implements Outputable {
        static class TemplateBlock implements Outputable {

diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java
index 1125db966066e35b1c0b7049e7450b33974e724f..9a5c178a8d0a576422305094b7fe4383b5361e09 100644 (file)
--- a/src/org/cacert/gigi/pages/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.Language;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
 
 /**
  * This class encapsulates a sub page of Gigi. A template residing nearby this

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index 3d2d45dbf83c91ffacf67eb028e514e2d32a5048..2827af0b577c6606c03579d73108d966e3449dc7 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Language;
 import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
 
 public class ChangeForm extends Form {
        public ChangeForm(HttpServletRequest hsr) {

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index f5025bf8603ccfbba8aefbcaec806aa29b66d224..70d9c8630b39c0a77e9cf3ecc3ac954fea7d99f4 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -17,7 +17,7 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.util.Notary;

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index d1d5111694884b6079e2ce6ebe85c63239fcdf4b..4f60352260ae927764974612f2287097ba05ee54 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.Notary.AssuranceResult;

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index f12dfa45d0bf6f9fd3268e597406969ba2fa9211..464afd97a9b49c9235403b4018d63f0ef7663ab1 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -9,11 +9,12 @@ import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.Notary;