Author: gert
Date: 2007-07-01 04:54:00 -0400 (Sun, 01 Jul 2007)
New Revision: 81136
Modified:
trunk/mcs/class/System.Data/System.Data/ChangeLog
trunk/mcs/class/System.Data/System.Data/DataColumn.cs
trunk/mcs/class/System.Data/System.Data/DataRelationPropertyDescriptor.cs
trunk/mcs/class/System.Data/System.Data/DataRowView.cs
trunk/mcs/class/System.Data/System.Data/DataSet.cs
trunk/mcs/class/System.Data/System.Data/DataView.cs
trunk/mcs/class/System.Data/System.Data/DataViewManager.cs
trunk/mcs/class/System.Data/System.Data/ExpressionElement.cs
trunk/mcs/class/System.Data/System.Data/RelatedDataView.cs
trunk/mcs/class/System.Data/System.Data/Res.cs
trunk/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
trunk/mcs/class/System.Data/System.Data/XmlDataReader.cs
Log:
* RelatedDataView.cs: Fixed line endings.
* XmlDataInferenceLoader.cs: Fixed line endings.
Modified: trunk/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data/ChangeLog 2007-07-01 08:46:55 UTC
(rev 81135)
+++ trunk/mcs/class/System.Data/System.Data/ChangeLog 2007-07-01 08:54:00 UTC
(rev 81136)
@@ -1,3 +1,8 @@
+2007-07-01 Gert Driesen <[EMAIL PROTECTED]>
+
+ * RelatedDataView.cs: Fixed line endings.
+ * XmlDataInferenceLoader.cs: Fixed line endings.
+
2007-06-30 Gert Driesen <[EMAIL PROTECTED]>
* DataTableCollection.cs: CopyTo is 2.0 only. Removed extra tabs,
Property changes on: trunk/mcs/class/System.Data/System.Data/DataColumn.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on:
trunk/mcs/class/System.Data/System.Data/DataRelationPropertyDescriptor.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/mcs/class/System.Data/System.Data/DataRowView.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/mcs/class/System.Data/System.Data/DataSet.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/mcs/class/System.Data/System.Data/DataView.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/mcs/class/System.Data/System.Data/DataViewManager.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on:
trunk/mcs/class/System.Data/System.Data/ExpressionElement.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Modified: trunk/mcs/class/System.Data/System.Data/RelatedDataView.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/RelatedDataView.cs 2007-07-01
08:46:55 UTC (rev 81135)
+++ trunk/mcs/class/System.Data/System.Data/RelatedDataView.cs 2007-07-01
08:54:00 UTC (rev 81136)
@@ -109,8 +109,8 @@
return filter != null ? filter.DependsOn(other) : false;
}
- void IExpression.ResetExpression()
- {
+ void IExpression.ResetExpression()
+ {
}
#endregion
Property changes on: trunk/mcs/class/System.Data/System.Data/RelatedDataView.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/mcs/class/System.Data/System.Data/Res.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Modified: trunk/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
2007-07-01 08:46:55 UTC (rev 81135)
+++ trunk/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
2007-07-01 08:54:00 UTC (rev 81136)
@@ -9,29 +9,29 @@
//
// Design notes are the bottom of the source.
//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
using System;
using System.Collections;
using System.Data;
@@ -253,7 +253,7 @@
private void InferColumnElement (TableMapping table, XmlElement
el)
{
- string localName = XmlHelper.Decode (el.LocalName);
+ string localName = XmlHelper.Decode (el.LocalName);
DataColumn col = table.GetColumn (localName);
if (col != null) {
if (col.ColumnMapping != MappingType.Element)
@@ -353,7 +353,7 @@
bool hasChildElements = false;
bool hasAttributes = false;
- bool hasText = false;
+ bool hasText = false;
bool isElementRepeated = false;
foreach (XmlAttribute attr in el.Attributes) {
@@ -381,9 +381,9 @@
case XmlNodeType.ProcessingInstruction: //
ignore
continue;
default: // text content
- hasText = true;
- if (GetElementMappingType (el,
ignoredNamespaces, null) == ElementMappingType.Repeated)
- isElementRepeated = true;
+ hasText = true;
+ if (GetElementMappingType (el,
ignoredNamespaces, null) == ElementMappingType.Repeated)
+ isElementRepeated = true;
break;
case XmlNodeType.Element: // child
hasChildElements = true;
Property changes on:
trunk/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/mcs/class/System.Data/System.Data/XmlDataReader.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
