[Jnode-svn-commits] SF.net SVN: jnode:[4421] trunk/builder/src/configure/org/jnode/configure

[<cr...@us...>]

Revision: 4421
          http://jnode.svn.sourceforge.net/jnode/?rev=4421&view=rev
Author:   crawley
Date:     2008-08-10 14:23:26 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
More bug fixes for default property values ...

Modified Paths:
--------------
    trunk/builder/src/configure/org/jnode/configure/Screen.java
    trunk/builder/src/configure/org/jnode/configure/ScriptParser.java

Modified: trunk/builder/src/configure/org/jnode/configure/Screen.java
===================================================================
--- trunk/builder/src/configure/org/jnode/configure/Screen.java	2008-08-09 18:20:41 UTC (rev 4420)
+++ trunk/builder/src/configure/org/jnode/configure/Screen.java	2008-08-10 14:23:26 UTC (rev 4421)
@@ -148,10 +148,13 @@
                 if (input == null) {
                     throw new ConfigureException("Unexpected EOF on input");
                 }
-                value = prop.getType().fromInput(input);
-                if (value == null && input.length() == 0 && defaultValue != null) {
-                    configure.debug("Using default");
-                    value = defaultValue;
+                if (input.length() == 0) {
+                    if (defaultValue != null) {
+                        configure.debug("Using default");
+                        value = defaultValue;
+                    }
+                } else {
+                    value = prop.getType().fromInput(input);
                 }
                 // Loop until we get a permissible value.
             } while (value == null);

Modified: trunk/builder/src/configure/org/jnode/configure/ScriptParser.java
===================================================================
--- trunk/builder/src/configure/org/jnode/configure/ScriptParser.java	2008-08-09 18:20:41 UTC (rev 4420)
+++ trunk/builder/src/configure/org/jnode/configure/ScriptParser.java	2008-08-10 14:23:26 UTC (rev 4421)
@@ -354,12 +354,12 @@
                     error("A '" + PROPERTY + "' element requires a '" + DESCRIPTION +
                             "' attribute", child);
                 }
-                String defaultText = child.getAttribute(DEFAULT, null);
+                String defaultText = child.getAttribute(DEFAULT, "");
                 PropertyType type = script.getTypes().get(typeName);
                 if (type == null) {
                     error("Use of undeclared type '" + typeName + "'", child);
                 }
-                Value defaultValue = (defaultText == null) ? null : type.fromValue(defaultText);
+                Value defaultValue = type.fromValue(defaultText);
                 configure.debug("Default value for " + name + " is " + 
                         (defaultValue == null ? "null" : defaultValue.toString()));
                 try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.