From e87392fd58e9152531a8d1cb34cb46e370062108 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 22 Sep 2014 19:07:03 +0200 Subject: [PATCH] [EMPTY] Organize all imports --- .settings/org.eclipse.jdt.ui.prefs | 59 +++++++++++++++++++ src/org/cacert/gigi/Launcher.java | 1 + src/org/cacert/gigi/crypto/SPKAC.java | 1 + .../cacert/gigi/dbObjects/EmailAddress.java | 1 + .../output/CertificateValiditySelector.java | 2 +- src/org/cacert/gigi/pages/LoginPage.java | 1 + .../account/certs/CertificateIssueForm.java | 6 +- .../account/domain/DomainPinglogForm.java | 2 +- src/org/cacert/gigi/ping/SSLPinger.java | 4 +- src/org/cacert/gigi/util/Job.java | 1 + tests/org/cacert/gigi/LoginTest.java | 4 +- tests/org/cacert/gigi/TestCertificate.java | 5 +- .../cacert/gigi/TestCrossDomainAccess.java | 1 - tests/org/cacert/gigi/TestLanguage.java | 4 +- .../org/cacert/gigi/TestSecurityHeaders.java | 4 +- .../cacert/gigi/TestSeparateSessionScope.java | 2 +- tests/org/cacert/gigi/TestUser.java | 4 +- .../gigi/email/TestEmailProviderClass.java | 1 - tests/org/cacert/gigi/email/TestSendmail.java | 4 +- .../pages/account/TestCertificateAdd.java | 2 +- tests/org/cacert/gigi/pages/wot/TestTTP.java | 6 +- tests/org/cacert/gigi/ping/TestSSL.java | 2 +- .../cacert/gigi/testUtils/ManagedTest.java | 2 +- .../gigi/testUtils/TestEmailReciever.java | 2 +- tests/org/cacert/gigi/util/TestNotary.java | 4 +- .../cacert/gigi/util/TestPasswordHash.java | 3 +- .../util/TestPasswordStrengthChecker.java | 4 +- util/org/cacert/gigi/util/SimpleSigner.java | 2 +- 28 files changed, 98 insertions(+), 36 deletions(-) diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 6af2231a..4ef74ca7 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,7 +1,66 @@ eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_cacert-gigi formatter_settings_version=12 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.staticondemandthreshold=1 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=false +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=false +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_type_arguments=false diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java index 428c25c2..983c18dc 100644 --- a/src/org/cacert/gigi/Launcher.java +++ b/src/org/cacert/gigi/Launcher.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Locale; import java.util.Properties; import java.util.TimeZone; + import javax.net.ssl.ExtendedSSLSession; import javax.net.ssl.SNIHostName; import javax.net.ssl.SNIServerName; diff --git a/src/org/cacert/gigi/crypto/SPKAC.java b/src/org/cacert/gigi/crypto/SPKAC.java index 75e59d19..c97f5acf 100644 --- a/src/org/cacert/gigi/crypto/SPKAC.java +++ b/src/org/cacert/gigi/crypto/SPKAC.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.security.Signature; import java.security.SignatureException; + import sun.security.util.DerInputStream; import sun.security.util.DerOutputStream; import sun.security.util.DerValue; diff --git a/src/org/cacert/gigi/dbObjects/EmailAddress.java b/src/org/cacert/gigi/dbObjects/EmailAddress.java index f4678fbf..f9188180 100644 --- a/src/org/cacert/gigi/dbObjects/EmailAddress.java +++ b/src/org/cacert/gigi/dbObjects/EmailAddress.java @@ -1,6 +1,7 @@ package org.cacert.gigi.dbObjects; import java.io.IOException; + import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/org/cacert/gigi/output/CertificateValiditySelector.java index 6f7d89fe..1c059ae9 100644 --- a/src/org/cacert/gigi/output/CertificateValiditySelector.java +++ b/src/org/cacert/gigi/output/CertificateValiditySelector.java @@ -1,8 +1,8 @@ package org.cacert.gigi.output; import java.io.PrintWriter; -import java.text.ParseException; import java.sql.Date; +import java.text.ParseException; import java.util.Map; import javax.servlet.http.HttpServletRequest; diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java index 4a405d84..ee6a6e98 100644 --- a/src/org/cacert/gigi/pages/LoginPage.java +++ b/src/org/cacert/gigi/pages/LoginPage.java @@ -4,6 +4,7 @@ import static org.cacert.gigi.Gigi.*; import java.io.IOException; import java.security.cert.X509Certificate; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java index e848854f..e17f3bed 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java @@ -19,12 +19,12 @@ import javax.servlet.http.HttpServletRequest; import org.cacert.gigi.GigiApiException; import org.cacert.gigi.crypto.SPKAC; import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateProfile; -import org.cacert.gigi.dbObjects.Digest; -import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.dbObjects.Certificate.CSRType; import org.cacert.gigi.dbObjects.Certificate.SANType; import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; +import org.cacert.gigi.dbObjects.CertificateProfile; +import org.cacert.gigi.dbObjects.Digest; +import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.CertificateValiditySelector; import org.cacert.gigi.output.Form; diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java index 38be5d98..7c21b46c 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java +++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest; import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Domain; -import org.cacert.gigi.dbObjects.DomainPingConfiguration; 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.IterableDataset; diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java index 81eabbe9..2f49b446 100644 --- a/src/org/cacert/gigi/ping/SSLPinger.java +++ b/src/org/cacert/gigi/ping/SSLPinger.java @@ -19,11 +19,11 @@ import javax.net.ssl.SNIHostName; import javax.net.ssl.SNIServerName; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLEngineResult.Status; import javax.net.ssl.SSLException; -import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLParameters; +import javax.net.ssl.TrustManagerFactory; import javax.security.cert.X509Certificate; import org.cacert.gigi.dbObjects.Certificate; diff --git a/src/org/cacert/gigi/util/Job.java b/src/org/cacert/gigi/util/Job.java index cb484cf0..f5287717 100644 --- a/src/org/cacert/gigi/util/Job.java +++ b/src/org/cacert/gigi/util/Job.java @@ -1,6 +1,7 @@ package org.cacert.gigi.util; import java.sql.Date; + import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java index 856a79e9..d6c6fc49 100644 --- a/tests/org/cacert/gigi/LoginTest.java +++ b/tests/org/cacert/gigi/LoginTest.java @@ -1,10 +1,10 @@ package org.cacert.gigi; +import static org.junit.Assert.*; + import java.io.IOException; import java.net.URL; -import static org.junit.Assert.*; - import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java index c9ada288..99a51157 100644 --- a/tests/org/cacert/gigi/TestCertificate.java +++ b/tests/org/cacert/gigi/TestCertificate.java @@ -1,5 +1,7 @@ package org.cacert.gigi; +import static org.junit.Assert.*; + import java.io.IOException; import java.security.GeneralSecurityException; import java.security.KeyPair; @@ -10,16 +12,15 @@ import java.util.Collection; import java.util.List; import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Certificate.CSRType; import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; import org.cacert.gigi.dbObjects.Certificate.SANType; import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; +import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; import sun.security.x509.GeneralNameInterface; -import static org.junit.Assert.*; public class TestCertificate extends ManagedTest { diff --git a/tests/org/cacert/gigi/TestCrossDomainAccess.java b/tests/org/cacert/gigi/TestCrossDomainAccess.java index b78b8a39..8a67e64a 100644 --- a/tests/org/cacert/gigi/TestCrossDomainAccess.java +++ b/tests/org/cacert/gigi/TestCrossDomainAccess.java @@ -23,7 +23,6 @@ import org.junit.Test; public class TestCrossDomainAccess extends ManagedTest { - @Test public void testNoOriginHeader() throws MalformedURLException, IOException { URLConnection con = new URL("https://" + ServerConstants.getWwwHostNamePortSecure() + "/login").openConnection(); diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/org/cacert/gigi/TestLanguage.java index 1a97fc3c..1cac1452 100644 --- a/tests/org/cacert/gigi/TestLanguage.java +++ b/tests/org/cacert/gigi/TestLanguage.java @@ -1,5 +1,6 @@ package org.cacert.gigi; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import java.io.IOException; @@ -10,9 +11,6 @@ import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.ManagedTest; - -import static org.hamcrest.CoreMatchers.*; - import org.junit.Test; public class TestLanguage extends ManagedTest { diff --git a/tests/org/cacert/gigi/TestSecurityHeaders.java b/tests/org/cacert/gigi/TestSecurityHeaders.java index ddff38ee..16f4f3a0 100644 --- a/tests/org/cacert/gigi/TestSecurityHeaders.java +++ b/tests/org/cacert/gigi/TestSecurityHeaders.java @@ -1,5 +1,7 @@ package org.cacert.gigi; +import static org.junit.Assert.*; + import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -7,8 +9,6 @@ import java.net.URL; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -import static org.junit.Assert.*; - public class TestSecurityHeaders extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java index 2da974ad..d4115be1 100644 --- a/tests/org/cacert/gigi/TestSeparateSessionScope.java +++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java @@ -12,8 +12,8 @@ import java.security.cert.X509Certificate; import java.sql.SQLException; import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Certificate.CSRType; +import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index 16543dad..2c039875 100644 --- a/tests/org/cacert/gigi/TestUser.java +++ b/tests/org/cacert/gigi/TestUser.java @@ -1,5 +1,7 @@ package org.cacert.gigi; +import static org.junit.Assert.*; + import java.sql.Date; import java.sql.SQLException; import java.util.Locale; @@ -12,8 +14,6 @@ import org.cacert.gigi.localisation.Language; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -import static org.junit.Assert.*; - public class TestUser extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/email/TestEmailProviderClass.java b/tests/org/cacert/gigi/email/TestEmailProviderClass.java index edae6f47..1098ac3a 100644 --- a/tests/org/cacert/gigi/email/TestEmailProviderClass.java +++ b/tests/org/cacert/gigi/email/TestEmailProviderClass.java @@ -6,7 +6,6 @@ import static org.junit.Assume.*; import java.io.IOException; import java.util.Properties; -import org.cacert.gigi.email.EmailProvider; import org.cacert.gigi.testUtils.ConfiguredTest; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java index ce51307b..962fa837 100644 --- a/tests/org/cacert/gigi/email/TestSendmail.java +++ b/tests/org/cacert/gigi/email/TestSendmail.java @@ -1,8 +1,8 @@ package org.cacert.gigi.email; -import static org.junit.Assume.*; -import static org.junit.Assert.*; import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; +import static org.junit.Assume.*; import java.io.BufferedReader; import java.io.IOException; diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java index 9adf7e73..116cdd80 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java +++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java @@ -1,7 +1,7 @@ package org.cacert.gigi.pages.account; -import static org.junit.Assert.*; import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/tests/org/cacert/gigi/pages/wot/TestTTP.java b/tests/org/cacert/gigi/pages/wot/TestTTP.java index f1180800..9f5aae30 100644 --- a/tests/org/cacert/gigi/pages/wot/TestTTP.java +++ b/tests/org/cacert/gigi/pages/wot/TestTTP.java @@ -1,5 +1,8 @@ package org.cacert.gigi.pages.wot; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; + import java.io.IOException; import java.net.URL; @@ -11,9 +14,6 @@ import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; - public class TestTTP extends ManagedTest { User u = User.getById(createVerifiedUser("fn", "ln", "test-" + createUniqueName() + "@example.org", TEST_PASSWORD)); diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java index 8684481e..9404e17b 100644 --- a/tests/org/cacert/gigi/ping/TestSSL.java +++ b/tests/org/cacert/gigi/ping/TestSSL.java @@ -30,8 +30,8 @@ import javax.net.ssl.X509TrustManager; import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Certificate; -import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Certificate.CSRType; +import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.pages.account.domain.DomainOverview; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.PingTest; diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index dff72da8..a65d3f24 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -46,9 +46,9 @@ import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.main.RegisterPage; import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; import org.cacert.gigi.util.DatabaseManager; +import org.cacert.gigi.util.DatabaseManager.ImportType; import org.cacert.gigi.util.ServerConstants; import org.cacert.gigi.util.SimpleSigner; -import org.cacert.gigi.util.DatabaseManager.ImportType; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java index 40b4e031..a68b1847 100644 --- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java +++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java @@ -3,8 +3,8 @@ package org.cacert.gigi.testUtils; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.net.SocketAddress; import java.net.Socket; +import java.net.SocketAddress; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java index 03e3aba5..1c2119f9 100644 --- a/tests/org/cacert/gigi/util/TestNotary.java +++ b/tests/org/cacert/gigi/util/TestNotary.java @@ -1,5 +1,7 @@ package org.cacert.gigi.util; +import static org.junit.Assert.*; + import java.sql.SQLException; import java.util.Date; @@ -11,8 +13,6 @@ import org.cacert.gigi.output.DateSelector; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -import static org.junit.Assert.*; - public class TestNotary extends ManagedTest { @Test diff --git a/tests/org/cacert/gigi/util/TestPasswordHash.java b/tests/org/cacert/gigi/util/TestPasswordHash.java index 2e323f78..1c2d9d3a 100644 --- a/tests/org/cacert/gigi/util/TestPasswordHash.java +++ b/tests/org/cacert/gigi/util/TestPasswordHash.java @@ -1,8 +1,9 @@ package org.cacert.gigi.util; -import org.junit.Test; import static org.junit.Assert.*; +import org.junit.Test; + public class TestPasswordHash { @Test diff --git a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java index 5aedb1bf..500cdfd2 100644 --- a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java +++ b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java @@ -1,10 +1,10 @@ package org.cacert.gigi.util; +import static org.junit.Assert.*; + import org.cacert.gigi.dbObjects.User; import org.junit.Test; -import static org.junit.Assert.*; - public class TestPasswordStrengthChecker { User u; diff --git a/util/org/cacert/gigi/util/SimpleSigner.java b/util/org/cacert/gigi/util/SimpleSigner.java index c98a58ce..0dbf833a 100644 --- a/util/org/cacert/gigi/util/SimpleSigner.java +++ b/util/org/cacert/gigi/util/SimpleSigner.java @@ -12,12 +12,12 @@ import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.util.Date; import java.sql.SQLException; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; import java.util.Properties; import java.util.TimeZone; -- 2.39.2