From cd14b85c60f736a643842b421b11f41d8fca86c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 14 Nov 2014 20:01:50 +0100 Subject: [PATCH] UPD: Move some template classes to there reightful place. --- src/org/cacert/gigi/Gigi.java | 4 ++-- src/org/cacert/gigi/dbObjects/Name.java | 2 +- src/org/cacert/gigi/output/AssurancesDisplay.java | 1 + src/org/cacert/gigi/output/CertificateValiditySelector.java | 1 + src/org/cacert/gigi/output/DateSelector.java | 1 + src/org/cacert/gigi/output/{template => }/HashAlgorithms.java | 3 ++- src/org/cacert/gigi/output/IMenuItem.java | 1 + src/org/cacert/gigi/output/template/ForeachStatement.java | 1 - src/org/cacert/gigi/output/{ => template}/Form.java | 2 +- src/org/cacert/gigi/output/template/IfStatement.java | 1 - .../cacert/gigi/output/template/OutputVariableCommand.java | 1 - src/org/cacert/gigi/output/{ => template}/Outputable.java | 2 +- src/org/cacert/gigi/output/template/SprintfCommand.java | 1 - src/org/cacert/gigi/output/template/Template.java | 1 - src/org/cacert/gigi/output/template/TemplateBlock.java | 1 - src/org/cacert/gigi/output/template/TranslateCommand.java | 1 - src/org/cacert/gigi/pages/LoginPage.java | 2 +- src/org/cacert/gigi/pages/OneFormPage.java | 2 +- src/org/cacert/gigi/pages/account/ChangeForm.java | 2 +- src/org/cacert/gigi/pages/account/ChangePasswordPage.java | 2 +- src/org/cacert/gigi/pages/account/MyDetails.java | 2 +- src/org/cacert/gigi/pages/account/MyDetailsForm.java | 2 +- src/org/cacert/gigi/pages/account/MyListingForm.java | 2 +- src/org/cacert/gigi/pages/account/certs/CertificateAdd.java | 2 +- .../cacert/gigi/pages/account/certs/CertificateIssueForm.java | 4 ++-- src/org/cacert/gigi/pages/account/domain/DomainAddForm.java | 4 ++-- .../gigi/pages/account/domain/DomainManagementForm.java | 2 +- src/org/cacert/gigi/pages/account/domain/DomainOverview.java | 2 +- .../cacert/gigi/pages/account/domain/DomainPinglogForm.java | 2 +- src/org/cacert/gigi/pages/account/domain/PingConfigForm.java | 2 +- src/org/cacert/gigi/pages/account/mail/MailAddForm.java | 2 +- .../cacert/gigi/pages/account/mail/MailManagementForm.java | 2 +- src/org/cacert/gigi/pages/account/mail/MailOverview.java | 2 +- src/org/cacert/gigi/pages/admin/TTPAdminForm.java | 2 +- src/org/cacert/gigi/pages/admin/TTPAdminPage.java | 2 +- src/org/cacert/gigi/pages/main/RegisterPage.java | 2 +- src/org/cacert/gigi/pages/main/Signup.java | 2 +- src/org/cacert/gigi/pages/orga/AffiliationForm.java | 2 +- src/org/cacert/gigi/pages/orga/CreateOrgForm.java | 2 +- src/org/cacert/gigi/pages/orga/CreateOrgPage.java | 2 +- src/org/cacert/gigi/pages/orga/ViewOrgPage.java | 2 +- src/org/cacert/gigi/pages/wot/AssuranceForm.java | 2 +- src/org/cacert/gigi/pages/wot/AssurePage.java | 2 +- src/org/cacert/gigi/pages/wot/RequestTTPForm.java | 2 +- src/org/cacert/gigi/pages/wot/RequestTTPPage.java | 2 +- tests/org/cacert/gigi/template/TestTemplate.java | 4 ++-- util-testing/org/cacert/gigi/pages/Manager.java | 2 +- 47 files changed, 45 insertions(+), 47 deletions(-) rename src/org/cacert/gigi/output/{template => }/HashAlgorithms.java (89%) rename src/org/cacert/gigi/output/{ => template}/Form.java (98%) rename src/org/cacert/gigi/output/{ => template}/Outputable.java (83%) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 82012a50..cf852073 100644 --- 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.output.Form.CSRFException; 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.template.Outputable; 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; diff --git a/src/org/cacert/gigi/dbObjects/Name.java b/src/org/cacert/gigi/dbObjects/Name.java index 512dc769..7dcaeec6 100644 --- 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 org.cacert.gigi.output.Outputable; +import org.cacert.gigi.output.template.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 b0908c5d..639197cd 100644 --- 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.output.template.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 1c059ae9..b8601de5 100644 --- 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.output.template.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 1aefa137..aadac045 100644 --- 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.output.template.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 e221aee3..8e13513a 100644 --- 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 org.cacert.gigi.output.template.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 eeef0b04..5e85f627 100644 --- 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; +import org.cacert.gigi.output.template.Outputable; /** * 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 4a368cc9..edabab77 100644 --- 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 org.cacert.gigi.output.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 b7caa214..f469c21c 100644 --- 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; diff --git a/src/org/cacert/gigi/output/template/IfStatement.java b/src/org/cacert/gigi/output/template/IfStatement.java index adb90992..db0cbe11 100644 --- 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 org.cacert.gigi.output.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 1a304d89..b3534edc 100644 --- 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 org.cacert.gigi.output.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 9d1530c6..5716162a 100644 --- 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; diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java index 8d42af44..e2ff0ba6 100644 --- 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 org.cacert.gigi.output.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 dca6568b..0bd9cce1 100644 --- 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.output.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 6b30cf33..15ce4e5b 100644 --- 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 org.cacert.gigi.output.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 eca7c845..cae48a63 100644 --- 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 org.cacert.gigi.output.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 d8d0d4d3..b19e8f5b 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 5eb4db8b..6afee709 100644 --- 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 org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; 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 ceaee92e..8e73d3f2 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 c17f2d8d..47a5f915 100644 --- 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 org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; 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 9f9a344c..9de78a2e 100644 --- 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 org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; 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 c79bcea5..efff2f0e 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/account/MyListingForm.java b/src/org/cacert/gigi/pages/account/MyListingForm.java index 97f32629..b3e83182 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.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 317c6709..4e7da1dd 100644 --- 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 org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; 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 d07b65d4..428e39a6 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java index f9f80117..6244e9d6 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java index 6965382f..617d3d65 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java index 2ca5d3ae..16770292 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 7c21b46c..4d4a36fe 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 460866cd..91ea7cc0 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java index d4d46eae..94395947 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 d2335639..c8245026 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java index b875ded4..593307da 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 f3c9b76a..69f07827 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 ff0c1c35..04d325c1 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java index 55d44ed7..72adc23e 100644 --- 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 org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; 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 94c686d9..95cefd1e 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java index b9a42e7a..defd3baf 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java index df5d4fe2..4cd37b9a 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 60763e68..f1e8ea6a 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 e283f4a6..c4b65ca9 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java index 38b4ae06..a5fd52d2 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java index 5e7abfb7..cc20c4d7 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.java b/src/org/cacert/gigi/pages/wot/RequestTTPForm.java index 7da62e06..eae49e6e 100644 --- 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.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; diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java index a4ea66f5..041014dd 100644 --- 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.output.Form; +import org.cacert.gigi.output.template.Form; 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 50b1d693..fff3ecba 100644 --- 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.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.Outputable; 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 486ba2c5..51f55767 100644 --- 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.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; -- 2.39.2