Author: twiest
Date: 2007-02-10 01:38:20 -0500 (Sat, 10 Feb 2007)
New Revision: 72570
Modified:
trunk/wbem-sharp/samples/basic/BasicEnumerateInstances.cs
trunk/wbem-sharp/src/CimDataTypes/CimInstance.cs
trunk/wbem-sharp/src/CimXml/CimXmlReader.cs
trunk/wbem-sharp/src/CimXml/CimXmlWriter.cs
trunk/wbem-sharp/src/WbemClient.cs
Log:
* Changed CimInstance.Name to CimInstance.InstanceName because it was ambiguous
as to what it referred to since CimInstance.ClassName is there also.
Modified: trunk/wbem-sharp/samples/basic/BasicEnumerateInstances.cs
===================================================================
--- trunk/wbem-sharp/samples/basic/BasicEnumerateInstances.cs 2007-02-10
06:30:58 UTC (rev 72569)
+++ trunk/wbem-sharp/samples/basic/BasicEnumerateInstances.cs 2007-02-10
06:38:20 UTC (rev 72570)
@@ -33,7 +33,7 @@
Console.WriteLine("---------");
foreach (CimInstance curItem in items)
{
- Console.WriteLine(curItem.Name);
+ Console.WriteLine(curItem.InstanceName);
}
}
}
Modified: trunk/wbem-sharp/src/CimDataTypes/CimInstance.cs
===================================================================
--- trunk/wbem-sharp/src/CimDataTypes/CimInstance.cs 2007-02-10 06:30:58 UTC
(rev 72569)
+++ trunk/wbem-sharp/src/CimDataTypes/CimInstance.cs 2007-02-10 06:38:20 UTC
(rev 72570)
@@ -70,7 +70,7 @@
/// <summary>
/// InstanceName of the instance
/// </summary>
- public CimInstanceName Name
+ public CimInstanceName InstanceName
{
get
{
@@ -87,8 +87,8 @@
/// </summary>
public override CimName ClassName
{
- get { return Name.ClassName; }
- set { Name.ClassName = value; }
+ get { return InstanceName.ClassName; }
+ set { InstanceName.ClassName = value; }
}
#endregion
Modified: trunk/wbem-sharp/src/CimXml/CimXmlReader.cs
===================================================================
--- trunk/wbem-sharp/src/CimXml/CimXmlReader.cs 2007-02-10 06:30:58 UTC (rev
72569)
+++ trunk/wbem-sharp/src/CimXml/CimXmlReader.cs 2007-02-10 06:38:20 UTC (rev
72570)
@@ -2523,7 +2523,7 @@
if (ci.ClassName != cin.ClassName)
throw new Exception("InstanceName.ClassName !=
Instance.ClassName");
- ci.Name = cin;
+ ci.InstanceName = cin;
// Consume the closing element
ReadElement(CimXmlElementType.ValueNamedInstanceEnd);
Modified: trunk/wbem-sharp/src/CimXml/CimXmlWriter.cs
===================================================================
--- trunk/wbem-sharp/src/CimXml/CimXmlWriter.cs 2007-02-10 06:30:58 UTC (rev
72569)
+++ trunk/wbem-sharp/src/CimXml/CimXmlWriter.cs 2007-02-10 06:38:20 UTC (rev
72570)
@@ -1085,7 +1085,7 @@
{
//<VALUE.NAMEDINSTANCE>
this.WriteNamedInstanceElement();
- this.WriteCimInstanceName(namedInstance.Name);
+ this.WriteCimInstanceName(namedInstance.InstanceName);
this.WriteUnnamedCimInstance(namedInstance);
//</VALUE.NAMEDINSTANCE>
Modified: trunk/wbem-sharp/src/WbemClient.cs
===================================================================
--- trunk/wbem-sharp/src/WbemClient.cs 2007-02-10 06:30:58 UTC (rev 72569)
+++ trunk/wbem-sharp/src/WbemClient.cs 2007-02-10 06:38:20 UTC (rev 72570)
@@ -1348,7 +1348,7 @@
if (instance.ClassName != instanceName.ClassName)
throw new Exception("InstanceName.ClassName !=
Instance.ClassName");
- instance.Name = instanceName;
+ instance.InstanceName = instanceName;
return instance;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
