[Bedework-commit] rpiutil r214 - releases/bedework-3.7/src/edu/rpi/sss/util

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-14 10:21:10 -0500 (Mon, 14 Feb 2011)
New Revision: 214

Modified:
   releases/bedework-3.7/src/edu/rpi/sss/util/Options.java
   releases/bedework-3.7/src/edu/rpi/sss/util/OptionsFactory.java
   releases/bedework-3.7/src/edu/rpi/sss/util/OptionsI.java
Log:
Further changes to the build. Attempt to catch changed libraries and force a rebuild.

Also use outofdate to suppress running of apt when sources have not changed.

Minor but widespread change to remove debug parameter from a number of classes. For those debugging now depends on log4j level.

Modified: releases/bedework-3.7/src/edu/rpi/sss/util/Options.java
===================================================================
--- releases/bedework-3.7/src/edu/rpi/sss/util/Options.java	2011-02-14 15:19:51 UTC (rev 213)
+++ releases/bedework-3.7/src/edu/rpi/sss/util/Options.java	2011-02-14 15:21:10 UTC (rev 214)
@@ -79,8 +79,7 @@
   public void init(final String globalPrefix,
                    final String appPrefix,
                    final String optionsFile,
-                   final String outerTagName,
-                   final boolean debug) throws OptionsException {
+                   final String outerTagName) throws OptionsException {
     this.globalPrefix = globalPrefix;
     this.appPrefix = appPrefix;
     this.optionsFile = optionsFile;

Modified: releases/bedework-3.7/src/edu/rpi/sss/util/OptionsFactory.java
===================================================================
--- releases/bedework-3.7/src/edu/rpi/sss/util/OptionsFactory.java	2011-02-14 15:19:51 UTC (rev 213)
+++ releases/bedework-3.7/src/edu/rpi/sss/util/OptionsFactory.java	2011-02-14 15:21:10 UTC (rev 214)
@@ -39,15 +39,13 @@
    * @param appPrefix
    * @param optionsFile - path to file e.g. /properties/calendar/options.xml
    * @param outerTagName - surrounding tag in options file e.g. bedework-options
-   * @param debug
    * @return CalOptionsI
   * @throws OptionsException
   */
-  public static OptionsI getOptions(String globalPrefix,
-                                    String appPrefix,
-                                    String optionsFile,
-                                    String outerTagName,
-                                    boolean debug) throws OptionsException {
+  public static OptionsI getOptions(final String globalPrefix,
+                                    final String appPrefix,
+                                    final String optionsFile,
+                                    final String outerTagName) throws OptionsException {
     try {
       Object o = Class.forName(envclass).newInstance();
 
@@ -63,7 +61,7 @@
 
       OptionsI options = (OptionsI)o;
 
-      options.init(globalPrefix, appPrefix, optionsFile, outerTagName, debug);
+      options.init(globalPrefix, appPrefix, optionsFile, outerTagName);
 
       return options;
     } catch (OptionsException ce) {
@@ -79,18 +77,16 @@
    * @param appPrefix
    * @param outerTagName
    * @param is
-   * @param debug
    * @return CalOptions
    * @throws OptionsException
    */
-  public static Options fromStream(String globalPrefix,
-                                   String appPrefix,
-                                   String outerTagName,
-                                   InputStream is,
-                                   boolean debug) throws OptionsException {
+  public static Options fromStream(final String globalPrefix,
+                                   final String appPrefix,
+                                   final String outerTagName,
+                                   final InputStream is) throws OptionsException {
     Options opts = new Options();
 
-    opts.init(globalPrefix, appPrefix, null, outerTagName, debug);
+    opts.init(globalPrefix, appPrefix, null, outerTagName);
 
     opts.initFromStream(is);
 

Modified: releases/bedework-3.7/src/edu/rpi/sss/util/OptionsI.java
===================================================================
--- releases/bedework-3.7/src/edu/rpi/sss/util/OptionsI.java	2011-02-14 15:19:51 UTC (rev 213)
+++ releases/bedework-3.7/src/edu/rpi/sss/util/OptionsI.java	2011-02-14 15:21:10 UTC (rev 214)
@@ -78,14 +78,12 @@
    * @param appPrefix
    * @param optionsFile - path to file e.g. /properties/calendar/options.xml
    * @param outerTagName - surrounding tag in options file e.g. bedework-options
-   * @param debug
    * @throws OptionsException
    */
   public void init(String globalPrefix,
                    String appPrefix,
                    String optionsFile,
-                   String outerTagName,
-                   boolean debug) throws OptionsException;
+                   String outerTagName) throws OptionsException;
 
   /** Just a restatement of the xml element
    *
@@ -117,7 +115,7 @@
      *
      * @param val OptionElement
      */
-    public void addChild(OptionElement val) {
+    public void addChild(final OptionElement val) {
       getChildren().add(val);
     }
   }