From f7851efd2aa98f3a98af1b8e043276532fc31247 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Mon, 23 Jan 2012 17:10:26 +0000
Subject: [PATCH] 	* Source/NSXMLElement.m: Remove setObjectValue:
 implementation. 	* Source/NSXMLNode.m: Remove comments around code to
 replace 	nil value. 	* Tests/base/NSXMLNode/basic.m: correct test.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/nsxml_using_libxml2@34611 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                    |  7 +++++++
 Source/NSXMLElement.m        | 10 ----------
 Source/NSXMLNode.m           | 28 ----------------------------
 Tests/base/NSXMLNode/basic.m |  3 ++-
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c94e0e825..1f1746177 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-23 12:09-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/NSXMLElement.m: Remove setObjectValue: implementation.
+	* Source/NSXMLNode.m: Remove comments around code to replace
+	nil value.
+	* Tests/base/NSXMLNode/basic.m: correct test.
+
 2012-01-21 06:16-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSXMLDocument.m
diff --git a/Source/NSXMLElement.m b/Source/NSXMLElement.m
index 437e5f727..0a96e5250 100644
--- a/Source/NSXMLElement.m
+++ b/Source/NSXMLElement.m
@@ -239,16 +239,6 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
     }
 }
 
-- (void) setObjectValue: (id)value
-{
-  if(nil == value)
-    {
-      ASSIGN(internal->objectValue, [NSString stringWithString: @""]);
-      return;
-    }
-  ASSIGN(internal->objectValue, value);
-}
-
 - (NSArray*) namespaces
 {
   NSMutableArray *result = nil;
diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m
index f737956ef..32f96032d 100644
--- a/Source/NSXMLNode.m
+++ b/Source/NSXMLNode.m
@@ -101,32 +101,6 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
   return result;
 }
 
-/*
-+ (xmlNodePtr) _nodeForObject: (NSXMLNode *)object
-{
-  xmlNodePtr node = NULL;
-  if(object)
-    {
-      NSXMLNodeKind kind = [object kind];
-      switch (kind)
-	{
-	case(NSXMLAttributeKind):
-	  node = (xmlNodePtr)xmlNewProp(NULL,
-				    (xmlChar *)XMLSTRING([object name]),
-				    (xmlChar *)XMLSTRING([object stringValue]));
-	  break;
-	case(NSXMLElementKind):
-	  node = xmlNewNode(NULL,XMLSTRING([object name]));
-	  break;
-	case(NSXMLInvalidKind):
-	  node = xmlNewNode(NULL,XMLSTRING([object name]));
-	  break;
-	}
-    }
-  return node;
-}
-*/
-
 - (void) _addSubNode:(NSXMLNode *)subNode
 {
   if (!internal->subNodes)
@@ -991,13 +965,11 @@ NSArray *execute_xpath(NSXMLNode *node,
 
 - (void) setObjectValue: (id)value
 {
-  /*
   if(nil == value)
     {
       ASSIGN(internal->objectValue, [NSString stringWithString: @""]);
       return;
     }
-  */
   ASSIGN(internal->objectValue, value);
 }
 
diff --git a/Tests/base/NSXMLNode/basic.m b/Tests/base/NSXMLNode/basic.m
index a45c3be3c..80c54eda0 100644
--- a/Tests/base/NSXMLNode/basic.m
+++ b/Tests/base/NSXMLNode/basic.m
@@ -37,7 +37,8 @@ int main()
   PASS_EQUAL([node objectValue], @"anObject",
     "setting object value on invalid node works");
   [node setObjectValue: nil];
-  PASS_EQUAL([node objectValue], nil,
+  // Per documentation on NSXMLNode setObjectValue/objectValue, 
+  PASS_EQUAL([node objectValue], @"",
     "setting nil object value on invalid node works");
   [node setStringValue: @"aString"];
   PASS_EQUAL([node stringValue], @"aString",