[junk-cvs-sync] junk/WEB-INF/classes/junk/plugin/scanner ScannerConfig.java,1.2,1.3

[<the...@us...>]

Update of /cvsroot/junk/junk/WEB-INF/classes/junk/plugin/scanner
In directory sc8-pr-cvs1:/tmp/cvs-serv706

Modified Files:
	ScannerConfig.java 
Log Message:
minor changes



Index: ScannerConfig.java
===================================================================
RCS file: /cvsroot/junk/junk/WEB-INF/classes/junk/plugin/scanner/ScannerConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScannerConfig.java	25 Nov 2003 12:08:50 -0000	1.2
--- ScannerConfig.java	16 Dec 2003 10:55:15 -0000	1.3
***************
*** 4,8 ****
   * Copyright 2003 by Marcus Proest (theevilflow at users dot sf dot net)
   *
!  *  This file is part of junk (java usefull net kollektor).
   *
   *   junk is free software; you can redistribute it and/or modify
--- 4,8 ----
   * Copyright 2003 by Marcus Proest (theevilflow at users dot sf dot net)
   *
!  *  This file is part of junk (java useful net kollektor).
   *
   *   junk is free software; you can redistribute it and/or modify
***************
*** 41,45 ****
  /** handles the config of the scanner plugin.
   * @author Marcus Proest (theevilflow at users dot sf dot net)
-  * @version 0.1
   */
  public class ScannerConfig {
--- 41,44 ----
***************
*** 78,82 ****
      /** the ip subnets to scan over */
      private ArrayList ipSubnets = null;
!     /** initial ipsubnetsString */    
      private String ipSubnetsString = null;
  
--- 77,82 ----
      /** the ip subnets to scan over */
      private ArrayList ipSubnets = null;
! 
!     /** initial ipsubnetsString */
      private String ipSubnetsString = null;
  
***************
*** 117,126 ****
          this.applyConfig(conf, path);
      }
!     
      /** To provide a StandAlone config
       * @param h the standalone config
!      */    
      protected ScannerConfig(HashMap h) {
!         this.applyConfig(h,null);
      }
  
--- 117,126 ----
          this.applyConfig(conf, path);
      }
! 
      /** To provide a StandAlone config
       * @param h the standalone config
!      */
      protected ScannerConfig(HashMap h) {
!         this.applyConfig(h, null);
      }
  
***************
*** 139,143 ****
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.THREAD_SLEEP_KEY
!                      + " failed, defaulting to " + this.sleep, e);
          }
  
--- 139,143 ----
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.THREAD_SLEEP_KEY
!                      + " FAILED, defaulting to " + this.sleep, e);
          }
  
***************
*** 148,152 ****
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.SCAN_INTERVAL_KEY
!                      + "failed, defaulting to " + this.interval, e);
          }
  
--- 148,152 ----
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.SCAN_INTERVAL_KEY
!                      + "FAILED, defaulting to " + this.interval, e);
          }
  
***************
*** 163,169 ****
          } catch (Exception e) {
              //this value cannot be defaulted, so failing ist fatal.
!             log.fatal("Loading parameter " + ScannerConfig.IP_RANGE_KEY
!                       + " failed. This is fatal.", e);
!             throw new IllegalArgumentException();
          }
  
--- 163,170 ----
          } catch (Exception e) {
              //this value cannot be defaulted, so failing ist fatal.
!             throw new IllegalArgumentException("Loading parameter "
!                                                + ScannerConfig.IP_RANGE_KEY
!                                                + " FAILED. (" + e.getMessage()
!                                                + ")");
          }
  
***************
*** 174,178 ****
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.TCP_TO_KEY
!                      + " failed, defaulting to " + this.tcpTimeout, e);
          }
  
--- 175,179 ----
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.TCP_TO_KEY
!                      + " FAILED, defaulting to " + this.tcpTimeout, e);
          }
  
***************
*** 183,187 ****
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.SAVE_MAP_KEY
!                      + " failed, defaulting to " + this.savemappath, e);
          }
      }
--- 184,188 ----
          } catch (Exception e) {
              log.warn("Loading parameter " + ScannerConfig.SAVE_MAP_KEY
!                      + " FAILED, defaulting to " + this.savemappath, e);
          }
      }
***************
*** 224,228 ****
      /** return the initial ipSubnets String
       * @return initial ipsubnets String
!      */    
      public String getSubnets() {
          return this.ipSubnetsString;
--- 225,229 ----
      /** return the initial ipSubnets String
       * @return initial ipsubnets String
!      */
      public String getSubnets() {
          return this.ipSubnetsString;