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

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

Revision: 4354
          http://jnode.svn.sourceforge.net/jnode/?rev=4354&view=rev
Author:   crawley
Date:     2008-07-25 14:03:14 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
Fix bugs in handling of missing default values.

Modified Paths:
--------------
    trunk/builder/src/configure/org/jnode/configure/EnumeratedType.java
    trunk/builder/src/configure/org/jnode/configure/ScriptParser.java
    trunk/builder/src/configure/org/jnode/configure/adapter/BasePropertyFileAdapter.java

Modified: trunk/builder/src/configure/org/jnode/configure/EnumeratedType.java
===================================================================
--- trunk/builder/src/configure/org/jnode/configure/EnumeratedType.java	2008-07-24 22:03:21 UTC (rev 4353)
+++ trunk/builder/src/configure/org/jnode/configure/EnumeratedType.java	2008-07-25 14:03:14 UTC (rev 4354)
@@ -80,7 +80,8 @@
             } else {
                 sb.append(",");
             }
-            boolean isDefault = alternate.value.equals(defaultValue.getText());
+            boolean isDefault = alternate.value.equals(
+                    defaultValue == null ? "" : defaultValue.getText());
             if (isDefault) {
                 sb.append("[");
             }

Modified: trunk/builder/src/configure/org/jnode/configure/ScriptParser.java
===================================================================
--- trunk/builder/src/configure/org/jnode/configure/ScriptParser.java	2008-07-24 22:03:21 UTC (rev 4353)
+++ trunk/builder/src/configure/org/jnode/configure/ScriptParser.java	2008-07-25 14:03:14 UTC (rev 4354)
@@ -329,18 +329,17 @@
                 }
                 String description = child.getAttribute(DESCRIPTION, null);
                 if (name == null) {
-                    error(
-                            "A '" + PROPERTY + "' element requires a '" + DESCRIPTION +
-                                    "' attribute", child);
+                    error("A '" + PROPERTY + "' element requires a '" + DESCRIPTION +
+                            "' attribute", child);
                 }
-                String defaultValue = child.getAttribute(DEFAULT, null);
+                String defaultText = child.getAttribute(DEFAULT, null);
                 PropertyType type = script.getTypes().get(typeName);
                 if (type == null) {
                     error("Use of undeclared type '" + typeName + "'", child);
                 }
-                Value value = defaultValue == null ? null : type.fromValue(defaultValue);
+                Value defaultValue = (defaultText == null) ? null : type.fromValue(defaultText);
                 try {
-                    propSet.addProperty(name, type, description, value, child, stack.getLast()
+                    propSet.addProperty(name, type, description, defaultValue, child, stack.getLast()
                             .getFile());
                 } catch (ConfigureException ex) {
                     addStack(ex, child);

Modified: trunk/builder/src/configure/org/jnode/configure/adapter/BasePropertyFileAdapter.java
===================================================================
--- trunk/builder/src/configure/org/jnode/configure/adapter/BasePropertyFileAdapter.java	2008-07-24 22:03:21 UTC (rev 4353)
+++ trunk/builder/src/configure/org/jnode/configure/adapter/BasePropertyFileAdapter.java	2008-07-25 14:03:14 UTC (rev 4354)
@@ -135,8 +135,9 @@
         // Harvest the properties to be written into a Properties Object
         Properties properties = new Properties();
         for (Map.Entry<String, Property> entry : propSet.getProperties().entrySet()) {
-            Property prop = entry.getValue();
-            properties.setProperty(entry.getKey(), prop.getValue().getText());
+            PropertySet.Value propValue = entry.getValue().getValue();
+            String text = (propValue == null) ? "" : propValue.getText();
+            properties.setProperty(entry.getKey(), text);
         }
         OutputStream os = null;
         InputStream is = null;


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