UPD: Move some template classes to there reightful place.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 82012a5096418602d83e75860719ef155f311ddc..cf852073ae78465d06cf3de7eb8636a09366be59 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -21,12 +21,12 @@ import javax.servlet.http.HttpSession;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form.CSRFException;

 import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.Menu;

-import org.cacert.gigi.output.Outputable;

 import org.cacert.gigi.output.PageMenuItem;
 import org.cacert.gigi.output.SimpleMenuItem;
 import org.cacert.gigi.output.PageMenuItem;
 import org.cacert.gigi.output.SimpleMenuItem;

+import org.cacert.gigi.output.template.Outputable;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.output.template.Template;

+import org.cacert.gigi.output.template.Form.CSRFException;

 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.LogoutPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.LogoutPage;
 import org.cacert.gigi.pages.MainPage;

diff --git a/src/org/cacert/gigi/dbObjects/Name.java b/src/org/cacert/gigi/dbObjects/Name.java
index 512dc769b7ca0fbc69f22ae100ddddcfd01c02d5..7dcaeec60f823b96644e791710d3158cf8926786 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Name.java
+++ b/src/org/cacert/gigi/dbObjects/Name.java
@@ -4,7 +4,7 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.output.template.Outputable;

 
 public class Name implements Outputable {
 
 
 public class Name implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index b0908c5df3c9781fb2ef9511d129c930be4db360..639197cd279024ec417da073a5c3362cc07aad86 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import org.cacert.gigi.dbObjects.Assurance;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.dbObjects.Assurance;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;

+import org.cacert.gigi.output.template.Outputable;

 import org.cacert.gigi.output.template.Template;
 
 public class AssurancesDisplay implements Outputable {
 import org.cacert.gigi.output.template.Template;
 
 public class AssurancesDisplay implements Outputable {

diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/org/cacert/gigi/output/CertificateValiditySelector.java
index 1c059ae9f41f781b17bd884672dd3499abc32d96..b8601de5aba0263f44cd0b6c9f942eefe0f6bfe7 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateValiditySelector.java
+++ b/src/org/cacert/gigi/output/CertificateValiditySelector.java
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.localisation.Language;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.localisation.Language;

+import org.cacert.gigi.output.template.Outputable;

 import org.cacert.gigi.util.HTMLEncoder;
 
 public class CertificateValiditySelector implements Outputable {
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class CertificateValiditySelector implements Outputable {

diff --git a/src/org/cacert/gigi/output/DateSelector.java b/src/org/cacert/gigi/output/DateSelector.java
index 1aefa13725dd80e2a5d1e3b3882cc664c3867cde..aadac045a6aabf8eff08630bad75f61c8804348c 100644 (file)
--- a/src/org/cacert/gigi/output/DateSelector.java
+++ b/src/org/cacert/gigi/output/DateSelector.java
@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.localisation.Language;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.localisation.Language;

+import org.cacert.gigi.output.template.Outputable;

 
 public class DateSelector implements Outputable {
 
 
 public class DateSelector implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/template/HashAlgorithms.java b/src/org/cacert/gigi/output/HashAlgorithms.java
similarity index 89%
rename from src/org/cacert/gigi/output/template/HashAlgorithms.java
rename to src/org/cacert/gigi/output/HashAlgorithms.java
index e221aee36e95cd71abe2c299fc227e083657ab0f..8e13513a822fe178d819ea9e7abbe84f364e9459 100644 (file)
--- a/src/org/cacert/gigi/output/template/HashAlgorithms.java
+++ b/src/org/cacert/gigi/output/HashAlgorithms.java
@@ -1,9 +1,10 @@
-package org.cacert.gigi.output.template;
+package org.cacert.gigi.output;

 
 import java.util.Map;
 
 import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.localisation.Language;
 
 import java.util.Map;
 
 import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.localisation.Language;

+import org.cacert.gigi.output.template.IterableDataset;

 
 public class HashAlgorithms implements IterableDataset {
 
 
 public class HashAlgorithms implements IterableDataset {
 

diff --git a/src/org/cacert/gigi/output/IMenuItem.java b/src/org/cacert/gigi/output/IMenuItem.java
index eeef0b04227e9857d215faca00d63126af624283..5e85f627c3b9a108069340827d458e763ecc7a61 100644 (file)
--- a/src/org/cacert/gigi/output/IMenuItem.java
+++ b/src/org/cacert/gigi/output/IMenuItem.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.output;
 
 import org.cacert.gigi.PermissionCheckable;
 package org.cacert.gigi.output;
 
 import org.cacert.gigi.PermissionCheckable;

+import org.cacert.gigi.output.template.Outputable;

 
 /**
  * Markerinterface for an {@link Outputable} speicially used in a {@link Menu}.
 
 /**
  * Markerinterface for an {@link Outputable} speicially used in a {@link Menu}.

diff --git a/src/org/cacert/gigi/output/template/ForeachStatement.java b/src/org/cacert/gigi/output/template/ForeachStatement.java
index 4a368cc9ac097e5390bca5452e4d53b0af7945a1..edabab774c457eabe432f2aa49f65526db694967 100644 (file)
--- a/src/org/cacert/gigi/output/template/ForeachStatement.java
+++ b/src/org/cacert/gigi/output/template/ForeachStatement.java
@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 
 public final class ForeachStatement implements Outputable {
 
 
 public final class ForeachStatement implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/Form.java b/src/org/cacert/gigi/output/template/Form.java
similarity index 98%
rename from src/org/cacert/gigi/output/Form.java
rename to src/org/cacert/gigi/output/template/Form.java
index b7caa214ca992da73bb56b34e3f868b50fb33cc3..f469c21c68bf53080d4f40863cb1e67a85dedc36 100644 (file)
--- a/src/org/cacert/gigi/output/Form.java
+++ b/src/org/cacert/gigi/output/template/Form.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.output;
+package org.cacert.gigi.output.template;

 
 import java.io.IOException;
 import java.io.PrintWriter;
 
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/src/org/cacert/gigi/output/template/IfStatement.java b/src/org/cacert/gigi/output/template/IfStatement.java
index adb9099251038215f21c6f8a6e1bf11cb6acf42c..db0cbe11f07f20132ebdad1503ed82695686f849 100644 (file)
--- a/src/org/cacert/gigi/output/template/IfStatement.java
+++ b/src/org/cacert/gigi/output/template/IfStatement.java
@@ -4,7 +4,6 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 
 public final class IfStatement implements Outputable {
 
 
 public final class IfStatement implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/template/OutputVariableCommand.java b/src/org/cacert/gigi/output/template/OutputVariableCommand.java
index 1a304d894b39a5a6b532177796e1282b93b49be2..b3534edca8159a022f2824b9073d42f51fb4da1b 100644 (file)
--- a/src/org/cacert/gigi/output/template/OutputVariableCommand.java
+++ b/src/org/cacert/gigi/output/template/OutputVariableCommand.java
@@ -4,7 +4,6 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 
 public final class OutputVariableCommand implements Outputable {
 
 
 public final class OutputVariableCommand implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/Outputable.java b/src/org/cacert/gigi/output/template/Outputable.java
similarity index 83%
rename from src/org/cacert/gigi/output/Outputable.java
rename to src/org/cacert/gigi/output/template/Outputable.java
index 9d1530c6acfcf7f6d72a27747309c1a3aac4b905..5716162a8c5e32b07aec3cb948c7e425bdfc3e32 100644 (file)
--- a/src/org/cacert/gigi/output/Outputable.java
+++ b/src/org/cacert/gigi/output/template/Outputable.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.output;
+package org.cacert.gigi.output.template;

 
 import java.io.PrintWriter;
 import java.util.Map;
 
 import java.io.PrintWriter;
 import java.util.Map;

diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java
index 8d42af44f4b76f5e7fff844a8e6d28f20604dff7..e2ff0ba6ce6395c4bfd3e3e8c587bc3c572c13fa 100644 (file)
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 import org.cacert.gigi.util.HTMLEncoder;
 
 public final class SprintfCommand implements Outputable {
 import org.cacert.gigi.util.HTMLEncoder;
 
 public final class SprintfCommand implements Outputable {

diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index dca6568b7432847f4db4cca56f9840e9bc9cab41..0bd9cce170096b4d4088ed158edca8c4f9dfb459 100644 (file)
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -16,7 +16,6 @@ import java.util.regex.Pattern;
 
 import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.localisation.Language;
 
 import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 import org.cacert.gigi.util.HTMLEncoder;
 
 public class Template implements Outputable {
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class Template implements Outputable {

diff --git a/src/org/cacert/gigi/output/template/TemplateBlock.java b/src/org/cacert/gigi/output/template/TemplateBlock.java
index 6b30cf33f7559d81570fcf3483e4e71dabc8064c..15ce4e5b967c23ad463cb60017e44d57979fa8b9 100644 (file)
--- a/src/org/cacert/gigi/output/template/TemplateBlock.java
+++ b/src/org/cacert/gigi/output/template/TemplateBlock.java
@@ -4,7 +4,6 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 
 class TemplateBlock implements Outputable {
 
 
 class TemplateBlock implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/template/TranslateCommand.java b/src/org/cacert/gigi/output/template/TranslateCommand.java
index eca7c845d8cf4685475eda367664e46bcc5a8c73..cae48a63dba9fc8ae44b30e4925c10dab348ee14 100644 (file)
--- a/src/org/cacert/gigi/output/template/TranslateCommand.java
+++ b/src/org/cacert/gigi/output/template/TranslateCommand.java
@@ -4,7 +4,6 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;

 import org.cacert.gigi.util.HTMLEncoder;
 
 public final class TranslateCommand implements Outputable {
 import org.cacert.gigi.util.HTMLEncoder;
 
 public final class TranslateCommand implements Outputable {

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index d8d0d4d37932c82edbf38397877fdb1206c0dad9..b19e8f5b5625d3e1bf64d8256769f9163b684998 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -19,7 +19,7 @@ import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.util.PasswordHash;
 
 public class LoginPage extends Page {
 import org.cacert.gigi.util.PasswordHash;
 
 public class LoginPage extends Page {

diff --git a/src/org/cacert/gigi/pages/OneFormPage.java b/src/org/cacert/gigi/pages/OneFormPage.java
index 5eb4db8bfb122c0f12510c334d3749af90d46d96..6afee7097a26d9cd876edb6d5a38d8134456e2ce 100644 (file)
--- a/src/org/cacert/gigi/pages/OneFormPage.java
+++ b/src/org/cacert/gigi/pages/OneFormPage.java
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 
 public class OneFormPage extends Page {
 
 
 public class OneFormPage extends Page {
 

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index ceaee92e57e3441fbc5a1b34395598c9353e5127..8e73d3f27f83c16a70f67c1d36471b217a6c8dc3 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java b/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
index c17f2d8d652354d28c60b1580565e659d16c220d..47a5f9151d25f317c819b612204efb56cb4bdc4d 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
+++ b/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
@@ -6,7 +6,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class ChangePasswordPage extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class ChangePasswordPage extends Page {

diff --git a/src/org/cacert/gigi/pages/account/MyDetails.java b/src/org/cacert/gigi/pages/account/MyDetails.java
index 9f9a344c42c311a9fbcc0a6f1a69a418be4bbf71..9de78a2e439d05f1d79f87fadcc9bb62055f70df 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetails.java
+++ b/src/org/cacert/gigi/pages/account/MyDetails.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class MyDetails extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class MyDetails extends Page {

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index c79bcea5f0063f02ee519e22344e9e471296241e..efff2f0e82ebf92e7def05f177c544fda6acf3a9 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -9,7 +9,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;

diff --git a/src/org/cacert/gigi/pages/account/MyListingForm.java b/src/org/cacert/gigi/pages/account/MyListingForm.java
index 97f32629f16445f476f9e3b00a2f30f7e8c99c45..b3e831827c870f3077886684437aca03154983f6 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyListingForm.java
+++ b/src/org/cacert/gigi/pages/account/MyListingForm.java
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 
 public class MyListingForm extends Form {
 import org.cacert.gigi.output.template.Template;
 
 public class MyListingForm extends Form {

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
index 317c6709ac6240363c5ed8775807801b700441e2..4e7da1dd187e69b7e866856d74253ee1846e2235 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.dbObjects.Certificate;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.dbObjects.Certificate;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class CertificateAdd extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class CertificateAdd extends Page {

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
index d07b65d46842b268643e76a321b42663d5b68e08..428e39a6439f54480486cdbbc78dc8b5b4811e53 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
@@ -30,8 +30,8 @@ import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.CertificateValiditySelector;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.CertificateValiditySelector;

-import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.template.HashAlgorithms;
+import org.cacert.gigi.output.HashAlgorithms;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java
index f9f8011775626d703c2e10dacbb46e0b0a956ba2..6244e9d622106d3b72e2dd4cb1229fbfaee18866 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java
@@ -9,8 +9,8 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.Outputable;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java
index 6965382fa7b54409c58934779d1820154ad99906..617d3d6540e1bd2f3aa35f4910af29ed3ca99767 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java
@@ -9,7 +9,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
index 2ca5d3aeedd7d7cf864c05660f98231c04cb39bb..1677029252fea60efe71a0209d48175287464a4f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
@@ -11,7 +11,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.dbObjects.User;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class DomainOverview extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class DomainOverview extends Page {

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
index 7c21b46ce73da822abc84829ba6c7dc89a3ddf30..4d4a36fee63b6cad3b3aa66afb64bc68a6cb240a 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
@@ -10,7 +10,7 @@ import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.Domain.DomainPingExecution;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Domain.DomainPingExecution;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
index 460866cd1bdfd12e2e368a7269a6d5f116ca1b4d..91ea7cc0f2bfbb4b185094eb8172f5feffcf83f1 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
@@ -13,7 +13,7 @@ import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration.PingType;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration.PingType;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.ping.SSLPinger;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.ping.SSLPinger;

diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
index d4d46eae8602ec14db93b73b6607010b469fe410..94395947e52c8755ed99f9aad2b31046442b22e6 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
@@ -9,7 +9,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index d233563992c437d9d336d967a8e4d5147a7ee4c3..c8245026d8d6b8a0e47f0251e497318f758de6ab 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -9,7 +9,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
index b875ded430123537b79c74d727047832a5d9cba1..593307da32fa7e7c8a0039b8129a733fd4f8c894 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class MailOverview extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class MailOverview extends Page {

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
index f3c9b76a2c645f08677e383a0a0da5687c1f4146..69f07827c6b8b2e2f1d33cb6b4a42bf71abf7e8c 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
@@ -9,7 +9,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
index ff0c1c35029902e29f1f91f96b8f721c4ccb1d77..04d325c1b02b2479ff7430f39a5150f48864ea62 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
@@ -12,7 +12,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index 55d44ed79c26d190bb7adf5f80d796cab3f18931..72adc23e63a93d0d3af1bb1e0c26d15c42b59ca1 100644 (file)
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.dbObjects.User;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.dbObjects.User;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class RegisterPage extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class RegisterPage extends Page {

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 94c686d983e85c1df24292ca4faf9daffa07a70a..95cefd1e5a71aab6c5b0d23490a3b166fcf914ad 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -18,7 +18,7 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;

diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
index b9a42e7acbfc368d7badc2ca593678e18f42fbcc..defd3baf7755b0ada176249e2f49ee6d44c1de5b 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.java
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
@@ -12,7 +12,7 @@ import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.Organisation.Affiliation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Organisation.Affiliation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;

diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
index df5d4fe272292e7c30d0bb23bc041be9f8ba0a8d..4cd37b9a7705e0dd755ab5ba9424b4bd1a4d0ea0 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 

diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgPage.java b/src/org/cacert/gigi/pages/orga/CreateOrgPage.java
index 60763e68c443f4fec34eecdcd81c5ad61f7aa065..f1e8ea6a39274e5257e586bb0d50078fa7bf7d1f 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/CreateOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgPage.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.Page;
 
 public class CreateOrgPage extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class CreateOrgPage extends Page {

diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index e283f4a6b01c3df7c791db259919b496b2b2d0f0..c4b65ca965bb3ba062b696c4109717abffb48045 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -13,7 +13,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 38b4ae0654acc1497ceccccedf5c47ad4a644269..a5fd52d241ec4b8a91c16d20b5add2ecae5b5223 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -12,7 +12,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.Notary;

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 5e7abfb7408b091ed7f3d6e6a9b9ec10499fec20..cc20c4d7a900b9183856da9c2551b8d3c5d326cf 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -13,7 +13,7 @@ import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.java b/src/org/cacert/gigi/pages/wot/RequestTTPForm.java
index 7da62e06de05f3f2ab9c9d4010612131bd17d5b2..eae49e6e820ab0fcc82f30c83b20b05fb557b3c2 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/RequestTTPForm.java
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.java
@@ -9,7 +9,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.OutputableArrayIterable;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.output.template.OutputableArrayIterable;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;

diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java
index a4ea66f5755f8dfe4701fd40f4aa20aff235c493..041014dde2e0de8adfedfa73aaec9633d49a284b 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Assurance;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Assurance;
 import org.cacert.gigi.dbObjects.User;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 

diff --git a/tests/org/cacert/gigi/template/TestTemplate.java b/tests/org/cacert/gigi/template/TestTemplate.java
index 50b1d693a30183626fd57ad16ffb45ddafd2ac28..fff3ecba06a61cbd47a47ff92376dd410dbf822a 100644 (file)
--- a/tests/org/cacert/gigi/template/TestTemplate.java
+++ b/tests/org/cacert/gigi/template/TestTemplate.java
@@ -11,9 +11,9 @@ import java.util.Map;
 
 import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.localisation.Language;
 
 import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.template.HashAlgorithms;
+import org.cacert.gigi.output.HashAlgorithms;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.IterableDataset;

+import org.cacert.gigi.output.template.Outputable;

 import org.cacert.gigi.output.template.OutputableArrayIterable;
 import org.cacert.gigi.output.template.Template;
 import org.junit.Test;
 import org.cacert.gigi.output.template.OutputableArrayIterable;
 import org.cacert.gigi.output.template.Template;
 import org.junit.Test;

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 486ba2c57614de75ad30b4f8511bf6bc2fc78fe3..51f55767542dc4f64b957643c93c2c4bce656bf6 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -24,7 +24,7 @@ import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;

-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;

 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.util.Notary;