1 files changed, 41 insertions, 46 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
index 4a300a2..ff9927b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
@@ -21,76 +21,68 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.server.iaik.config;
 
-import iaik.pki.store.revocation.archive.ArchiveConfiguration;
-import iaik.pki.store.revocation.archive.ArchiveParameters;
-import iaik.pki.store.revocation.archive.ArchiveTypes;
-
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.util.Enumeration;
 
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
+import iaik.pki.store.revocation.archive.ArchiveConfiguration;
+import iaik.pki.store.revocation.archive.ArchiveParameters;
+import iaik.pki.store.revocation.archive.ArchiveTypes;
 
 /**
- * An implementation of the <code>ArchiveConfiguration</code> interface
- * using configuration data provided by the MOA configuration file.
- * 
+ * An implementation of the <code>ArchiveConfiguration</code> interface using
+ * configuration data provided by the MOA configuration file.
+ *
  * @see iaik.pki.store.revocation.archive.ArchiveConfiguration
  * @author Patrick Peck
  * @version $Id$
  */
 public class ArchiveConfigurationImpl
-  extends AbstractObservableConfiguration
-  implements ArchiveConfiguration {
-    
+    extends AbstractObservableConfiguration
+    implements ArchiveConfiguration {
+
   /** The configuration parameters of the archive. */
-  private ArchiveParameters archiveParameters;
+  private final ArchiveParameters archiveParameters;
 
   /**
    * Create a new <code>ArchiveConfigurationImpl</code>.
-   * 
-   * @param config The MOA configuration from which the configuration data is being read.
+   *
+   * @param config The MOA configuration from which the configuration data is
+   *               being read.
    */
-  public ArchiveConfigurationImpl(ConfigurationProvider config) 
-  {
-    String jdbcUrl = config.getRevocationArchiveJDBCURL();
+  public ArchiveConfigurationImpl(ConfigurationProvider config) {
+    final String jdbcUrl = config.getRevocationArchiveJDBCURL();
     this.archiveParameters = new DataBaseArchiveParameterImpl(jdbcUrl);
-    
-    // Register JDBC driver class 
-    if (jdbcUrl != null)
-    {
-      String jdbcDriverClass = config.getRevocationArchiveJDBCDriverClass();
-      try
-      {
+
+    // Register JDBC driver class
+    if (jdbcUrl != null) {
+      final String jdbcDriverClass = config.getRevocationArchiveJDBCDriverClass();
+      try {
         Class.forName(jdbcDriverClass);
-      }
-      catch (ClassNotFoundException e)
-      {
+      } catch (final ClassNotFoundException e) {
         // TODO 20030709 GK Improve exception handling
-        throw new RuntimeException("JDBC driver class \"" + jdbcDriverClass + " could not be found.");       
+        throw new RuntimeException("JDBC driver class \"" + jdbcDriverClass + " could not be found.");
       }
-      
-      Enumeration regDrivers = DriverManager.getDrivers();
+
+      final Enumeration regDrivers = DriverManager.getDrivers();
       boolean isRegistered = false;
-      while (regDrivers.hasMoreElements())
-      {
-        Object currentDriver = regDrivers.nextElement();
-        if (jdbcDriverClass.equals(currentDriver.getClass().getName())) isRegistered = true;
-      }
-      if (!isRegistered)
-      {
-        // Workaround for a driver which does not register itselve at invocation of Class.forName(drvname)
-        try
-        {
-          DriverManager.registerDriver((Driver)Class.forName(jdbcDriverClass).newInstance()); 
+      while (regDrivers.hasMoreElements()) {
+        final Object currentDriver = regDrivers.nextElement();
+        if (jdbcDriverClass.equals(currentDriver.getClass().getName())) {
+          isRegistered = true;
         }
-        catch (Exception e)
-        {
+      }
+      if (!isRegistered) {
+        // Workaround for a driver which does not register itselve at invocation of
+        // Class.forName(drvname)
+        try {
+          DriverManager.registerDriver((Driver) Class.forName(jdbcDriverClass).newInstance());
+        } catch (final Exception e) {
           // TODO 20030709 GK Improve exception handling
-          throw new RuntimeException("Registering JDBC driver \"" + jdbcDriverClass + " failed.");       
+          throw new RuntimeException("Registering JDBC driver \"" + jdbcDriverClass + " failed.");
         }
       }
     }
@@ -98,11 +90,13 @@ public class ArchiveConfigurationImpl
 
   /**
    * Return the type of archive.
-   * 
+   *
    * This will always return <code>ArchiveTypes.DATABASE</code>.
+   *
    * @return <code>ArchiveTypes.DATABASE</code>.
    * @see iaik.pki.store.revocation.archive.ArchiveConfiguration#getType()
    */
+  @Override
   public String getType() {
     return ArchiveTypes.DATABASE;
   }
@@ -110,10 +104,11 @@ public class ArchiveConfigurationImpl
   /**
    * Return the <code>ArchiveParameters</code> describing this
    * <code>ArchiveConfiguration</code>.
-   * 
+   *
    * @return The archive parameters.
    * @see iaik.pki.store.revocation.archive.ArchiveConfiguration#getArchiveParameters()
    */
+  @Override
   public ArchiveParameters getArchiveParameters() {
     return archiveParameters;
   }