diff options
373 files changed, 4347 insertions, 4501 deletions
diff --git a/libgc/.gitattributes b/libgc/.gitattributes index 6e3af18e155..5b8c9301a73 100644 --- a/libgc/.gitattributes +++ b/libgc/.gitattributes @@ -1,3 +1,2 @@ /BCC_MAKEFILE -crlf /digimars.mak -crlf -/win32_threads.c -crlf diff --git a/libgc/include/private/.gitattributes b/libgc/include/private/.gitattributes deleted file mode 100644 index 998a67db6a7..00000000000 --- a/libgc/include/private/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/gcconfig.h -crlf diff --git a/libgc/include/private/gcconfig.h b/libgc/include/private/gcconfig.h index 10ffed63755..e517d70fc3f 100644 --- a/libgc/include/private/gcconfig.h +++ b/libgc/include/private/gcconfig.h @@ -408,18 +408,18 @@ # else # if (defined(_MSDOS) || defined(_MSC_VER)) && (_M_IX86 >= 300) \ || defined(_WIN32) && !defined(__CYGWIN32__) && !defined(__CYGWIN__) -# if defined(__LP64__) || defined(_WIN64)
-# define X86_64
-# else
-# define I386
-# endif
-# define MSWIN32 /* or Win64 */
-# define mach_type_known
-# endif
-# if defined(_MSC_VER) && defined(_M_IA64)
-# define IA64
-# define MSWIN32 /* Really win64, but we don't treat 64-bit */
- /* variants as a differnt platform. */
+# if defined(__LP64__) || defined(_WIN64) +# define X86_64 +# else +# define I386 +# endif +# define MSWIN32 /* or Win64 */ +# define mach_type_known +# endif +# if defined(_MSC_VER) && defined(_M_IA64) +# define IA64 +# define MSWIN32 /* Really win64, but we don't treat 64-bit */ + /* variants as a differnt platform. */ # endif # endif # if defined(__DJGPP__) @@ -808,7 +808,7 @@ # define STACKBOTTOM ((ptr_t) LMGetCurStackBase()) # define DATAEND /* not needed */ # endif -
+ # ifdef LINUX # if defined(__powerpc64__) # define ALIGNMENT 8 diff --git a/libgc/win32_threads.c b/libgc/win32_threads.c index a2cd0fda43e..9662eb186ce 100644 --- a/libgc/win32_threads.c +++ b/libgc/win32_threads.c @@ -385,10 +385,10 @@ void GC_push_all_stacks() # define PUSH4(r1,r2,r3,r4) PUSH2(r1,r2), PUSH2(r3,r4) # if defined(I386) PUSH4(Edi,Esi,Ebx,Edx), PUSH2(Ecx,Eax), PUSH1(Ebp); - sp = (ptr_t)context.Esp;
-# elif defined(X86_64)
- PUSH4(Rax,Rcx,Rdx,Rbx); PUSH2(Rbp, Rsi); PUSH1(Rdi);
- PUSH4(R8, R9, R10, R11); PUSH4(R12, R13, R14, R15);
+ sp = (ptr_t)context.Esp; +# elif defined(X86_64) + PUSH4(Rax,Rcx,Rdx,Rbx); PUSH2(Rbp, Rsi); PUSH1(Rdi); + PUSH4(R8, R9, R10, R11); PUSH4(R12, R13, R14, R15); sp = (ptr_t)context.Rsp; # elif defined(ARM32) PUSH4(R0,R1,R2,R3),PUSH4(R4,R5,R6,R7),PUSH4(R8,R9,R10,R11),PUSH1(R12); diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/.gitattributes b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/.gitattributes index 19c48b80698..b447fed88de 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/.gitattributes +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/.gitattributes @@ -1,3 +1,2 @@ -/RncParser.jay -crlf /RncTokenizer.cs -crlf /RncWriter.cs -crlf diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay index 873f1e289a0..df3157f022a 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay @@ -118,9 +118,9 @@ namespace Commons.Xml.Relaxng.Rnc if (p is RelaxngGrammar) ((RelaxngGrammar) p).IsSourceCompactSyntax = true; return p; - } catch (Exception ex) {
- throw new RelaxngException (String.Format ("Tokenizer error at line {0}, column {1}: {2}", Line, Column, ex.Message), ex);
- }
+ } catch (Exception ex) { + throw new RelaxngException (String.Format ("Tokenizer error at line {0}, column {1}: {2}", Line, Column, ex.Message), ex); + } } private void FillLocation (RelaxngElementBase el) diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs index 7908f696a95..53048bcd32f 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs @@ -7,27 +7,27 @@ // (C)2003 Atsushi Enomoto
// (C)2004 Novell Inc.
//
- -// -// 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. -// +
+//
+// 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;
@@ -508,4 +508,4 @@ namespace Commons.Xml.Relaxng.Rnc }
}
-} +}
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncWriter.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncWriter.cs index 12f4804a557..4abef7b4c16 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncWriter.cs +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncWriter.cs @@ -6,27 +6,27 @@ //
// (C)2005 Novell Inc.
//
- -// -// 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. -// +
+//
+// 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;
@@ -554,4 +554,4 @@ namespace Commons.Xml.Relaxng.Rnc }
#endregion
}
-} +}
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml/XmlDefaultReader.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml/XmlDefaultReader.cs index 98771ff7dab..2a9ae9fb13b 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml/XmlDefaultReader.cs +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml/XmlDefaultReader.cs @@ -8,26 +8,26 @@ //
// Copyright (c) 2004 Novell Inc.
// All rights reserved
-// -// 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. -// +//
+// 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.
+//
//
// Similar to SAX DefaultHandler
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs b/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs index a7be065d43d..68c2dc3a05f 100644 --- a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs +++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs @@ -47,12 +47,12 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-#if NET_2_0 +#if NET_2_0
[assembly: AssemblyVersion("2.6.0.0")]
-#else -// not worrying about the NET_1_0 profile for now. +#else
+// not worrying about the NET_1_0 profile for now.
[assembly: AssemblyVersion("0.6.0.0")]
-#endif +#endif
[assembly: AssemblyDelaySign(true)]
[assembly: AssemblyKeyFile ("SharpZipLib.pub")]
diff --git a/mcs/class/I18N/Common/.gitattributes b/mcs/class/I18N/Common/.gitattributes deleted file mode 100644 index 65d062e2c9e..00000000000 --- a/mcs/class/I18N/Common/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/ByteEncoding.cs -crlf diff --git a/mcs/class/I18N/Common/ByteEncoding.cs b/mcs/class/I18N/Common/ByteEncoding.cs index 5019ed947f7..257424e8d1e 100644 --- a/mcs/class/I18N/Common/ByteEncoding.cs +++ b/mcs/class/I18N/Common/ByteEncoding.cs @@ -371,21 +371,21 @@ public abstract class ByteEncoding : MonoEncoding ("count", Strings.GetString("ArgRange_Array")); } - if (count == 0)
- return string.Empty;
-
- string s = new string ((char) 0, count);
-
- fixed (byte* bytePtr = bytes)
- fixed (char* charPtr = s)
- fixed (char* cvt = toChars) {
- byte* b = bytePtr + index;
- char* c = charPtr;
+ if (count == 0) + return string.Empty; + + string s = new string ((char) 0, count); + + fixed (byte* bytePtr = bytes) + fixed (char* charPtr = s) + fixed (char* cvt = toChars) { + byte* b = bytePtr + index; + char* c = charPtr; while(count-- != 0) *(c++) = cvt[*(b++)]; } -
- return s;
+ + return s; } public override String GetString(byte[] bytes) { diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/.gitattributes b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/.gitattributes index 9b773f866cd..c79a99b2463 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/.gitattributes +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/.gitattributes @@ -1,6 +1,5 @@ /DB2ClientUtils.cs -crlf /DB2Command.cs -crlf -/DB2CommandBuilder.cs -crlf /DB2Connection.cs -crlf /DB2ConnectionPool.cs -crlf /DB2ConnectionSettings.cs -crlf diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2CommandBuilder.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2CommandBuilder.cs index e917fcf7e48..9e16d6ea1a4 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2CommandBuilder.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2CommandBuilder.cs @@ -46,7 +46,7 @@ namespace IBM.Data.DB2 DataAdapter = adapter; } - public DB2DataAdapter DataAdapter
+ public DB2DataAdapter DataAdapter { get { @@ -77,7 +77,7 @@ namespace IBM.Data.DB2 } } - public string QuotePrefix
+ public string QuotePrefix { get { @@ -87,7 +87,7 @@ namespace IBM.Data.DB2 { } } - public string QuoteSuffix
+ public string QuoteSuffix { get { @@ -119,7 +119,7 @@ namespace IBM.Data.DB2 values += ", "; } - if(!((bool)dr["IsAutoIncrement"]))
+ if(!((bool)dr["IsAutoIncrement"])) { fields += column.ColumnName; //values += ":v_" + column.ColumnName; @@ -135,8 +135,8 @@ namespace IBM.Data.DB2 { //DataColumn column = dt.Columns[i]; DataRow dr = dt.Rows[i]; - DataColumn column = new DataColumn((string)dr["ColumnName"], DB2TypeConverter.GetManagedType((int)dr["ProviderType"]));
- if (!((bool)dr["IsAutoIncrement"]))
+ DataColumn column = new DataColumn((string)dr["ColumnName"], DB2TypeConverter.GetManagedType((int)dr["ProviderType"])); + if (!((bool)dr["IsAutoIncrement"])) { DB2Parameter aux = new DB2Parameter("v_" + column.ColumnName, column.DataType); aux.Direction = ParameterDirection.Input; @@ -158,7 +158,7 @@ namespace IBM.Data.DB2 string wheres = ""; for (int i = 0; i < dt.Rows.Count; i++) { - if (sets.Length != 0 && !((bool)dt.Rows[i]["IsAutoIncrement"]))
+ if (sets.Length != 0 && !((bool)dt.Rows[i]["IsAutoIncrement"])) { sets += ", "; } @@ -180,7 +180,7 @@ namespace IBM.Data.DB2 { DataRow dr = dt.Rows[i]; DataColumn column = new DataColumn((string)dr["ColumnName"], DB2TypeConverter.GetManagedType((int)dr["ProviderType"])); - if (!((bool)dr["IsAutoIncrement"]))
+ if (!((bool)dr["IsAutoIncrement"])) { DB2Parameter aux = new DB2Parameter("s_" + column.ColumnName, column.DataType); aux.Direction = ParameterDirection.Input; @@ -251,7 +251,7 @@ namespace IBM.Data.DB2 deleteCommand = null; } - private DataTable GetSchema()
+ private DataTable GetSchema() { dataAdapter.SelectCommand.Connection.Open(); DB2Command cmd = new DB2Command(dataAdapter.SelectCommand.CommandText, dataAdapter.SelectCommand.Connection); diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionPool.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionPool.cs index cd92983fb9c..99ee3bfacd5 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionPool.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionPool.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Text;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionSettings.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionSettings.cs index 988dcc43189..92c8973d272 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionSettings.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ConnectionSettings.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Runtime.InteropServices;
using System.Text;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Constants.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Constants.cs index a223d4f032c..2043af59dee 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Constants.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Constants.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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;
namespace IBM.Data.DB2
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs index e08986bc946..aaf3e5c2ada 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs @@ -1,45 +1,45 @@ - -// -// 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; -using System.Runtime.InteropServices; -using System.Globalization; -using System.Text; - -namespace IBM.Data.DB2 -{ - /// <summary> - /// Summary description for DB2ClientDataReader. - /// DB2ClientDataReader. - /// </summary> - public sealed class DB2DataReader : MarshalByRefObject, IDataReader - { +
+//
+// 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;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.Text;
+
+namespace IBM.Data.DB2
+{
+ /// <summary>
+ /// Summary description for DB2ClientDataReader.
+ /// DB2ClientDataReader.
+ /// </summary>
+ public sealed class DB2DataReader : MarshalByRefObject, IDataReader
+ {
private struct ColumnInfo
{
public string Colname;
public int Sqltype;
- } - + }
+
private object[] _resultSet;
private ColumnInfo[] columnInfo;
private Hashtable columnsNames;
@@ -54,8 +54,8 @@ namespace IBM.Data.DB2 private CommandBehavior behavior;
private bool hasRows;
private bool skipReadOnce;
- - +
+
#region Constructors and destructors
/// <summary>
///
@@ -78,7 +78,7 @@ namespace IBM.Data.DB2 }
#endregion
- +
private void GetFieldCountAndAffectedRows()
{
short sqlRet;
@@ -93,64 +93,64 @@ namespace IBM.Data.DB2 sqlRet = DB2CLIWrapper.SQLNumResultCols(hwndStmt, out colCount);
DB2ClientUtils.DB2CheckReturn(sqlRet, DB2Constants.SQL_HANDLE_STMT, hwndStmt, "DB2ClientDataReader - SQLNumResultCols", db2Conn);
fieldCount = colCount;
- } - - #region Properties - - #region Depth property - /// - ///Depth of nesting for the current row, need to figure out what this translates into - ///with DB2. - /// - private int depth = 0; - public int Depth - { - get - { + }
+
+ #region Properties
+
+ #region Depth property
+ ///
+ ///Depth of nesting for the current row, need to figure out what this translates into
+ ///with DB2.
+ ///
+ private int depth = 0;
+ public int Depth
+ {
+ get
+ {
if(isClosed)
{
throw new InvalidOperationException("Reader is closed");
- } - return depth; - } - } - #endregion - - #region IsClosed property - /// <summary> - /// True if the reader is closed. - /// </summary> - private bool isClosed = true; - public bool IsClosed - { - get - { - return isClosed; - } - } - #endregion - - #region RecordsAffected property - /// - /// Number of records affected by this operation. Will be zero until we close the - /// reader - /// - - public int RecordsAffected - { - get - { - return recordsAffected; - } - } - #endregion - - #endregion - - #region Methods - - - + }
+ return depth;
+ }
+ }
+ #endregion
+
+ #region IsClosed property
+ /// <summary>
+ /// True if the reader is closed.
+ /// </summary>
+ private bool isClosed = true;
+ public bool IsClosed
+ {
+ get
+ {
+ return isClosed;
+ }
+ }
+ #endregion
+
+ #region RecordsAffected property
+ ///
+ /// Number of records affected by this operation. Will be zero until we close the
+ /// reader
+ ///
+
+ public int RecordsAffected
+ {
+ get
+ {
+ return recordsAffected;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region Methods
+
+
+
#region Close method
public void Close()
@@ -197,10 +197,10 @@ namespace IBM.Data.DB2 Dispose(false);
}
- #endregion - - #region GetSchemaTable - + #endregion
+
+ #region GetSchemaTable
+
public DataTable GetSchemaTable()
{
if(isClosed)
@@ -378,11 +378,11 @@ namespace IBM.Data.DB2 }
}
return _schemaTable;
- } - #endregion - - #region NextResult - + }
+ #endregion
+
+ #region NextResult
+
public bool NextResult()
{
hasRows = false;
@@ -399,11 +399,11 @@ namespace IBM.Data.DB2 return false;
DB2ClientUtils.DB2CheckReturn(sqlRet, DB2Constants.SQL_HANDLE_STMT, hwndStmt, "Db2ClientDataReader - SQLMoreResults", db2Conn);
return true;
- } - #endregion - - #region Read - + }
+ #endregion
+
+ #region Read
+
#if !NET_1_0
public bool HasRows
{
@@ -418,8 +418,8 @@ namespace IBM.Data.DB2 return hasRows;
}
}
-#endif - +#endif
+
public bool Read()
{
if (isClosed)
@@ -444,10 +444,10 @@ namespace IBM.Data.DB2 hasData = true;
return true;
- } - #endregion - - #region GetColumnInfo + }
+ #endregion
+
+ #region GetColumnInfo
private void GetColumnInfo()
{
if(isClosed)
@@ -477,22 +477,22 @@ namespace IBM.Data.DB2 }
- } - #endregion - - #region Describe/Bind/Fetch functions - /// - ///Broke these out so that we can use different paths for Immediate executions and Prepared executions - /// <summary> - /// Does the describe and bind steps for the query result set. Called for both immediate and prepared queries. - /// </summary> - -/// <summary> -/// FetchResults does what it says. -/// </summary> -/// <param name="dbVals"></param> -/// <param name="sqlLen_or_IndPtr"></param> -/// <param name="_resultSet"></param> + }
+ #endregion
+
+ #region Describe/Bind/Fetch functions
+ ///
+ ///Broke these out so that we can use different paths for Immediate executions and Prepared executions
+ /// <summary>
+ /// Does the describe and bind steps for the query result set. Called for both immediate and prepared queries.
+ /// </summary>
+
+/// <summary>
+/// FetchResults does what it says.
+/// </summary>
+/// <param name="dbVals"></param>
+/// <param name="sqlLen_or_IndPtr"></param>
+/// <param name="_resultSet"></param>
private int FieldNameLookup(DataTable _schemaTable, string name)
{
for(int i = 0; i < _schemaTable.Rows.Count; i++)
@@ -504,16 +504,16 @@ namespace IBM.Data.DB2 }
}
return -1;
- } - - #endregion - - #region IDataRecord Interface - ///Code for the IDataRecord interface - /// - #region FieldCount - /// - /// + }
+
+ #endregion
+
+ #region IDataRecord Interface
+ ///Code for the IDataRecord interface
+ ///
+ #region FieldCount
+ ///
+ ///
public int FieldCount
{
get
@@ -523,10 +523,10 @@ namespace IBM.Data.DB2 return fieldCount;
}
- } - #endregion - - #region Item accessors + }
+ #endregion
+
+ #region Item accessors
public object this[string name]
{
get
@@ -576,9 +576,9 @@ namespace IBM.Data.DB2 }
throw new NotImplementedException("Unknown SQL type " + columnInfo[col].Sqltype);
}
- } - #endregion - + }
+ #endregion
+
#region GetBytes
///
/// GetBytes, return a stream of bytes
@@ -602,8 +602,8 @@ namespace IBM.Data.DB2 return sourceArray.LongLength;
#endif
}
- #endregion - + #endregion
+
#region GetChars
///
///GetChars, returns char array
@@ -619,10 +619,10 @@ namespace IBM.Data.DB2 }
return (long)sourceString.Length;
}
- #endregion - - #region GetBoolean method - + #endregion
+
+ #region GetBoolean method
+
public Boolean GetBoolean(int col)
{
return (Boolean)GetBooleanInternal(col);
@@ -655,9 +655,9 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - + }
+ #endregion
+
#region GetGuid
///
/// GetDateTime method
@@ -696,12 +696,12 @@ namespace IBM.Data.DB2 return _resultSet[col];
}
- #endregion - - #region GetByte - /// - ///GetByte - /// + #endregion
+
+ #region GetByte
+ ///
+ ///GetByte
+ ///
public Byte GetByte(int col)
{
return (Byte)GetByteInternal(col);
@@ -734,13 +734,13 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - - #region GetChar - /// - ///GetChar, return column as a char - /// + }
+ #endregion
+
+ #region GetChar
+ ///
+ ///GetChar, return column as a char
+ ///
public Char GetChar(int col)
{
return (Char)GetCharInternal(col);
@@ -773,25 +773,25 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - - #region GetData - /// - /// GetData method - /// - public IDataReader GetData(int col) - { - //Have to research this one, not quite sure what the docs mean - //DB2 does have some structured data types, is that what this is for? - throw new NotSupportedException(); - } - #endregion - - #region GetDataTypeName - /// - ///GetDataTypeName return the type of data - /// + }
+ #endregion
+
+ #region GetData
+ ///
+ /// GetData method
+ ///
+ public IDataReader GetData(int col)
+ {
+ //Have to research this one, not quite sure what the docs mean
+ //DB2 does have some structured data types, is that what this is for?
+ throw new NotSupportedException();
+ }
+ #endregion
+
+ #region GetDataTypeName
+ ///
+ ///GetDataTypeName return the type of data
+ ///
public string GetDataTypeName(int col)
{
if(columnInfo == null)
@@ -836,14 +836,14 @@ namespace IBM.Data.DB2 return "VARBINARY";
}
throw new NotImplementedException("Unknown SQL type " + columnInfo[col].Sqltype);
- } - #endregion - - #region GetDateTime - /// - /// GetDateTime method - /// - + }
+ #endregion
+
+ #region GetDateTime
+ ///
+ /// GetDateTime method
+ ///
+
public DateTime GetDateTime(int col)
{
return (DateTime)GetDateTimeInternal(col);
@@ -883,9 +883,9 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - + }
+ #endregion
+
#region GetDate
///
/// GetDate method
@@ -927,8 +927,8 @@ namespace IBM.Data.DB2 return _resultSet[col];
}
- #endregion - + #endregion
+
#region GetTime
///
/// GetTime method
@@ -974,13 +974,13 @@ namespace IBM.Data.DB2 return _resultSet[col];
}
- #endregion - - - #region GetDecimal - /// - ///GetDecimal method - /// + #endregion
+
+
+ #region GetDecimal
+ ///
+ ///GetDecimal method
+ ///
public Decimal GetDecimal(int col)
{
@@ -1020,13 +1020,13 @@ namespace IBM.Data.DB2 // }
// }
return _resultSet[col];
- } - #endregion - - #region GetDouble - /// - /// GetDouble - /// + }
+ #endregion
+
+ #region GetDouble
+ ///
+ /// GetDouble
+ ///
public Double GetDouble(int col)
{
return (Double)GetDoubleInternal(col);
@@ -1059,13 +1059,13 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - - #region GetFieldType - /// - /// Type GetFieldType - /// + }
+ #endregion
+
+ #region GetFieldType
+ ///
+ /// Type GetFieldType
+ ///
public Type GetFieldType(int col)
{
if(columnInfo == null)
@@ -1073,13 +1073,13 @@ namespace IBM.Data.DB2 GetColumnInfo();
}
return GetManagedType(columnInfo[col].Sqltype);
- } - #endregion - - #region GetFloat - /// - /// GetFloat - /// + }
+ #endregion
+
+ #region GetFloat
+ ///
+ /// GetFloat
+ ///
public float GetFloat(int col)
{
return (float)GetFloatInternal(col);
@@ -1112,13 +1112,13 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - - #region The GetInt?? series - /// - ///GetInt16 - /// + }
+ #endregion
+
+ #region The GetInt?? series
+ ///
+ ///GetInt16
+ ///
public short GetInt16(int col)
{
return (short)GetInt16Internal(col);
@@ -1228,13 +1228,13 @@ namespace IBM.Data.DB2 }
return _resultSet[col];
}
- - #endregion - - #region GetName - /// - ///GetName, returns the name of the field - /// +
+ #endregion
+
+ #region GetName
+ ///
+ ///GetName, returns the name of the field
+ ///
public string GetName(int col)
{
if(columnInfo == null)
@@ -1242,13 +1242,13 @@ namespace IBM.Data.DB2 GetColumnInfo();
}
return columnInfo[col].Colname;
- } - #endregion - - #region GetOrdinal - /// - /// GetOrdinal, return the index of the named column - /// + }
+ #endregion
+
+ #region GetOrdinal
+ ///
+ /// GetOrdinal, return the index of the named column
+ ///
public int GetOrdinal(string name)
{
if(columnInfo == null)
@@ -1261,13 +1261,13 @@ namespace IBM.Data.DB2 throw new IndexOutOfRangeException("name");
}
return (int)ordinal;
- } - #endregion - - #region GetString - /// - /// GetString returns a string - /// + }
+ #endregion
+
+ #region GetString
+ ///
+ /// GetString returns a string
+ ///
public string GetString(int col)
{
return (string)GetStringInternal(col);
@@ -1304,23 +1304,23 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - #endregion - - #region GetValue - /// - /// GetVCalue, returns an object - /// - public object GetValue(int col) - { - return this[col]; - } - #endregion - - #region GetValues - /// - /// GetValues returns all columns in the row through the argument, and the number of columns in the return value - /// + }
+ #endregion
+
+ #region GetValue
+ ///
+ /// GetVCalue, returns an object
+ ///
+ public object GetValue(int col)
+ {
+ return this[col];
+ }
+ #endregion
+
+ #region GetValues
+ ///
+ /// GetValues returns all columns in the row through the argument, and the number of columns in the return value
+ ///
public int GetValues(object[] values)
{
int count = Math.Min(fieldCount, values.Length);
@@ -1332,24 +1332,24 @@ namespace IBM.Data.DB2 }
return count;
- } - #endregion - - #region IsDBNull - /// - /// IsDBNull Is the column null - /// + }
+ #endregion
+
+ #region IsDBNull
+ ///
+ /// IsDBNull Is the column null
+ ///
public bool IsDBNull(int col)
{
//Proper implementation once I get the SQLDescribe/SQLBind/SQLFetch stuff in place
return Convert.IsDBNull(this[col]);
- } - #endregion - - #endregion ///For IDataRecord - - #region private methods - + }
+ #endregion
+
+ #endregion ///For IDataRecord
+
+ #region private methods
+
private DataTable BuildNewSchemaTable()
{
DataTable schemaTable = new DataTable("SchemaTable");
@@ -1375,19 +1375,19 @@ namespace IBM.Data.DB2 schemaTable.Columns.Add(new DataColumn("BaseColumnName", typeof(string)));
return schemaTable;
- } - #endregion - - private void InitMem(int memSize, ref IntPtr ptr){ - if (ptr.ToInt32() == 0){ - unsafe{ - fixed(byte* arr = new byte[memSize]){ - ptr = new IntPtr(arr); - } - } - } - } - + }
+ #endregion
+
+ private void InitMem(int memSize, ref IntPtr ptr){
+ if (ptr.ToInt32() == 0){
+ unsafe{
+ fixed(byte* arr = new byte[memSize]){
+ ptr = new IntPtr(arr);
+ }
+ }
+ }
+ }
+
private Type GetManagedType(int sql_type)
{
switch(sql_type)
@@ -1419,8 +1419,8 @@ namespace IBM.Data.DB2 return typeof(byte[]);
}
throw new NotImplementedException("Unknown SQL type " + sql_type);
- } - + }
+
private bool IsLong(short sql_type)
{
switch(sql_type)
@@ -1430,7 +1430,7 @@ namespace IBM.Data.DB2 return true;
}
return false;
- } + }
private object GetBlobDataInternal(int col)
{
if((col < 0) || (col >= fieldCount))
@@ -1461,8 +1461,8 @@ namespace IBM.Data.DB2 }
}
return _resultSet[col];
- } - } - -} -#endregion + }
+ }
+
+}
+#endregion
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ErrorCollection.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ErrorCollection.cs index b37501c7fcc..0f59e3ee354 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ErrorCollection.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ErrorCollection.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Text;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2OpenConnection.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2OpenConnection.cs index 59a7f7aab4e..825d36a26d7 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2OpenConnection.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2OpenConnection.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Runtime.InteropServices;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Parameter.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Parameter.cs index 42bd73cb226..49d8d595769 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Parameter.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Parameter.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Data;
using System.Runtime.InteropServices;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ParameterCollection.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ParameterCollection.cs index bb1f09d4832..76aad656e38 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ParameterCollection.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2ParameterCollection.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Data;
using System.Collections;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Transaction.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Transaction.cs index 3c2b20ae9ed..333fdd010dc 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Transaction.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Transaction.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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.Data;
using System.Runtime.InteropServices;
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Type.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Type.cs index 47643778cbb..e8f29e14d8f 100644 --- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Type.cs +++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2Type.cs @@ -1,24 +1,24 @@ - -// -// 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. -// +
+//
+// 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;
namespace IBM.Data.DB2
diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/.gitattributes b/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/.gitattributes index 73744c2abfe..130d95bd912 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/.gitattributes +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/.gitattributes @@ -15,7 +15,6 @@ /Error.aspx.designer.cs -crlf /GridButton.cs -crlf /GridCheckBox.cs -crlf -/HttpHandlersSectionHandler.cs -crlf /Mainsoft.Web.AspnetConfig.css -crlf /ManageRole.aspx -crlf /ManageRole.aspx.cs -crlf @@ -28,7 +27,6 @@ /SecurError.aspx.cs -crlf /SecurError.aspx.designer.cs -crlf /StrUtils.cs -crlf -/UrlUtils.cs -crlf /Util.Master -crlf /Util.Master.cs -crlf /Util.Master.designer.cs -crlf diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/HttpHandlersSectionHandler.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/HttpHandlersSectionHandler.cs index 013b3e6f46a..0d7aab8069a 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/HttpHandlersSectionHandler.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/HttpHandlersSectionHandler.cs @@ -31,9 +31,9 @@ using System.Collections; using System.Configuration; using System.Xml; -using System.Globalization;
-using System;
-
+using System.Globalization; +using System; + namespace Mainsoft.Web.Configuration { diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/UrlUtils.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/UrlUtils.cs index 5ce30bd32aa..eea355df28e 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/UrlUtils.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/UrlUtils.cs @@ -29,8 +29,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System.Web.SessionState;
-using System.Web;
+using System.Web.SessionState; +using System.Web; using System; namespace Mainsoft.Web.Util { diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/.gitattributes b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/.gitattributes index 0dde2650037..6b4482bac76 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/.gitattributes +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/.gitattributes @@ -6,7 +6,6 @@ /BaseFacesViewHandler.cs -crlf /ChangeLog -crlf /IExtendedViewHandler.cs -crlf -/IncludeHelperServlet.cs -crlf /OutputStreamWrapper.cs -crlf /RequestParameterMap.cs -crlf /RequestParameterValuesMap.cs -crlf @@ -17,5 +16,4 @@ /ServletFacesViewHandler.cs -crlf /ServletIncludeUtils.cs -crlf /ServletResourceLoader.cs -crlf -/ServletWorkerRequest.cs -crlf /SessionWrapper.cs -crlf diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/IncludeHelperServlet.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/IncludeHelperServlet.cs index 7a86b192810..a2e47e1dd2e 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/IncludeHelperServlet.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/IncludeHelperServlet.cs @@ -37,8 +37,8 @@ using javax.servlet.http; namespace Mainsoft.Web.Hosting { - /// <summary>
- /// <para>This class supports the Framework infrastructure and is not intended to be used directly from your code.</para>
+ /// <summary> + /// <para>This class supports the Framework infrastructure and is not intended to be used directly from your code.</para> /// </summary> public class IncludeHelperServlet : HttpServlet { @@ -112,8 +112,8 @@ namespace Mainsoft.Web.Hosting namespace System.Web.GH { - /// <summary>
- /// <para>This class supports the Framework infrastructure and is not intended to be used directly from your code.</para>
+ /// <summary> + /// <para>This class supports the Framework infrastructure and is not intended to be used directly from your code.</para> /// </summary> public class IncludeHelperServlet : Mainsoft.Web.Hosting.IncludeHelperServlet { diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.cs index 926043d0be1..6cff989c788 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/ServletWorkerRequest.cs @@ -78,7 +78,7 @@ namespace Mainsoft.Web.Hosting return _HttpServletRequest.getServerPort (); } - public override string GetPathInfo () {
+ public override string GetPathInfo () { return base.GetPathInfo () ?? String.Empty; } diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileHelper.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileHelper.cs index ededd515ddc..5308dfb435b 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileHelper.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileHelper.cs @@ -57,7 +57,7 @@ namespace Mainsoft.Web.Profile return 0;
string queryDelete = @"DELETE FROM aspnet_Profile WHERE UserId IN ( " +
- "SELECT UserId FROM aspnet_Users WHERE ApplicationId = ? AND LastActivityDate <= ? " + + "SELECT UserId FROM aspnet_Users WHERE ApplicationId = ? AND LastActivityDate <= ? " +
GetProfileAuthOptions (profileAuthOptions) + ")";
OleDbCommand cmdDelete = new OleDbCommand (queryDelete, (OleDbConnection) connection);
AddParameter (cmdDelete, "ApplicationId", appId);
@@ -102,7 +102,7 @@ namespace Mainsoft.Web.Profile if (appId == null)
return 0;
- string querySelect = @"SELECT COUNT(*) FROM aspnet_Users usr, aspnet_Profile prf WHERE ApplicationId = ? " + + string querySelect = @"SELECT COUNT(*) FROM aspnet_Users usr, aspnet_Profile prf WHERE ApplicationId = ? " +
"AND usr.UserId = prf.UserId AND LastActivityDate <= ? " + GetProfileAuthOptions(profileAuthOptions);
OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);
AddParameter (cmdSelect, "ApplicationId", appId);
diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileProvider.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileProvider.cs index b3beb7700fa..97292277471 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileProvider.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileProvider.cs @@ -1,41 +1,41 @@ //
-// Mainsoft.Web.Profile.DerbyProfileProvider -// -// Authors: -// Vladimir Krasnov (vladimirk@mainsoft.com) -// -// (C) 2006 Mainsoft -// -// 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. -// - -#if NET_2_0 - +// Mainsoft.Web.Profile.DerbyProfileProvider
+//
+// Authors:
+// Vladimir Krasnov (vladimirk@mainsoft.com)
+//
+// (C) 2006 Mainsoft
+//
+// 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.
+//
+
+#if NET_2_0
+
using System;
using System.Data.OleDb;
using System.Data.Common;
-using System.Collections; +using System.Collections;
using System.Configuration;
using System.Globalization;
using System.Web.Profile;
-using System.Web.Configuration; +using System.Web.Configuration;
using System.Collections.Specialized;
using System.Text;
using System.IO;
@@ -43,21 +43,21 @@ using System.IO; using Mainsoft.Web.Security;
using System.Configuration.Provider;
-namespace Mainsoft.Web.Profile -{ +namespace Mainsoft.Web.Profile
+{
/// <summary>
/// <para>This class supports the Framework infrastructure and is not intended to be used directly from your code.</para>
/// <para>Manages storage of profile information for an ASP.NET application in a Derby database.</para>
- /// </summary> - public class DerbyProfileProvider : ProfileProvider + /// </summary>
+ public class DerbyProfileProvider : ProfileProvider
{
ConnectionStringSettings _connectionString;
- string _applicationName = string.Empty; + string _applicationName = string.Empty;
bool _schemaChecked = false;
- DerbyUnloadManager.DerbyShutDownPolicy _shutDownPolicy = DerbyUnloadManager.DerbyShutDownPolicy.Default; - - public DerbyProfileProvider () - { + DerbyUnloadManager.DerbyShutDownPolicy _shutDownPolicy = DerbyUnloadManager.DerbyShutDownPolicy.Default;
+
+ public DerbyProfileProvider ()
+ {
}
public override string ApplicationName
@@ -78,13 +78,13 @@ namespace Mainsoft.Web.Profile OleDbConnection connection = new OleDbConnection (_connectionString.ConnectionString);
connection.Open ();
return connection;
- } - - public override int DeleteInactiveProfiles (ProfileAuthenticationOption authenticationOption, DateTime userInactiveSinceDate) + }
+
+ public override int DeleteInactiveProfiles (ProfileAuthenticationOption authenticationOption, DateTime userInactiveSinceDate)
{
using (DbConnection connection = CreateConnection ()) {
return DerbyProfileHelper.Profile_DeleteInactiveProfiles (connection, ApplicationName, (int) authenticationOption, userInactiveSinceDate);
- } + }
}
public override int DeleteProfiles (ProfileInfoCollection profiles)
@@ -130,9 +130,9 @@ namespace Mainsoft.Web.Profile }
return DeleteProfilesInternal (usernames);
- } - - private int DeleteProfilesInternal (string[] usernames) + }
+
+ private int DeleteProfilesInternal (string[] usernames)
{
using (DbConnection connection = CreateConnection ()) {
return DerbyProfileHelper.Profile_DeleteProfiles (connection, ApplicationName, usernames);
@@ -186,13 +186,13 @@ namespace Mainsoft.Web.Profile return BuildProfileInfoCollection (reader, pageIndex, pageSize, out totalRecords);
}
}
- } - - public override ProfileInfoCollection GetAllInactiveProfiles (ProfileAuthenticationOption authenticationOption, - DateTime userInactiveSinceDate, - int pageIndex, - int pageSize, - out int totalRecords) + }
+
+ public override ProfileInfoCollection GetAllInactiveProfiles (ProfileAuthenticationOption authenticationOption,
+ DateTime userInactiveSinceDate,
+ int pageIndex,
+ int pageSize,
+ out int totalRecords)
{
if (pageIndex < 0)
throw new ArgumentException ("pageIndex is less than zero");
@@ -211,12 +211,12 @@ namespace Mainsoft.Web.Profile return BuildProfileInfoCollection (reader, pageIndex, pageSize, out totalRecords);
}
}
- } - - public override ProfileInfoCollection GetAllProfiles (ProfileAuthenticationOption authenticationOption, - int pageIndex, - int pageSize, - out int totalRecords) + }
+
+ public override ProfileInfoCollection GetAllProfiles (ProfileAuthenticationOption authenticationOption,
+ int pageIndex,
+ int pageSize,
+ out int totalRecords)
{
if (pageIndex < 0)
throw new ArgumentException ("pageIndex is less than zero");
@@ -235,17 +235,17 @@ namespace Mainsoft.Web.Profile return BuildProfileInfoCollection (reader, pageIndex, pageSize, out totalRecords);
}
}
- } - - public override int GetNumberOfInactiveProfiles (ProfileAuthenticationOption authenticationOption, DateTime userInactiveSinceDate) + }
+
+ public override int GetNumberOfInactiveProfiles (ProfileAuthenticationOption authenticationOption, DateTime userInactiveSinceDate)
{
using (DbConnection connection = CreateConnection ()) {
return DerbyProfileHelper.Profile_GetNumberOfInactiveProfiles (
connection, ApplicationName, (int) authenticationOption, userInactiveSinceDate);
}
- } - - public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext sc, SettingsPropertyCollection properties) + }
+
+ public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext sc, SettingsPropertyCollection properties)
{
SettingsPropertyValueCollection settings = new SettingsPropertyValueCollection ();
@@ -301,8 +301,8 @@ namespace Mainsoft.Web.Profile buf, username, authenticated, DateTime.UtcNow);
}
}
- - public override void Initialize (string name, NameValueCollection config) +
+ public override void Initialize (string name, NameValueCollection config)
{
if (config == null)
throw new ArgumentNullException ("config");
@@ -359,7 +359,7 @@ namespace Mainsoft.Web.Profile int size = reader.GetInt32 (4);
return new ProfileInfo (username, anonymous, lastActivity, lastUpdate, size);
- } + }
// Helper methods
private void DecodeProfileData (string allnames, string values, byte [] buf, SettingsPropertyValueCollection properties)
@@ -466,8 +466,8 @@ namespace Mainsoft.Web.Profile throw new ArgumentException (String.Format ("invalid format for {0}", pName));
}
- - } -} - -#endif +
+ }
+}
+
+#endif
diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs index 219a0b4120f..c16c4bb9b0b 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs @@ -201,8 +201,8 @@ namespace Mainsoft.Web.Security public static int Membership_GetNumberOfUsersOnline (DbConnection connection, string applicationName, int minutesSinceLastInActive, DateTime currentTimeUtc)
{
- string queryUsersActive = "SELECT COUNT(*) FROM aspnet_Users usr, aspnet_Applications app, aspnet_Membership mbr " + - "WHERE usr.ApplicationId = app.ApplicationId AND usr.LastActivityDate > ? AND " + + string queryUsersActive = "SELECT COUNT(*) FROM aspnet_Users usr, aspnet_Applications app, aspnet_Membership mbr " +
+ "WHERE usr.ApplicationId = app.ApplicationId AND usr.LastActivityDate > ? AND " +
"app.LoweredApplicationName = ? AND usr.UserId = mbr.UserId";
@@ -361,9 +361,9 @@ namespace Mainsoft.Web.Security return 1; // user not found
}
- string querySelect = "SELECT usr.UserName, mbr.UserId, mbr.Email, mbr.PasswordQuestion, mbr.Comment, mbr.IsApproved, " + - "mbr.IsLockedOut, mbr.CreateDate, mbr.LastLoginDate, usr.LastActivityDate, mbr.LastPasswordChangedDate, mbr.LastLockoutDate " + - "FROM aspnet_Users usr, aspnet_Membership mbr " + + string querySelect = "SELECT usr.UserName, mbr.UserId, mbr.Email, mbr.PasswordQuestion, mbr.Comment, mbr.IsApproved, " +
+ "mbr.IsLockedOut, mbr.CreateDate, mbr.LastLoginDate, usr.LastActivityDate, mbr.LastPasswordChangedDate, mbr.LastLockoutDate " +
+ "FROM aspnet_Users usr, aspnet_Membership mbr " +
"WHERE usr.UserId = ? AND usr.UserId = mbr.UserId";
OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);
AddParameter (cmdSelect, "UserId", userId);
diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs index 125b31e37c6..a8d1ff8abfb 100644 --- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs +++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs @@ -244,8 +244,8 @@ namespace Mainsoft.Web.Security if (roleId == null)
return 2;
- string querySelect = "SELECT usr.UserName FROM aspnet_Users usr, aspnet_UsersInRoles uir " + - "WHERE usr.UserId = uir.UserId AND usr.ApplicationId = ? AND uir.RoleId = ? AND LoweredUserName LIKE ? " + + string querySelect = "SELECT usr.UserName FROM aspnet_Users usr, aspnet_UsersInRoles uir " +
+ "WHERE usr.UserId = uir.UserId AND usr.ApplicationId = ? AND uir.RoleId = ? AND LoweredUserName LIKE ? " +
"ORDER BY usr.UserName";
OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);
AddParameter (cmdSelect, "ApplicationId", appId);
diff --git a/mcs/class/Mainsoft.Web/Tests/Mainsoft.Web.Security/MembershipTests.cs b/mcs/class/Mainsoft.Web/Tests/Mainsoft.Web.Security/MembershipTests.cs index 5a187611b8f..e1574c0905e 100644 --- a/mcs/class/Mainsoft.Web/Tests/Mainsoft.Web.Security/MembershipTests.cs +++ b/mcs/class/Mainsoft.Web/Tests/Mainsoft.Web.Security/MembershipTests.cs @@ -43,7 +43,7 @@ using System.Collections.Generic; using System.Collections.Specialized;
using System.Text;
using Mainsoft.Web.Security;
-using NUnit.Framework; +using NUnit.Framework;
namespace Mainsoft.Web.Security.Tests
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/.gitattributes b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/.gitattributes index fd80e2bde41..cea6846f7b4 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/.gitattributes +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/.gitattributes @@ -1,7 +1,6 @@ /ButtonPainter.cs -crlf /ChangeLog -crlf /CheckBoxPainter.cs -crlf -/LinkLabelPainter.cs -crlf /RadioButtonPainter.cs -crlf /TabControlPainter.cs -crlf /ToolStripPainter.cs -crlf diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/LinkLabelPainter.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/LinkLabelPainter.cs index 4b43ab504a3..68fa36d4ccb 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/LinkLabelPainter.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/LinkLabelPainter.cs @@ -1,30 +1,30 @@ -// 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) 2007 Novell, Inc.
-//
-// Authors:
+// 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) 2007 Novell, Inc. +// +// Authors: // Everaldo Canuto (ecanuto@novell.com) -using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
+using System; +using System.Drawing; +using System.Drawing.Drawing2D; namespace System.Windows.Forms.Theming.Default { diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElements.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElements.cs index de33265af67..9e55dd53a65 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElements.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElements.cs @@ -21,7 +21,7 @@ //
// Authors:
// Jonathan Pobst (monkey@jpobst.com)
-// Everaldo Canuto <ecanuto@novell.com> +// Everaldo Canuto <ecanuto@novell.com>
using System;
using System.Drawing;
@@ -85,26 +85,26 @@ namespace System.Windows.Forms.Theming {
theme.ButtonPainter.DrawPopup (g, bounds, state, backColor, foreColor);
}
- #endregion - - #region Painters - + #endregion
+
+ #region Painters
+
public virtual Default.ButtonPainter ButtonPainter {
get { return theme.ButtonPainter; }
}
- - public static Default.LabelPainter LabelPainter { - get { return theme.LabelPainter; } +
+ public static Default.LabelPainter LabelPainter {
+ get { return theme.LabelPainter; }
}
- - public static Default.LinkLabelPainter LinkLabelPainter { - get { return theme.LinkLabelPainter; } +
+ public static Default.LinkLabelPainter LinkLabelPainter {
+ get { return theme.LinkLabelPainter; }
}
- +
public virtual Default.TabControlPainter TabControlPainter {
get { return theme.TabControlPainter; }
}
- +
#if NET_2_0
public virtual Default.CheckBoxPainter CheckBoxPainter {
get { return theme.CheckBoxPainter; }
@@ -113,12 +113,12 @@ namespace System.Windows.Forms.Theming public virtual Default.RadioButtonPainter RadioButtonPainter {
get { return theme.RadioButtonPainter; }
}
- +
public virtual Default.ToolStripPainter ToolStripPainter {
get { return theme.ToolStripPainter; }
}
#endif
- +
#endregion
}
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElementsDefault.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElementsDefault.cs index 8505f9194f8..3f02dedd860 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElementsDefault.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/ThemeElementsDefault.cs @@ -46,7 +46,7 @@ namespace System.Windows.Forms.Theming return buttonPainter;
}
}
- +
protected Default.LabelPainter labelPainter;
public virtual Default.LabelPainter LabelPainter {
get {
@@ -55,7 +55,7 @@ namespace System.Windows.Forms.Theming return labelPainter;
}
}
- +
protected Default.LinkLabelPainter linklabelPainter;
public virtual Default.LinkLabelPainter LinkLabelPainter {
get {
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs index da5f54fc8a3..45b41d7ca14 100644 --- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs +++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs @@ -42,7 +42,7 @@ namespace MonoTests.System.Windows.Forms if (child2 != null) {
child2.Dispose ();
child2 = null;
- } + }
base.TearDown ();
}
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SendKeysTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SendKeysTest.cs index 539156672fe..6baf740511e 100644 --- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SendKeysTest.cs +++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SendKeysTest.cs @@ -120,7 +120,7 @@ namespace MonoTests.System.Windows.Forms [SetUp]
protected override void SetUp () {
- keys.Clear(); + keys.Clear();
base.SetUp ();
}
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs index 6845e0e23d7..f1e15738937 100644 --- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs +++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs @@ -21,7 +21,7 @@ namespace MonoTests.System.Windows.Forms {
[SetUp]
protected override void SetUp () {
- Reset (); + Reset ();
base.SetUp ();
}
diff --git a/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.en.resx b/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.en.resx index 2618535e9a0..c862d84cb1e 100644 --- a/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.en.resx +++ b/mcs/class/Managed.Windows.Forms/resources/System.Windows.Forms.en.resx @@ -840,4 +840,4 @@ <data name="Restore" xml:space="preserve">
<value>Restore</value>
</data>
-</root> +</root>
diff --git a/mcs/class/Microsoft.Build.Engine/.gitattributes b/mcs/class/Microsoft.Build.Engine/.gitattributes deleted file mode 100644 index b8292be1eef..00000000000 --- a/mcs/class/Microsoft.Build.Engine/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/Makefile -crlf diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile index 07f9e6fc299..75b0ae8a385 100644 --- a/mcs/class/Microsoft.Build.Engine/Makefile +++ b/mcs/class/Microsoft.Build.Engine/Makefile @@ -31,8 +31,8 @@ TEST_MCS_FLAGS = \ /r:Microsoft.Build.Framework.dll \ /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll -EXTRA_DISTFILES = \
- Test/resources/TestTasks.cs \
+EXTRA_DISTFILES = \ + Test/resources/TestTasks.cs \ Test/resources/*.*proj \ Test/test-config-file* diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/.gitattributes b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/.gitattributes index fbcd65a7b92..843bf6c8eb1 100644 --- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/.gitattributes +++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/.gitattributes @@ -1,4 +1,3 @@ -/ChangeLog -crlf /SQLite3.cs -crlf /SQLite3_UTF16.cs -crlf /SQLiteBase.cs -crlf diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/ChangeLog b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/ChangeLog index 8860adbd9a9..d1fb5972d10 100644 --- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/ChangeLog +++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/ChangeLog @@ -42,8 +42,8 @@ 2007-06-03 Kamil Skalski <nazgul@nemerle.org> - * SQLiteConvert.cs: Port function for converting native UTF8 string
- into managed string from the old SqliteClient implementation.
+ * SQLiteConvert.cs: Port function for converting native UTF8 string + into managed string from the old SqliteClient implementation. Use it instead of PtrToStrAuto, which fails on Windows. 2007-02-20 Marek Habersack <grendello@gmail.com> diff --git a/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/.gitattributes b/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/.gitattributes index 2dcbc0db5d3..cdcaaf531b1 100644 --- a/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/.gitattributes +++ b/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/.gitattributes @@ -1,2 +1 @@ -/UnixBinaryClientFormatterSink.cs -crlf /UnixConnectionPool.cs -crlf diff --git a/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixBinaryClientFormatterSink.cs b/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixBinaryClientFormatterSink.cs index eee4a712270..2a6f812a24d 100644 --- a/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixBinaryClientFormatterSink.cs +++ b/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixBinaryClientFormatterSink.cs @@ -130,7 +130,7 @@ namespace Mono.Remoting.Channels.Unix _nextInChain.AsyncProcessRequest (stack, msg, transportHeaders, stream); // FIXME: No idea about how to implement IMessageCtrl - return null;
+ return null; } public IMessage SyncProcessMessage (IMessage msg) diff --git a/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixConnectionPool.cs b/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixConnectionPool.cs index e0678f87cd8..cb2809377a0 100644 --- a/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixConnectionPool.cs +++ b/mcs/class/Mono.Posix/Mono.Remoting.Channels.Unix/UnixConnectionPool.cs @@ -5,27 +5,27 @@ //
// Copyright (C) 2005 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. -// +
+//
+// 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;
@@ -308,4 +308,4 @@ namespace Mono.Remoting.Channels.Unix }
-} +}
diff --git a/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/.gitattributes b/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/.gitattributes deleted file mode 100644 index 7607d1435d9..00000000000 --- a/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/SslServerStream.xml -crlf diff --git a/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/SslServerStream.xml b/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/SslServerStream.xml index 5dca1c3b8e2..df42d48c58d 100644 --- a/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/SslServerStream.xml +++ b/mcs/class/Mono.Security/Documentation/en/Mono.Security.Protocol.Tls/SslServerStream.xml @@ -17,95 +17,95 @@ <remarks> <example> <code lang="C#"> -using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-using Mono.Security.Authenticode;
-using Mono.Security.Protocol.Tls;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-
-namespace SslHttpServer
-{
- class SslHttpServer
- {
+using System; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Text; + +using Mono.Security.Authenticode; +using Mono.Security.Protocol.Tls; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; + +namespace SslHttpServer +{ + class SslHttpServer + { private static X509Certificate _certificate; private static string certfile; - private static string keyfile;
-
- static void Main (string [] args)
+ private static string keyfile; + + static void Main (string [] args) { certfile = (args.Length > 0) ? args [0] : "ssl.cer"; keyfile = (args.Length > 0) ? args [0] : "ssl.pvk"; -
- Socket listenSocket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- IPEndPoint localEndPoint = new IPEndPoint (IPAddress.Any, 1888);
- Socket requestSocket;
-
- listenSocket.Bind (localEndPoint);
- listenSocket.Listen (10);
-
- while (true) {
- try {
- requestSocket = listenSocket.Accept ();
- using (NetworkStream ns = new NetworkStream (requestSocket, FileAccess.ReadWrite, true)) {
- using (SslServerStream s = new SslServerStream (ns, Certificate, false, false)) {
- s.PrivateKeyCertSelectionDelegate += new PrivateKeySelectionCallback (GetPrivateKey);
- StreamReader reader = new StreamReader (s);
- StreamWriter writer = new StreamWriter (s, Encoding.ASCII);
-
- string line;
- string answer =
- "HTTP/1.0 200\r\n" +
- "Connection: close\r\n" +
- "Content-Type: text/html\r\n" +
- "Content-Encoding: " + Encoding.ASCII.WebName + "\r\n" +
- "\r\n" +
- "<html><body><h1>Hello World!</h1></body></html>\r\n";
-
- // Read request header
- do {
- line = reader.ReadLine ();
- if (line != null)
- Console.WriteLine (line);
- }
- while (line != null && line.Length > 0);
-
- // Send response
- writer.Write (answer);
-
- writer.Flush ();
- s.Flush ();
- ns.Flush ();
- }
- }
- }
- catch (Exception ex) {
- Console.WriteLine ("---------------------------------------------------------");
- Console.WriteLine (ex.ToString ());
- }
- }
- }
-
- private static X509Certificate Certificate {
- get {
- if (_certificate == null)
- _certificate = X509Certificate.CreateFromCertFile (certfile);
- return _certificate;
- }
- }
-
- // note: makecert creates the private key in the PVK format
- private static AsymmetricAlgorithm GetPrivateKey (X509Certificate certificate, string targetHost)
- {
- PrivateKey key = PrivateKey.CreateFromFile (keyfile);
- return key.RSA;
- }
- }
-}
+ + Socket listenSocket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + IPEndPoint localEndPoint = new IPEndPoint (IPAddress.Any, 1888); + Socket requestSocket; + + listenSocket.Bind (localEndPoint); + listenSocket.Listen (10); + + while (true) { + try { + requestSocket = listenSocket.Accept (); + using (NetworkStream ns = new NetworkStream (requestSocket, FileAccess.ReadWrite, true)) { + using (SslServerStream s = new SslServerStream (ns, Certificate, false, false)) { + s.PrivateKeyCertSelectionDelegate += new PrivateKeySelectionCallback (GetPrivateKey); + StreamReader reader = new StreamReader (s); + StreamWriter writer = new StreamWriter (s, Encoding.ASCII); + + string line; + string answer = + "HTTP/1.0 200\r\n" + + "Connection: close\r\n" + + "Content-Type: text/html\r\n" + + "Content-Encoding: " + Encoding.ASCII.WebName + "\r\n" + + "\r\n" + + "<html><body><h1>Hello World!</h1></body></html>\r\n"; + + // Read request header + do { + line = reader.ReadLine (); + if (line != null) + Console.WriteLine (line); + } + while (line != null && line.Length > 0); + + // Send response + writer.Write (answer); + + writer.Flush (); + s.Flush (); + ns.Flush (); + } + } + } + catch (Exception ex) { + Console.WriteLine ("---------------------------------------------------------"); + Console.WriteLine (ex.ToString ()); + } + } + } + + private static X509Certificate Certificate { + get { + if (_certificate == null) + _certificate = X509Certificate.CreateFromCertFile (certfile); + return _certificate; + } + } + + // note: makecert creates the private key in the PVK format + private static AsymmetricAlgorithm GetPrivateKey (X509Certificate certificate, string targetHost) + { + PrivateKey key = PrivateKey.CreateFromFile (keyfile); + return key.RSA; + } + } +} </code> </example> <para> diff --git a/mcs/class/Mono.Security/Test/tools/mutual/mutual.cs b/mcs/class/Mono.Security/Test/tools/mutual/mutual.cs index 9282d355051..1f4b6a95cdd 100644 --- a/mcs/class/Mono.Security/Test/tools/mutual/mutual.cs +++ b/mcs/class/Mono.Security/Test/tools/mutual/mutual.cs @@ -48,11 +48,11 @@ class TestSslClientStream { ssl.ClientCertSelectionDelegate += new CertificateSelectionCallback (ClientCertificateSelection);
ssl.PrivateKeyCertSelectionDelegate += new PrivateKeySelectionCallback (PrivateKeySelection);
- StreamWriter sw = new StreamWriter (ssl, System.Text.Encoding.ASCII); - sw.WriteLine ("GET /clientcert.aspx{0}", Environment.NewLine); - sw.Flush (); + StreamWriter sw = new StreamWriter (ssl, System.Text.Encoding.ASCII);
+ sw.WriteLine ("GET /clientcert.aspx{0}", Environment.NewLine);
+ sw.Flush ();
- StreamReader sr = new StreamReader (ssl); + StreamReader sr = new StreamReader (ssl);
Console.WriteLine (sr.ReadToEnd ());
}
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/Krb5Helper.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/Krb5Helper.cs index 65c037f6d7b..9b58ff50d9e 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/Krb5Helper.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/Krb5Helper.cs @@ -1,32 +1,32 @@ -// -// Novell.Directory.Ldap.Security.Krb5Helper.cs -// -// Authors: -// Boris Kirzner <borsk@mainsoft.com> -// Konstantin Triger <kostat@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Novell.Directory.Ldap.Security.Krb5Helper.cs
+//
+// Authors:
+// Boris Kirzner <borsk@mainsoft.com>
+// Konstantin Triger <kostat@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
@@ -42,8 +42,8 @@ namespace Novell.Directory.Ldap.Security internal class Krb5Helper : IDisposable
{
enum QOP {
- NO_PROTECTION = 1, - INTEGRITY_ONLY_PROTECTION = 2, + NO_PROTECTION = 1,
+ INTEGRITY_ONLY_PROTECTION = 2,
PRIVACY_PROTECTION = 4
}
@@ -113,7 +113,7 @@ namespace Novell.Directory.Ldap.Security //int rawSendSize = Context.getWrapSizeLimit(0, _encryption, srvMaxBufSize);
- byte [] gssInToken = new byte [4]; + byte [] gssInToken = new byte [4];
gssInToken [0] = (byte) myCop;
SecureStream.IntToNetworkByteOrder (srvMaxBufSize, gssInToken, 1, 3);
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/SecureStream.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/SecureStream.cs index f9aa4e43aec..08a37e6718c 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/SecureStream.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Security.jvm/SecureStream.cs @@ -1,32 +1,32 @@ -// -// Novell.Directory.Ldap.Security.SecureStream.cs -// -// Authors: -// Boris Kirzner <borsk@mainsoft.com> -// Konstantin Triger <kostat@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Novell.Directory.Ldap.Security.SecureStream.cs
+//
+// Authors:
+// Boris Kirzner <borsk@mainsoft.com>
+// Konstantin Triger <kostat@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/.gitattributes b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/.gitattributes index deff863048e..05755f136df 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/.gitattributes +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/.gitattributes @@ -1,4 +1,3 @@ /ExceptionMessages.resx -crlf /ExceptionMessages.txt -crlf -/ResourcesHandler.cs -crlf /ResultCodeMessages.resx -crlf diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs index 01ec3002601..d89cd3fdce7 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs @@ -107,7 +107,7 @@ namespace Novell.Directory.Ldap.Utilclass public static System.String getMessage(System.String messageOrKey, System.Object[] arguments, System.Globalization.CultureInfo locale) { if (defaultMessages == null) - {
+ { defaultMessages = new ResourceManager ("ExceptionMessages", Assembly.GetExecutingAssembly ()); } @@ -180,7 +180,7 @@ namespace Novell.Directory.Ldap.Utilclass if (defaultResultCodes == null) { /* - defaultResultCodes = ResourceManager.CreateFileBasedResourceManager("ResultCodeMessages", "Resources", null);*/
+ defaultResultCodes = ResourceManager.CreateFileBasedResourceManager("ResultCodeMessages", "Resources", null);*/ defaultResultCodes = new ResourceManager ("ResultCodeMessages", Assembly.GetExecutingAssembly ()); } diff --git a/mcs/class/Npgsql/Npgsql/.gitattributes b/mcs/class/Npgsql/Npgsql/.gitattributes index 19e81702c17..6907dc7576c 100644 --- a/mcs/class/Npgsql/Npgsql/.gitattributes +++ b/mcs/class/Npgsql/Npgsql/.gitattributes @@ -1,8 +1 @@ /Cache.cs -crlf -/NpgsqlClosedState.resx -crlf -/NpgsqlConnectedState.resx -crlf -/NpgsqlException.resx -crlf -/NpgsqlParameterCollection.cs -crlf -/NpgsqlReadyState.resx -crlf -/NpgsqlTransaction.es.resx -crlf -/NpgsqlTransaction.resx -crlf diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlClosedState.resx b/mcs/class/Npgsql/Npgsql/NpgsqlClosedState.resx index 772df879e3f..c1c158cd8c1 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlClosedState.resx +++ b/mcs/class/Npgsql/Npgsql/NpgsqlClosedState.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlConnectedState.resx b/mcs/class/Npgsql/Npgsql/NpgsqlConnectedState.resx index 17206e2936c..bdd5e999a25 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlConnectedState.resx +++ b/mcs/class/Npgsql/Npgsql/NpgsqlConnectedState.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlException.resx b/mcs/class/Npgsql/Npgsql/NpgsqlException.resx index 1698867f759..cbbb4dcf913 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlException.resx +++ b/mcs/class/Npgsql/Npgsql/NpgsqlException.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlParameterCollection.cs b/mcs/class/Npgsql/Npgsql/NpgsqlParameterCollection.cs index 03140387ebf..25756caa776 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlParameterCollection.cs +++ b/mcs/class/Npgsql/Npgsql/NpgsqlParameterCollection.cs @@ -249,14 +249,14 @@ namespace Npgsql NpgsqlEventLog.LogMethodEnter(LogLevel.Debug, CLASSNAME, "IndexOf", parameterName); // Iterate values to see what is the index of parameter. - Int32 index = 0;
- if ((parameterName[0] == ':') || (parameterName[0] == '@'))
- parameterName = parameterName.Remove(0, 1);
-
- foreach (NpgsqlParameter parameter in this)
- {
- if (parameter.ParameterName.Remove(0, 1) == parameterName)
- return index;
+ Int32 index = 0; + if ((parameterName[0] == ':') || (parameterName[0] == '@')) + parameterName = parameterName.Remove(0, 1); + + foreach (NpgsqlParameter parameter in this) + { + if (parameter.ParameterName.Remove(0, 1) == parameterName) + return index; index++; } return -1; @@ -331,29 +331,29 @@ namespace Npgsql NpgsqlEventLog.LogMethodEnter(LogLevel.Debug, CLASSNAME, "Contains", value); CheckType(value); return this.InternalList.Contains(value); - }
-
- /// <summary>
- /// Gets a value indicating whether a <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified parameter name exists in the collection.
- /// </summary>
- /// <param name="parameterName">The name of the <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param>
- /// <param name="parameter">A reference to the requested parameter is returned in this out param if it is found in the list. This value is null if the parameter is not found.</param>
- /// <returns><b>true</b> if the collection contains the parameter and param will contain the parameter; otherwise, <b>false</b>.</returns>
- public bool TryGetValue(string parameterName, out NpgsqlParameter parameter)
- {
- NpgsqlEventLog.LogMethodEnter(LogLevel.Debug, CLASSNAME, "TryGetValue", parameterName);
- int index = IndexOf(parameterName);
- if (index != -1)
- {
- parameter = this[index];
- return true;
- }
- else
- {
- parameter = null;
- return false;
- }
- }
+ } + + /// <summary> + /// Gets a value indicating whether a <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified parameter name exists in the collection. + /// </summary> + /// <param name="parameterName">The name of the <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param> + /// <param name="parameter">A reference to the requested parameter is returned in this out param if it is found in the list. This value is null if the parameter is not found.</param> + /// <returns><b>true</b> if the collection contains the parameter and param will contain the parameter; otherwise, <b>false</b>.</returns> + public bool TryGetValue(string parameterName, out NpgsqlParameter parameter) + { + NpgsqlEventLog.LogMethodEnter(LogLevel.Debug, CLASSNAME, "TryGetValue", parameterName); + int index = IndexOf(parameterName); + if (index != -1) + { + parameter = this[index]; + return true; + } + else + { + parameter = null; + return false; + } + } /// <summary> /// Removes all items from the collection. diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlReadyState.resx b/mcs/class/Npgsql/Npgsql/NpgsqlReadyState.resx index 84d2fec2037..1324af3a031 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlReadyState.resx +++ b/mcs/class/Npgsql/Npgsql/NpgsqlReadyState.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.es.resx b/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.es.resx index 106638c7bb3..b230c76b8e6 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.es.resx +++ b/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.es.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.resx b/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.resx index ce394ae88d8..bb2cde485ad 100644 --- a/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.resx +++ b/mcs/class/Npgsql/Npgsql/NpgsqlTransaction.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/Npgsql/NpgsqlTypes/.gitattributes b/mcs/class/Npgsql/NpgsqlTypes/.gitattributes deleted file mode 100644 index 04439158c99..00000000000 --- a/mcs/class/Npgsql/NpgsqlTypes/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/NpgsqlTypesHelper.resx -crlf diff --git a/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.resx b/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.resx index 05439bfe965..fb8bdee860c 100644 --- a/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.resx +++ b/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.resx @@ -57,7 +57,7 @@ value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. - -->
+ --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> diff --git a/mcs/class/System.Configuration/Test/standalone/.gitattributes b/mcs/class/System.Configuration/Test/standalone/.gitattributes index 983dc39079a..d0a8768799c 100644 --- a/mcs/class/System.Configuration/Test/standalone/.gitattributes +++ b/mcs/class/System.Configuration/Test/standalone/.gitattributes @@ -1,5 +1,4 @@ /t11.exe.expected -crlf -/t28.cs -crlf /t32.exe.expected -crlf /t33.exe.expected -crlf /t34.exe.expected -crlf diff --git a/mcs/class/System.Configuration/Test/standalone/t28.cs b/mcs/class/System.Configuration/Test/standalone/t28.cs index ea70b5a74ba..fa58ee387ef 100644 --- a/mcs/class/System.Configuration/Test/standalone/t28.cs +++ b/mcs/class/System.Configuration/Test/standalone/t28.cs @@ -11,7 +11,7 @@ class T1 { try { NameValueCollection AppSettings = ConfigurationManager.AppSettings; - Assert.Fail ("#1:" + AppSettings);
+ Assert.Fail ("#1:" + AppSettings); } catch (ConfigurationErrorsException ex) { // Configuration system failed to initialize Assert.AreEqual (typeof (ConfigurationErrorsException), ex.GetType (), "#2"); @@ -28,9 +28,9 @@ class T1 Assert.AreEqual (3, inner.Line, "#12"); Assert.IsNotNull (inner.Message, "#13"); Assert.IsTrue (inner.Message.IndexOf ("<location>") != -1, "#14:" + inner.Message); - Assert.IsTrue (inner.Message.IndexOf ("<configuration>") != -1, "#15:" + inner.Message);
-
- Console.WriteLine ("configuration exception thrown.");
+ Assert.IsTrue (inner.Message.IndexOf ("<configuration>") != -1, "#15:" + inner.Message); + + Console.WriteLine ("configuration exception thrown."); } } } diff --git a/mcs/class/System.Data.Linq/examples/DbLinq.MySql.Example/nwind/Andrus.cs b/mcs/class/System.Data.Linq/examples/DbLinq.MySql.Example/nwind/Andrus.cs index 4c75dd7b739..93298083f26 100644 --- a/mcs/class/System.Data.Linq/examples/DbLinq.MySql.Example/nwind/Andrus.cs +++ b/mcs/class/System.Data.Linq/examples/DbLinq.MySql.Example/nwind/Andrus.cs @@ -78,7 +78,7 @@ namespace andrusDB }
#endregion
- #warning L189 table t2 has no primary key. Multiple c# objects will refer to the same row. + #warning L189 table t2 has no primary key. Multiple c# objects will refer to the same row.
#region childtables
#endregion
diff --git a/mcs/class/System.Data.Linq/src/DbMetal/Language/.gitattributes b/mcs/class/System.Data.Linq/src/DbMetal/Language/.gitattributes index f100b2d8243..32425b466b1 100644 --- a/mcs/class/System.Data.Linq/src/DbMetal/Language/.gitattributes +++ b/mcs/class/System.Data.Linq/src/DbMetal/Language/.gitattributes @@ -1,6 +1,5 @@ /EnglishWords.cs -crlf /EnglishWords.txt -crlf /FrenchWords.cs -crlf -/FrenchWords.txt -crlf /GermanWords.cs -crlf /GermanWords.txt -crlf diff --git a/mcs/class/System.Data.Linq/src/DbMetal/Language/FrenchWords.txt b/mcs/class/System.Data.Linq/src/DbMetal/Language/FrenchWords.txt index 1c94c24627e..49277bea3c6 100644 --- a/mcs/class/System.Data.Linq/src/DbMetal/Language/FrenchWords.txt +++ b/mcs/class/System.Data.Linq/src/DbMetal/Language/FrenchWords.txt @@ -336529,130 +336529,130 @@ zythum zythums #pluriels irréguliers -# http://fr.wikipedia.org/wiki/Pluriels_irr%C3%A9guliers_en_fran%C3%A7ais
-
-banal=>banals
-bancal=>bancals
-fatal=>fatals
-fractalmorfal=>fractalmorfals
-naval=>navals
-aéronaval=>aéronavals
-natal=>natals
-anténatal=>anténatals
-néonatal=>néonatals
-périnatal=>périnatals
-postnatal=>postnatals
-prénatal=>prénatals
-tonal=>tonals
-atonal=>atonals
-bitonal=>bitonals
-polytonal=>polytonals
-acétal=>acétals
-ammonal=>ammonals
-aval=>avals
-bal=>bals
-barbital=>barbitals
-cal=>cals
-captal=>captals
-carnaval=>carnavals
-cérémonial=>cérémonials
-chloral=>chlorals
-chrysocal=>chrysocals
-copal=>copals
-dial=>dials
-dispersal=>dispersals
-éthanal=>éthanals
-festival=>festivals
-foiral=>foirals
-furfural=>furfurals
-futal=>futals
-gal=>gals
-galgal=>galgals
-gardénal=>gardénals
-graal=>graals
-joual=>jouals
-kraal=>kraals
-kursaal=>kursaals
-matorral=>matorrals
-mescal=>mescals
-mezcal=>mezcals
-méthanal=>méthanals
-minerval=>minervals
-mistral=>mistrals
-nopal=>nopals
-pal=>pals
-pascal=>pascals
-hectopascal=>hectopascals
-kilopascal=>kilopascals
-penthotal=>penthotals
-phénobarbital=>phénobarbitals
-pipéronal=>pipéronals
-raval=>ravals
-récital=>récitals
-régal=>régals
-rétinal=>rétinals
-rital=>ritals
-roberval=>robervals
-roseval=>rosevals
-salicional=>salicionals
-sal=>sals
-santal=>santals
-saroual=>sarouals
-sial=>sials
-sisal=>sisals
-sonal=>sonals
-tagal=>tagals
-tefal=>tefals
-tergal=>tergals
-thiopental=>thiopentals
-tical=>ticals
-tincal=>tincals
-véronal=>véronals
-zicral=>zicrals
-caracal=>caracals
-chacal=>chacals
-gavial=>gavials
-gayal=>gayals
-narval=>narvals
-quetzal=>quetzals
-rorqual=>rorquals
-serval=>servals
-cantal=>cantals
-emmental=>emmentals
-emmenthal=>emmenthals
-metical=>meticals
-rial=>rials
-riyal=>riyals
-ryal=>ryals
-floréal=>floréals
-germinal=>germinals
-prairial=>prairials
-corral=>corrals
-deal=>deals
-goal=>goals
-autogoal=>autogoals
-revival=>revivals
-serial=>serials
-spiritual=>spirituals
-taal=>taals
-trial=>trials
-
-bail=>baux
-corail=>coraux
-émail=>émaux
-fermail=>fermaux
-soupirail=>soupiraux
-travail=>travaux
-vantail=>vantaux
-vitrail=>vitraux
-
-bijou=>bijoux
-caillou=>cailloux
-chou=>choux
-genou=>genoux
-hibou=>hiboux
-joujou=>joujoux
-pou=>poux
-
-ciel=>cieux
-oeil=>yeux
+# http://fr.wikipedia.org/wiki/Pluriels_irr%C3%A9guliers_en_fran%C3%A7ais + +banal=>banals +bancal=>bancals +fatal=>fatals +fractalmorfal=>fractalmorfals +naval=>navals +aéronaval=>aéronavals +natal=>natals +anténatal=>anténatals +néonatal=>néonatals +périnatal=>périnatals +postnatal=>postnatals +prénatal=>prénatals +tonal=>tonals +atonal=>atonals +bitonal=>bitonals +polytonal=>polytonals +acétal=>acétals +ammonal=>ammonals +aval=>avals +bal=>bals +barbital=>barbitals +cal=>cals +captal=>captals +carnaval=>carnavals +cérémonial=>cérémonials +chloral=>chlorals +chrysocal=>chrysocals +copal=>copals +dial=>dials +dispersal=>dispersals +éthanal=>éthanals +festival=>festivals +foiral=>foirals +furfural=>furfurals +futal=>futals +gal=>gals +galgal=>galgals +gardénal=>gardénals +graal=>graals +joual=>jouals +kraal=>kraals +kursaal=>kursaals +matorral=>matorrals +mescal=>mescals +mezcal=>mezcals +méthanal=>méthanals +minerval=>minervals +mistral=>mistrals +nopal=>nopals +pal=>pals +pascal=>pascals +hectopascal=>hectopascals +kilopascal=>kilopascals +penthotal=>penthotals +phénobarbital=>phénobarbitals +pipéronal=>pipéronals +raval=>ravals +récital=>récitals +régal=>régals +rétinal=>rétinals +rital=>ritals +roberval=>robervals +roseval=>rosevals +salicional=>salicionals +sal=>sals +santal=>santals +saroual=>sarouals +sial=>sials +sisal=>sisals +sonal=>sonals +tagal=>tagals +tefal=>tefals +tergal=>tergals +thiopental=>thiopentals +tical=>ticals +tincal=>tincals +véronal=>véronals +zicral=>zicrals +caracal=>caracals +chacal=>chacals +gavial=>gavials +gayal=>gayals +narval=>narvals +quetzal=>quetzals +rorqual=>rorquals +serval=>servals +cantal=>cantals +emmental=>emmentals +emmenthal=>emmenthals +metical=>meticals +rial=>rials +riyal=>riyals +ryal=>ryals +floréal=>floréals +germinal=>germinals +prairial=>prairials +corral=>corrals +deal=>deals +goal=>goals +autogoal=>autogoals +revival=>revivals +serial=>serials +spiritual=>spirituals +taal=>taals +trial=>trials + +bail=>baux +corail=>coraux +émail=>émaux +fermail=>fermaux +soupirail=>soupiraux +travail=>travaux +vantail=>vantaux +vitrail=>vitraux + +bijou=>bijoux +caillou=>cailloux +chou=>choux +genou=>genoux +hibou=>hiboux +joujou=>joujoux +pou=>poux + +ciel=>cieux +oeil=>yeux diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/.gitattributes b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/.gitattributes deleted file mode 100644 index 5a642ffe071..00000000000 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -/OciStatementHandle.cs -crlf -/OciTransactionHandle.cs -crlf diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciStatementHandle.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciStatementHandle.cs index 66c48f49455..31afb5cb324 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciStatementHandle.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciStatementHandle.cs @@ -160,7 +160,7 @@ namespace System.Data.OracleClient.Oci { executeMode = (int)OciExecuteMode.Default; } - if (this.disposed)
+ if (this.disposed) { throw new InvalidOperationException ("StatementHandle is already disposed."); } @@ -214,7 +214,7 @@ namespace System.Data.OracleClient.Oci { { int status = 0; - if (this.disposed)
+ if (this.disposed) { throw new InvalidOperationException ("StatementHandle is already disposed."); } @@ -232,10 +232,10 @@ namespace System.Data.OracleClient.Oci { case OciGlue.OCI_DEFAULT: moreResults = true; break; - case OciGlue.OCI_SUCCESS_WITH_INFO:
- //OciErrorInfo ei = ErrorHandle.HandleError ();
- //command.Connection.CreateInfoMessage (ei);
- moreResults = true;
+ case OciGlue.OCI_SUCCESS_WITH_INFO: + //OciErrorInfo ei = ErrorHandle.HandleError (); + //command.Connection.CreateInfoMessage (ei); + moreResults = true; break; default: OciErrorInfo info = ErrorHandle.HandleError (); diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciTransactionHandle.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciTransactionHandle.cs index 4308a389883..ac0eeec2113 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciTransactionHandle.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciTransactionHandle.cs @@ -78,7 +78,7 @@ namespace System.Data.OracleClient.Oci { 0, OciAttributeType.Transaction, ErrorHandle); - if (status != 0)
+ if (status != 0) { OciErrorInfo info = ErrorHandle.HandleError (); throw new OracleException (info.ErrorCode, info.ErrorMessage); @@ -109,7 +109,7 @@ namespace System.Data.OracleClient.Oci { try { status = OciCalls.OCITransCommit (Service, ErrorHandle, 0); - if (status != 0)
+ if (status != 0) { OciErrorInfo info = ErrorHandle.HandleError (); throw new OracleException (info.ErrorCode, info.ErrorMessage); diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/.gitattributes b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/.gitattributes index c52315af987..0192cac9938 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/.gitattributes +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/.gitattributes @@ -6,7 +6,6 @@ /OracleError.cs -crlf /OracleErrorCollection.cs -crlf /OracleException.cs -crlf -/OracleInfoMessageEventArgs.cs -crlf /OracleParameter.cs -crlf /OracleParameterCollection.cs -crlf /OracleTransaction.cs -crlf diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs index 4c5aac09ac4..1e59ffcf3a8 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs @@ -1,32 +1,32 @@ //
// System.Data.OracleClient.OracleCommand
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs index d5ab93f46cc..31e75fc3997 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs @@ -4,33 +4,33 @@ // Author:
// Rodrigo Moya (rodrigo@ximian.com)
// Tim Coleman (tim@timcoleman.com)
-// Konstantin Triger <kostat@mainsoft.com> +// Konstantin Triger <kostat@mainsoft.com>
// Boris Kirzner <borisk@mainsoft.com>
//
// Copyright (C) Rodrigo Moya, 2002
-// Copyright (C) Tim Coleman, 2002 -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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) Tim Coleman, 2002
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs index cab71d2cc85..e21da07a0f0 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs @@ -1,31 +1,31 @@ //
// System.Data.Oracle.OracleConvert
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs index 4483b4ea3dd..5c1fa39b70a 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs @@ -1,32 +1,32 @@ //
// System.Data.OracleClient.OracleDataReader
//
-// Authors: -// Konstantin Triger <kostat@mainsoft.com> +// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
// Boris Kirzner <borisk@mainsoft.com>
//
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.Data.Common;
@@ -68,8 +68,8 @@ namespace System.Data.OracleClient { }
}
- protected override int GetProviderType(int jdbcType) { - return (int)OracleConvert.JdbcTypeToOracleType(jdbcType); + protected override int GetProviderType(int jdbcType) {
+ return (int)OracleConvert.JdbcTypeToOracleType(jdbcType);
}
protected override IReaderCacheContainer CreateReaderCacheContainer(int jdbcType, int columnIndex) {
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs index e538b0c5995..155f986d2b7 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs @@ -1,32 +1,32 @@ //
// System.Data.SqlClient.SqlException
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.OracleClient {
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs index 86a0cc0bc7f..d16d52a724c 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs @@ -1,5 +1,5 @@ -//
-// System.Data.SqlClient.SqlInfoMessageEventArgs
+// +// System.Data.SqlClient.SqlInfoMessageEventArgs // // Authors: // Konstantin Triger <kostat@mainsoft.com> @@ -29,12 +29,12 @@ // using System; -using System.Data;
-
-namespace System.Data.OracleClient {
- /// <summary>
- /// Summary description for SqlInfoMessageEventArgs.
- /// </summary>
+using System.Data; + +namespace System.Data.OracleClient { + /// <summary> + /// Summary description for SqlInfoMessageEventArgs. + /// </summary> public sealed class OracleInfoMessageEventArgs : EventArgs { #region Fields @@ -73,5 +73,5 @@ namespace System.Data.OracleClient { } #endregion // Methods - }
-}
+ } +} diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs index e0bfefccba5..d6b4e11e7e0 100644 --- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs +++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs @@ -1,32 +1,32 @@ //
// System.Data.OracleClient.OracleParameter
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs index e7f163593ba..d51327838d6 100644 --- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs +++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs @@ -1,32 +1,32 @@ //
// System.Data.OleDb.OleDbCommand
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataAdapter.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataAdapter.cs index f6455f5436c..2b112e49fb0 100644 --- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataAdapter.cs +++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataAdapter.cs @@ -4,33 +4,33 @@ // Authors:
// Rodrigo Moya (rodrigo@ximian.com)
// Tim Coleman (tim@timcoleman.com)
-// Konstantin Triger <kostat@mainsoft.com> +// Konstantin Triger <kostat@mainsoft.com>
// Boris Kirzner <borisk@mainsoft.com>
//
// Copyright (C) Rodrigo Moya, 2002
// Copyright (C) Tim Coleman, 2002
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbException.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbException.cs index 277c57761da..cf2d729b4cf 100644 --- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbException.cs +++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbException.cs @@ -1,32 +1,32 @@ //
// System.Data.OleDb.OleDbException
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbPermission.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbPermission.cs index 92311c560bb..c7dad4f86ef 100644 --- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbPermission.cs +++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbPermission.cs @@ -6,29 +6,29 @@ // Tim Coleman (tim@timcoleman.com)
//
// Copyright (C) Rodrigo Moya, 2002
-// Copyright (C) Tim Coleman, 2002 -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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) Tim Coleman, 2002
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbType.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbType.cs index 9a836a4ee46..90141e80810 100644 --- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbType.cs +++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbType.cs @@ -1,32 +1,32 @@ //
// System.Data.OleDb.OleDbType
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.OleDb
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/.gitattributes b/mcs/class/System.Data/System.Data.ProviderBase.jvm/.gitattributes index 3bc8baa8369..7b2e59e803f 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/.gitattributes +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/.gitattributes @@ -1,11 +1,9 @@ /AbstractDBCommand.cs -crlf /AbstractDBConnection.cs -crlf -/AbstractDBParameter.cs -crlf /AbstractDataReader.cs -crlf /AbstractDbError.cs -crlf /AbstractDbErrorCollection.cs -crlf /AbstractDbException.cs -crlf -/AbstractDbParameterCollection.cs -crlf /AbstractTransaction.cs -crlf /DbConvert.cs -crlf /ParameterMetadataWrapper.cs -crlf diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs index c0edcd02332..855d9d2ff6d 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs @@ -1,32 +1,32 @@ //
// System.Data.ProviderBase.AbstractDbCommand
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
@@ -48,8 +48,8 @@ namespace System.Data.ProviderBase {
public abstract class AbstractDbCommand : DbCommand, ICloneable
{
- #region ProcedureColumnCache - + #region ProcedureColumnCache
+
internal sealed class ProcedureColumnCache : AbstractDbMetaDataCache
{
internal ArrayList GetProcedureColumns(AbstractDBConnection connection, String commandText,AbstractDbCommand command)
@@ -69,15 +69,15 @@ namespace System.Data.ProviderBase cache[key] = col;
return col;
}
- } - - #endregion - - #region SqlStatementsHelper - - internal sealed class SqlStatementsHelper - { - #region Fields + }
+
+ #endregion
+
+ #region SqlStatementsHelper
+
+ internal sealed class SqlStatementsHelper
+ {
+ #region Fields
#if USE_DOTNET_REGEXP
internal static readonly Regex NamedParameterStoredProcedureRegExp = new Regex(@"^\s*{?\s*((?<RETVAL>@\w+)\s*=\s*)?call\s+(?<PROCNAME>(((\[[^\]]*\])|([^\.\(])*)\s*\.\s*){0,2}(\[[^\]]*\]|((\s*[^\.\(\)\{\}\s])+)))\s*(\(\s*(?<USERPARAM>((""([^""]|(""""))*"")|('([^']|(''))*')|[^,])*)?\s*(,\s*(?<USERPARAM>((""([^""]|(""""))*"")|('([^']|(''))*')|[^,])*)\s*)*\))?\s*}?\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
internal static readonly Regex SimpleParameterStoredProcedureRegExp = new Regex(@"^\s*{?\s*((?<RETVAL>\?)\s*=\s*)?call\s+(?<PROCNAME>(((\[[^\]]*\])|([^\.\(])*)\s*\.\s*){0,2}(\[[^\]]*\]|((\s*[^\.\(\)\{\}\s])+)))\s*(\(\s*(?<USERPARAM>((""([^""]|(""""))*"")|('([^']|(''))*')|[^,])*)?\s*(,\s*(?<USERPARAM>((""([^""]|(""""))*"")|('([^']|(''))*')|[^,])*)\s*)*\))?\s*}?\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
@@ -94,17 +94,17 @@ namespace System.Data.ProviderBase internal static readonly SimpleRegex CompoundStatementSplitterReqExp = new CharacterSplitterRegex(';');
internal static readonly SimpleRegex ProcedureParameterSplitterReqExp = new CharacterSplitterRegex(',');
- #endregion // Fields - } - - #endregion // SqlStatementsHelper + #endregion // Fields
+ }
+
+ #endregion // SqlStatementsHelper
#region Fields
- string _commandText; - int _commandTimeout; - CommandType _commandType; - bool _designTimeVisible; + string _commandText;
+ int _commandTimeout;
+ CommandType _commandType;
+ bool _designTimeVisible;
UpdateRowSource _updatedRowSource;
private DbParameterCollection _parameters;
@@ -137,9 +137,9 @@ namespace System.Data.ProviderBase _commandText = cmdText;
_transaction = transaction;
- _commandTimeout = 30; - _commandType = CommandType.Text; - _designTimeVisible = true; + _commandTimeout = 30;
+ _commandType = CommandType.Text;
+ _designTimeVisible = true;
_updatedRowSource = UpdateRowSource.Both;
_isCommandPrepared = false;
@@ -153,25 +153,25 @@ namespace System.Data.ProviderBase #endregion // Constructors
#region Properties
- - public override int CommandTimeout { - get { return _commandTimeout; } - set { _commandTimeout = value; } - } - - public override CommandType CommandType { - get { return _commandType; } - set { _commandType = value; } - } - - public override bool DesignTimeVisible { - get { return _designTimeVisible; } - set { _designTimeVisible = value; } - } - - public override UpdateRowSource UpdatedRowSource { - get { return _updatedRowSource; } - set { _updatedRowSource = value; } +
+ public override int CommandTimeout {
+ get { return _commandTimeout; }
+ set { _commandTimeout = value; }
+ }
+
+ public override CommandType CommandType {
+ get { return _commandType; }
+ set { _commandType = value; }
+ }
+
+ public override bool DesignTimeVisible {
+ get { return _designTimeVisible; }
+ set { _designTimeVisible = value; }
+ }
+
+ public override UpdateRowSource UpdatedRowSource {
+ get { return _updatedRowSource; }
+ set { _updatedRowSource = value; }
}
protected override DbParameterCollection DbParameterCollection
@@ -314,38 +314,38 @@ namespace System.Data.ProviderBase protected internal abstract SystemException CreateException(SQLException e);
- public override int ExecuteNonQuery () - { - IDataReader reader = null; - try { - reader = ExecuteReader (); - } - finally { - if (reader != null) - reader.Close (); - } - return reader.RecordsAffected; - } - - public override object ExecuteScalar () - { - IDataReader reader = ExecuteReader(CommandBehavior.SequentialAccess); - - try { - do { - if (reader.FieldCount > 0 && reader.Read ()) - return reader.GetValue (0); - } - while (reader.NextResult ()); - return null; - } finally { - reader.Close(); - } + public override int ExecuteNonQuery ()
+ {
+ IDataReader reader = null;
+ try {
+ reader = ExecuteReader ();
+ }
+ finally {
+ if (reader != null)
+ reader.Close ();
+ }
+ return reader.RecordsAffected;
}
- public virtual void ResetCommandTimeout () - { - _commandTimeout = 30; + public override object ExecuteScalar ()
+ {
+ IDataReader reader = ExecuteReader(CommandBehavior.SequentialAccess);
+
+ try {
+ do {
+ if (reader.FieldCount > 0 && reader.Read ())
+ return reader.GetValue (0);
+ }
+ while (reader.NextResult ());
+ return null;
+ } finally {
+ reader.Close();
+ }
+ }
+
+ public virtual void ResetCommandTimeout ()
+ {
+ _commandTimeout = 30;
}
public override void Cancel()
@@ -1091,9 +1091,9 @@ namespace System.Data.ProviderBase }
}
- protected virtual void BindOutputParameter(AbstractDbParameter parameter, int parameterIndex) - { - parameter.Validate(); + protected virtual void BindOutputParameter(AbstractDbParameter parameter, int parameterIndex)
+ {
+ parameter.Validate();
int jdbcType = (int)parameter.JdbcType;
// java parameters are 1 based, while .net are 0 based
parameterIndex++;
@@ -1111,23 +1111,23 @@ namespace System.Data.ProviderBase }
else {
callableStatement.registerOutParameter(parameterIndex, jdbcType);
- } + }
}
- private void FillOutputParameters() - { - if (!(_statement is CallableStatement)) { - return; - } - for(int i = 0; i < InternalParameters.Count; i++) { - AbstractDbParameter parameter = (AbstractDbParameter)InternalParameters[i]; - ParameterDirection direction = parameter.Direction; - if (((direction & ParameterDirection.Output) != 0) && !SkipParameter(parameter)) { - FillOutputParameter(parameter, i); - } - // drop jdbc type of out parameter, since it possibly was updated in ExecuteReader - parameter.IsJdbcTypeSet = false; - } + private void FillOutputParameters()
+ {
+ if (!(_statement is CallableStatement)) {
+ return;
+ }
+ for(int i = 0; i < InternalParameters.Count; i++) {
+ AbstractDbParameter parameter = (AbstractDbParameter)InternalParameters[i];
+ ParameterDirection direction = parameter.Direction;
+ if (((direction & ParameterDirection.Output) != 0) && !SkipParameter(parameter)) {
+ FillOutputParameter(parameter, i);
+ }
+ // drop jdbc type of out parameter, since it possibly was updated in ExecuteReader
+ parameter.IsJdbcTypeSet = false;
+ }
}
protected virtual void FillOutputParameter(DbParameter parameter, int index)
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs index 0ff954a0418..c5b422296d5 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs @@ -384,7 +384,7 @@ namespace System.Data.ProviderBase }
}
- throw new ArgumentException( + throw new ArgumentException(
String.Format("Unknown provider name '{0}'", provider), "ConnectionString");
}
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs index a2a3c368204..17a4601268b 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs @@ -1,5 +1,5 @@ -//
-// System.Data.ProviderBase.AbstractDbParameter
+// +// System.Data.ProviderBase.AbstractDbParameter // // Authors: // Konstantin Triger <kostat@mainsoft.com> @@ -27,40 +27,40 @@ // 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.Data;
-using System.Data.Common;
-
-using java.sql;
-
-namespace System.Data.ProviderBase
-{
- public abstract class AbstractDbParameter : DbParameter, IDbDataParameter, ICloneable
- {
- #region Fields
-
- byte _precision;
- byte _scale;
- protected DataRowVersion _sourceVersion;
- private int _jdbcType;
- bool _isDbTypeSet;
- bool _isJdbcTypeSet;
- object _convertedValue;
-
+// + + +using System; +using System.Data; +using System.Data.Common; + +using java.sql; + +namespace System.Data.ProviderBase +{ + public abstract class AbstractDbParameter : DbParameter, IDbDataParameter, ICloneable + { + #region Fields + + byte _precision; + byte _scale; + protected DataRowVersion _sourceVersion; + private int _jdbcType; + bool _isDbTypeSet; + bool _isJdbcTypeSet; + object _convertedValue; + string _parameterName; ParameterDirection _direction = ParameterDirection.Input; - int _size;
+ int _size; object _value; bool _isNullable; int _offset; string _sourceColumn; - DbParameterCollection _parent = null;
-
- #endregion // Fields
-
+ DbParameterCollection _parent = null; + + #endregion // Fields + #region Constructors [MonoTODO] @@ -68,8 +68,8 @@ namespace System.Data.ProviderBase { } - #endregion // Constructors
-
+ #endregion // Constructors + #region Properties public override ParameterDirection Direction { @@ -149,20 +149,20 @@ namespace System.Data.ProviderBase public byte Precision { - get { return _precision; }
+ get { return _precision; } set { _precision = value; } } public byte Scale { - get { return _scale; }
+ get { return _scale; } set { _scale = value; } } -
- public override DataRowVersion SourceVersion
- {
- get { return _sourceVersion; }
- set { _sourceVersion = value; }
+ + public override DataRowVersion SourceVersion + { + get { return _sourceVersion; } + set { _sourceVersion = value; } } protected internal int JdbcType @@ -216,15 +216,15 @@ namespace System.Data.ProviderBase } } - internal object ConvertedValue
- {
- get {
- if (_convertedValue == null) {
- object value = Value;
- _convertedValue = ((value != null) && (value != DBNull.Value)) ? ConvertValue(value) : value;
- }
- return _convertedValue;
- }
+ internal object ConvertedValue + { + get { + if (_convertedValue == null) { + object value = Value; + _convertedValue = ((value != null) && (value != DBNull.Value)) ? ConvertValue(value) : value; + } + return _convertedValue; + } } public override object Value { @@ -237,35 +237,35 @@ namespace System.Data.ProviderBase //DbParameter overrides - public override bool SourceColumnNullMapping {
- get {
- throw new NotImplementedException();
- }
- set {
- throw new NotImplementedException();
- }
- }
+ public override bool SourceColumnNullMapping { + get { + throw new NotImplementedException(); + } + set { + throw new NotImplementedException(); + } + } #endregion // Properties #region Methods - public override String ToString()
- {
- return ParameterName;
+ public override String ToString() + { + return ParameterName; } - protected internal abstract void SetParameterName(ResultSet res);
-
- protected internal abstract void SetParameterDbType(ResultSet res);
-
+ protected internal abstract void SetParameterName(ResultSet res); + + protected internal abstract void SetParameterDbType(ResultSet res); + protected internal abstract void SetSpecialFeatures(ResultSet res); public virtual object Clone() - {
- AbstractDbParameter other = (AbstractDbParameter) MemberwiseClone ();
- other._parent = null;
+ { + AbstractDbParameter other = (AbstractDbParameter) MemberwiseClone (); + other._parent = null; return other; } @@ -275,10 +275,10 @@ namespace System.Data.ProviderBase internal void SetParameterPrecisionAndScale(ResultSet res) { - int jdbcType = res.getInt("DATA_TYPE");
- if(jdbcType == java.sql.Types.DECIMAL || jdbcType == java.sql.Types.NUMERIC) {
- Precision = (byte)res.getInt("PRECISION");
- Scale = (byte)res.getInt("SCALE");
+ int jdbcType = res.getInt("DATA_TYPE"); + if(jdbcType == java.sql.Types.DECIMAL || jdbcType == java.sql.Types.NUMERIC) { + Precision = (byte)res.getInt("PRECISION"); + Scale = (byte)res.getInt("SCALE"); } } @@ -301,11 +301,11 @@ namespace System.Data.ProviderBase //DbParameter overrides - public override void ResetDbType() {
- throw new NotImplementedException();
+ public override void ResetDbType() { + throw new NotImplementedException(); } - #endregion // Methods
- }
-}
-
+ #endregion // Methods + } +} + diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs index d7a2bee0075..6b6978280a8 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs @@ -96,8 +96,8 @@ namespace System.Data.ProviderBase #region Properties
- public override int Depth { - get { return 0; } + public override int Depth {
+ get { return 0; }
}
public override bool HasRows {
@@ -325,10 +325,10 @@ namespace System.Data.ProviderBase _isClosed = true;
}
- public override IEnumerator GetEnumerator () - { - bool closeReader = (Behavior & CommandBehavior.CloseConnection) != 0; - return new DbEnumerator (this , closeReader); + public override IEnumerator GetEnumerator ()
+ {
+ bool closeReader = (Behavior & CommandBehavior.CloseConnection) != 0;
+ return new DbEnumerator (this , closeReader);
}
public override bool NextResult()
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbException.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbException.cs index a647255406a..848f05cecf8 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbException.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbException.cs @@ -1,32 +1,32 @@ //
// System.Data.ProviderBase.AbstractDbException
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs index c514cf66330..3e4c222d0c5 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs @@ -1,5 +1,5 @@ -//
-// System.Data.Common.AbstractDbParameterCollection
+// +// System.Data.Common.AbstractDbParameterCollection // // Authors: // Konstantin Triger <kostat@mainsoft.com> @@ -27,33 +27,33 @@ // 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.Data.Common;
-using System.Collections;
-
-namespace System.Data.ProviderBase
-{
- public abstract class AbstractDbParameterCollection : DbParameterCollection
- {
- #region Fields
-
- readonly AbstractDbCommand _parent;
- readonly ArrayList _list = new ArrayList();
-
- #endregion // Fields
-
- #region Constructors
-
- public AbstractDbParameterCollection(DbCommand parent)
- {
- _parent = (AbstractDbCommand)parent;
- }
-
- #endregion // Constructors
-
+// + + +using System; +using System.Data.Common; +using System.Collections; + +namespace System.Data.ProviderBase +{ + public abstract class AbstractDbParameterCollection : DbParameterCollection + { + #region Fields + + readonly AbstractDbCommand _parent; + readonly ArrayList _list = new ArrayList(); + + #endregion // Fields + + #region Constructors + + public AbstractDbParameterCollection(DbCommand parent) + { + _parent = (AbstractDbCommand)parent; + } + + #endregion // Constructors + #region Properties public override int Count { @@ -78,10 +78,10 @@ namespace System.Data.ProviderBase get { return _list.SyncRoot; } } - #endregion // Properties
-
- #region Methods
-
+ #endregion // Properties + + #region Methods + public override int Add (object value) { Validate (-1, value); OnSchemaChanging(); @@ -134,13 +134,13 @@ namespace System.Data.ProviderBase return (DbParameter) _list [index]; } -#if NET_2_0
- protected override DbParameter GetParameter (string parameterName) {
- return GetParameter (IndexOf (parameterName));
- }
-
- protected override void SetParameter (string parameterName, DbParameter value) {
- SetParameter (IndexOf (parameterName), value);
+#if NET_2_0 + protected override DbParameter GetParameter (string parameterName) { + return GetParameter (IndexOf (parameterName)); + } + + protected override void SetParameter (string parameterName, DbParameter value) { + SetParameter (IndexOf (parameterName), value); } #endif @@ -245,15 +245,15 @@ namespace System.Data.ProviderBase ((AbstractDbParameter)value).Parent = this; _list [index] = value; - }
-
- protected internal void OnSchemaChanging()
- {
- if (_parent != null) {
- _parent.OnSchemaChanging();
- }
- }
-
- #endregion // Methods
- }
-}
+ } + + protected internal void OnSchemaChanging() + { + if (_parent != null) { + _parent.OnSchemaChanging(); + } + } + + #endregion // Methods + } +} diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs index 92c8346c14c..2c2f25f550a 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs @@ -1,32 +1,32 @@ //
// System.Data.ProviderBase.AbstractTransaction
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.Data.Common;
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs index 4100bd10f5a..7a9d1ff7d5f 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs @@ -1,32 +1,32 @@ //
// System.Data.ProviderBase.ReaderCache.cs
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs index 7727f2dccf2..797a589b753 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs @@ -1,31 +1,31 @@ //
// System.Data.ProviderBase.regex.cs
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.Data;
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/.gitattributes b/mcs/class/System.Data/System.Data.SqlClient.jvm/.gitattributes index bd97536bc8e..7aaaa1b3cf0 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/.gitattributes +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/.gitattributes @@ -1,15 +1,11 @@ -/MetaType.cs -crlf /SqlClientPermission.cs -crlf /SqlClientPermissionAttribute.cs -crlf -/SqlCollation.cs -crlf /SqlCommand.resx -crlf /SqlCommandBuilder.cs -crlf /SqlConnection.resx -crlf /SqlConvert.cs -crlf /SqlDataAdapter.cs -crlf -/SqlError.cs -crlf /SqlException.cs -crlf -/SqlInfoMessageEventArgs.cs -crlf /SqlInfoMessageEventHandler.cs -crlf /SqlRowUpdatedEventArgs.cs -crlf /SqlRowUpdatedEventHandler.cs -crlf diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/MetaType.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/MetaType.cs index 0699f729647..6869cc0b70d 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/MetaType.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/MetaType.cs @@ -1,5 +1,5 @@ -//
-// System.Data.SqlClient.MetaType
+// +// System.Data.SqlClient.MetaType // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCollation.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCollation.cs index b630a2d864a..2ee2ad73d2f 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCollation.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCollation.cs @@ -1,5 +1,5 @@ -//
-// System.Data.SqlClient.SqlCollation
+// +// System.Data.SqlClient.SqlCollation // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs index 43d07267668..50df694e542 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs @@ -4,29 +4,29 @@ // Author:
// Tim Coleman (tim@timcoleman.com)
//
-// Copyright (C) Tim Coleman, 2002 -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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) Tim Coleman, 2002
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs index 653751ebc17..17d9db29caf 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs @@ -1,33 +1,33 @@ //
// System.Data.SqlClient.SqlConvert
//
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
@@ -51,33 +51,33 @@ namespace System.Data.SqlClient {
// FIXME : other java.sql.Type
// Types.ARRAY
- if(Types.BIGINT == jdbcType) return SqlDbType.BigInt; - if(Types.BINARY == jdbcType) return SqlDbType.Binary; - if(Types.BIT == jdbcType) return SqlDbType.Bit; - if(Types.BLOB == jdbcType) return SqlDbType.Binary; - // Types.BOOLEAN - if(Types.CHAR == jdbcType) return SqlDbType.Char; - if(Types.CLOB == jdbcType) return SqlDbType.Binary; - if(Types.DATE == jdbcType) return SqlDbType.DateTime; - if(Types.DECIMAL == jdbcType) return SqlDbType.Decimal; - // Types.DISTINCT - if(Types.DOUBLE == jdbcType) return SqlDbType.Float; - if(Types.FLOAT == jdbcType) return SqlDbType.Float; - if(Types.INTEGER == jdbcType) return SqlDbType.Int; - // Types.JAVA_OBJECT - if(Types.LONGVARBINARY == jdbcType) return SqlDbType.Image; - if(Types.LONGVARCHAR == jdbcType) return SqlDbType.Text; - // Types.NULL - if(Types.NUMERIC == jdbcType) return SqlDbType.Decimal; - if(Types.REAL == jdbcType) return SqlDbType.Real; - // Types.REF - if(Types.SMALLINT == jdbcType) return SqlDbType.SmallInt; - // Types.STRUCT - if(Types.TIME == jdbcType) return SqlDbType.DateTime; - if(Types.TIMESTAMP == jdbcType) return SqlDbType.DateTime; - if(Types.TINYINT == jdbcType) return SqlDbType.TinyInt; - if(Types.VARBINARY == jdbcType) return SqlDbType.VarBinary; - if(Types.VARCHAR == jdbcType) return SqlDbType.NVarChar; + if(Types.BIGINT == jdbcType) return SqlDbType.BigInt;
+ if(Types.BINARY == jdbcType) return SqlDbType.Binary;
+ if(Types.BIT == jdbcType) return SqlDbType.Bit;
+ if(Types.BLOB == jdbcType) return SqlDbType.Binary;
+ // Types.BOOLEAN
+ if(Types.CHAR == jdbcType) return SqlDbType.Char;
+ if(Types.CLOB == jdbcType) return SqlDbType.Binary;
+ if(Types.DATE == jdbcType) return SqlDbType.DateTime;
+ if(Types.DECIMAL == jdbcType) return SqlDbType.Decimal;
+ // Types.DISTINCT
+ if(Types.DOUBLE == jdbcType) return SqlDbType.Float;
+ if(Types.FLOAT == jdbcType) return SqlDbType.Float;
+ if(Types.INTEGER == jdbcType) return SqlDbType.Int;
+ // Types.JAVA_OBJECT
+ if(Types.LONGVARBINARY == jdbcType) return SqlDbType.Image;
+ if(Types.LONGVARCHAR == jdbcType) return SqlDbType.Text;
+ // Types.NULL
+ if(Types.NUMERIC == jdbcType) return SqlDbType.Decimal;
+ if(Types.REAL == jdbcType) return SqlDbType.Real;
+ // Types.REF
+ if(Types.SMALLINT == jdbcType) return SqlDbType.SmallInt;
+ // Types.STRUCT
+ if(Types.TIME == jdbcType) return SqlDbType.DateTime;
+ if(Types.TIMESTAMP == jdbcType) return SqlDbType.DateTime;
+ if(Types.TINYINT == jdbcType) return SqlDbType.TinyInt;
+ if(Types.VARBINARY == jdbcType) return SqlDbType.VarBinary;
+ if(Types.VARCHAR == jdbcType) return SqlDbType.NVarChar;
return SqlDbType.Variant;
}
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataAdapter.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataAdapter.cs index 8581dd80680..dbd346913eb 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataAdapter.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataAdapter.cs @@ -7,29 +7,29 @@ // Tim Coleman (tim@timcoleman.com)
//
// (C) Ximian, Inc 2002
-// Copyright (C) 2002 Tim Coleman -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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) 2002 Tim Coleman
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlError.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlError.cs index 2d5b73ab3ad..7099ebca0dd 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlError.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlError.cs @@ -1,5 +1,5 @@ -//
-// System.Data.SqlClient.SqlError
+// +// System.Data.SqlClient.SqlError // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlException.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlException.cs index a621206353d..a197c3fd926 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlException.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlException.cs @@ -1,32 +1,32 @@ //
// System.Data.SqlClient.SqlException
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlClient
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlInfoMessageEventArgs.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlInfoMessageEventArgs.cs index 3ff2cbf22ff..57b58951512 100644 --- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlInfoMessageEventArgs.cs +++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlInfoMessageEventArgs.cs @@ -1,5 +1,5 @@ -//
-// System.Data.SqlClient.SqlInfoMessageEventArgs
+// +// System.Data.SqlClient.SqlInfoMessageEventArgs // // Authors: // Konstantin Triger <kostat@mainsoft.com> @@ -30,13 +30,13 @@ // using System; -using System.Data;
-
-namespace System.Data.SqlClient
-{
- /// <summary>
- /// Summary description for SqlInfoMessageEventArgs.
- /// </summary>
+using System.Data; + +namespace System.Data.SqlClient +{ + /// <summary> + /// Summary description for SqlInfoMessageEventArgs. + /// </summary> public sealed class SqlInfoMessageEventArgs : EventArgs { #region Fields @@ -56,17 +56,17 @@ namespace System.Data.SqlClient #region Properties - public SqlErrorCollection Errors
+ public SqlErrorCollection Errors { get { return errors; } } - public string Message
+ public string Message { get { return errors[0].Message; } } - public string Source
+ public string Source { get { return errors[0].Source; } } @@ -81,5 +81,5 @@ namespace System.Data.SqlClient } #endregion // Methods - }
-}
+ } +} diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/.gitattributes b/mcs/class/System.Data/System.Data.SqlTypes.jvm/.gitattributes index a0027386d7c..a7f4541216d 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/.gitattributes +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/.gitattributes @@ -1,6 +1,3 @@ -/INullable.cs -crlf -/SqlBinary.cs -crlf -/SqlBoolean.cs -crlf /SqlByte.cs -crlf /SqlCompareOptions.cs -crlf /SqlDateTime.cs -crlf @@ -11,8 +8,5 @@ /SqlInt32.cs -crlf /SqlInt64.cs -crlf /SqlMoney.cs -crlf -/SqlNullValueException.cs -crlf /SqlSingle.cs -crlf /SqlString.cs -crlf -/SqlTruncateException.cs -crlf -/SqlTypeException.cs -crlf diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/INullable.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/INullable.cs index bdeec97ad57..d24d1bc5e28 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/INullable.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/INullable.cs @@ -1,4 +1,4 @@ -// System.Data.SqlTypes.INullable
+// System.Data.SqlTypes.INullable // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBinary.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBinary.cs index f71177ba624..0d481701717 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBinary.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBinary.cs @@ -1,4 +1,4 @@ -// System.Data.SqlTypes.SqlBinary
+// System.Data.SqlTypes.SqlBinary // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBoolean.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBoolean.cs index 008a0bc476a..e00a735073e 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBoolean.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlBoolean.cs @@ -1,4 +1,4 @@ -// System.Data.SqlTypes.SqlBoolean
+// System.Data.SqlTypes.SqlBoolean // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlByte.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlByte.cs index 6c98cb72439..739941b8986 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlByte.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlByte.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlByte
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDateTime.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDateTime.cs index 229700c7bde..15cc9abb04a 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDateTime.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDateTime.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlDateTime
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDecimal.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDecimal.cs index 8d8d5259375..aeae5ea3c34 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDecimal.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDecimal.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlDecimal
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDouble.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDouble.cs index 1e65e25202d..9c55156857c 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDouble.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlDouble.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlDouble
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlGuid.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlGuid.cs index 3748d461b43..ff650261686 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlGuid.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlGuid.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlGuid
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
@@ -76,22 +76,22 @@ namespace System.Data.SqlTypes public int CompareTo(Object obj)
{
- if (obj == null) - return 1; - - if (obj is SqlGuid) - { - SqlGuid g = (SqlGuid)obj; - - if (g.IsNull) - return 1; - if (this.IsNull) - return -1; - - return this._value.CompareTo(g._value); - } - - throw new ArgumentException("parameter obj is not SqlGuid : " + obj.GetType().Name); + if (obj == null)
+ return 1;
+
+ if (obj is SqlGuid)
+ {
+ SqlGuid g = (SqlGuid)obj;
+
+ if (g.IsNull)
+ return 1;
+ if (this.IsNull)
+ return -1;
+
+ return this._value.CompareTo(g._value);
+ }
+
+ throw new ArgumentException("parameter obj is not SqlGuid : " + obj.GetType().Name);
}
@@ -110,31 +110,31 @@ namespace System.Data.SqlTypes public override bool Equals(Object obj)
{
- if (obj == null) - return false; - - if (obj is SqlGuid) - { - SqlGuid g = (SqlGuid)obj; - - if (IsNull && g.IsNull) - return true; - - if (IsNull || g.IsNull) - return false; - - return _value == g._value; - } - + if (obj == null)
+ return false;
+
+ if (obj is SqlGuid)
+ {
+ SqlGuid g = (SqlGuid)obj;
+
+ if (IsNull && g.IsNull)
+ return true;
+
+ if (IsNull || g.IsNull)
+ return false;
+
+ return _value == g._value;
+ }
+
return false;
}
public override String ToString()
{
- if (IsNull) - return "null"; - - + if (IsNull)
+ return "null";
+
+
return _value.ToString();
}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt16.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt16.cs index 36620ce261c..16d2c55cde3 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt16.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt16.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlInt16
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt32.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt32.cs index 494bd9b263d..3da373ff6a5 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt32.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt32.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlInt32
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt64.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt64.cs index a373159b450..ccbc5f0d7bf 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt64.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlInt64.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlInt64
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlMoney.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlMoney.cs index 36d16adb8bf..c8f91c7368c 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlMoney.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlMoney.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlMoney
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlNullValueException.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlNullValueException.cs index 760349f7f94..75f93825089 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlNullValueException.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlNullValueException.cs @@ -1,4 +1,4 @@ -// System.Data.SqlTypes.SqlNullValueException
+// System.Data.SqlTypes.SqlNullValueException // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlSingle.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlSingle.cs index b7251777962..03b4acde5c7 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlSingle.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlSingle.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlSingle
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlString.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlString.cs index 01d40975941..74704505498 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlString.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlString.cs @@ -1,31 +1,31 @@ // System.Data.SqlTypes.SqlString
-// -// Authors: -// Konstantin Triger <kostat@mainsoft.com> -// Boris Kirzner <borisk@mainsoft.com> -// -// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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. +//
+// Authors:
+// Konstantin Triger <kostat@mainsoft.com>
+// Boris Kirzner <borisk@mainsoft.com>
+//
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.
//
namespace System.Data.SqlTypes
diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTruncateException.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTruncateException.cs index 030c6adb983..ef8f458d193 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTruncateException.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTruncateException.cs @@ -1,4 +1,4 @@ -// System.Data.SqlTypes.SqlTruncateException
+// System.Data.SqlTypes.SqlTruncateException // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTypeException.cs b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTypeException.cs index a4f859c446d..97c745c079a 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTypeException.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes.jvm/SqlTypeException.cs @@ -1,5 +1,5 @@ -//
-// System.Data.SqlTypes.SqlTypeException
+// +// System.Data.SqlTypes.SqlTypeException // // Authors: // Konstantin Triger <kostat@mainsoft.com> diff --git a/mcs/class/System.Data/Test/.gitattributes b/mcs/class/System.Data/Test/.gitattributes index 243123e7ec2..9972adc6115 100644 --- a/mcs/class/System.Data/Test/.gitattributes +++ b/mcs/class/System.Data/Test/.gitattributes @@ -1,7 +1,5 @@ /MySqlTestBed.dll.config -crlf /OdbcTest.cs -crlf -/PostgresTest.cs -crlf -/SqlTest.cs -crlf /TestExecuteScalar.cs -crlf /TestSqlConnection.cs -crlf /TestSqlDataReader.cs -crlf diff --git a/mcs/class/System.Data/Test/PostgresTest.cs b/mcs/class/System.Data/Test/PostgresTest.cs index e60e523d363..c06a3b5151a 100644 --- a/mcs/class/System.Data/Test/PostgresTest.cs +++ b/mcs/class/System.Data/Test/PostgresTest.cs @@ -305,51 +305,51 @@ namespace Test.Mono.Data.PostgreSqlClient { // used internally by ReadData() to read each result set static void ReadResult(IDataReader rdr, DataTable dt) { -
- // number of columns in the table
- Console.WriteLine(" Total Columns: " +
- dt.Rows.Count);
-
- // display the schema
- foreach (DataRow schemaRow in dt.Rows) {
- foreach (DataColumn schemaCol in dt.Columns)
- Console.WriteLine(schemaCol.ColumnName +
- " = " +
- schemaRow[schemaCol]);
- Console.WriteLine();
- }
-
- int nRows = 0;
- int c = 0;
- string output, metadataValue, dataValue;
- // Read and display the rows
- Console.WriteLine("Gonna do a Read() now...");
- while(rdr.Read()) {
- Console.WriteLine(" Row " + nRows + ": ");
-
- for(c = 0; c < rdr.FieldCount; c++) {
- // column meta data
- DataRow dr = dt.Rows[c];
- metadataValue =
- " Col " +
- c + ": " +
- dr["ColumnName"];
-
- // column data
- if(rdr.IsDBNull(c) == true)
- dataValue = " is NULL";
- else
- dataValue =
- ": " +
- rdr.GetValue(c);
-
- // display column meta data and data
- output = metadataValue + dataValue;
- Console.WriteLine(output);
- }
- nRows++;
- }
- Console.WriteLine(" Total Rows Retrieved: " +
+ + // number of columns in the table + Console.WriteLine(" Total Columns: " + + dt.Rows.Count); + + // display the schema + foreach (DataRow schemaRow in dt.Rows) { + foreach (DataColumn schemaCol in dt.Columns) + Console.WriteLine(schemaCol.ColumnName + + " = " + + schemaRow[schemaCol]); + Console.WriteLine(); + } + + int nRows = 0; + int c = 0; + string output, metadataValue, dataValue; + // Read and display the rows + Console.WriteLine("Gonna do a Read() now..."); + while(rdr.Read()) { + Console.WriteLine(" Row " + nRows + ": "); + + for(c = 0; c < rdr.FieldCount; c++) { + // column meta data + DataRow dr = dt.Rows[c]; + metadataValue = + " Col " + + c + ": " + + dr["ColumnName"]; + + // column data + if(rdr.IsDBNull(c) == true) + dataValue = " is NULL"; + else + dataValue = + ": " + + rdr.GetValue(c); + + // display column meta data and data + output = metadataValue + dataValue; + Console.WriteLine(output); + } + nRows++; + } + Console.WriteLine(" Total Rows Retrieved: " + nRows); } @@ -362,36 +362,36 @@ namespace Test.Mono.Data.PostgreSqlClient { Console.WriteLine("IDataReader has a Null Reference."); } else { - do {
- DataTable dt = rdr.GetSchemaTable();
- if(rdr.RecordsAffected != -1) {
- // Results for
- // SQL INSERT, UPDATE, DELETE Commands
- // have RecordsAffected >= 0
- Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected);
- }
- else if(dt == null)
- // Results for
- // SQL Commands not INSERT, UPDATE, nor DELETE
- // have RecordsAffected == -1
- // and GetSchemaTable() returns a null reference
- Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected);
- else {
- // Results for
- // SQL SELECT Queries
- // have RecordsAffected = -1
- // and GetSchemaTable() returns a reference to a DataTable
- Console.WriteLine("Result is from a SELECT SQL Query. Records Affected: " + rdr.RecordsAffected);
-
- results++;
- Console.WriteLine("Result Set " + results + "...");
-
- ReadResult(rdr, dt);
- }
-
- } while(rdr.NextResult());
- Console.WriteLine("Total Result sets: " + results);
-
+ do { + DataTable dt = rdr.GetSchemaTable(); + if(rdr.RecordsAffected != -1) { + // Results for + // SQL INSERT, UPDATE, DELETE Commands + // have RecordsAffected >= 0 + Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected); + } + else if(dt == null) + // Results for + // SQL Commands not INSERT, UPDATE, nor DELETE + // have RecordsAffected == -1 + // and GetSchemaTable() returns a null reference + Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected); + else { + // Results for + // SQL SELECT Queries + // have RecordsAffected = -1 + // and GetSchemaTable() returns a reference to a DataTable + Console.WriteLine("Result is from a SELECT SQL Query. Records Affected: " + rdr.RecordsAffected); + + results++; + Console.WriteLine("Result Set " + results + "..."); + + ReadResult(rdr, dt); + } + + } while(rdr.NextResult()); + Console.WriteLine("Total Result sets: " + results); + rdr.Close(); } } @@ -463,15 +463,15 @@ namespace Test.Mono.Data.PostgreSqlClient { Console.WriteLine("\t\tCall ExecuteReader with a SQL Command. (Is INSERT,UPDATE,DELETE)."); reader = SelectDataUsingInsertCommand(cnc); ReadData(reader); -
- // Call a Stored Procedure named Version()
- Console.WriteLine("\t\tCalling stored procedure version()");
- object obj = CallStoredProcedure(cnc);
- Console.WriteLine("Result: " + obj);
-
- Console.WriteLine("Database Server Version: " +
- ((PgSqlConnection)cnc).ServerVersion);
-
+ + // Call a Stored Procedure named Version() + Console.WriteLine("\t\tCalling stored procedure version()"); + object obj = CallStoredProcedure(cnc); + Console.WriteLine("Result: " + obj); + + Console.WriteLine("Database Server Version: " + + ((PgSqlConnection)cnc).ServerVersion); + /* Clean up */ Console.WriteLine ("Clean up..."); Console.WriteLine ("\t\tDrop table..."); @@ -483,38 +483,38 @@ namespace Test.Mono.Data.PostgreSqlClient { } } - [STAThread]
- static void Main(string[] args) {
- Console.WriteLine("Tests Start.");
- Console.WriteLine("Creating PgSqlConnectioin...");
- PgSqlConnection cnc = new PgSqlConnection ();
-
- // possible PostgreSQL Provider ConnectionStrings
+ [STAThread] + static void Main(string[] args) { + Console.WriteLine("Tests Start."); + Console.WriteLine("Creating PgSqlConnectioin..."); + PgSqlConnection cnc = new PgSqlConnection (); + + // possible PostgreSQL Provider ConnectionStrings //string connectionString = // "Server=hostname;" + // "Database=database;" + // "User ID=userid;" + - // "Password=password";
- // or
+ // "Password=password"; + // or //string connectionString = // "host=hostname;" + // "dbname=database;" + // "user=userid;" + // "password=password"; -
+ string connectionString = "host=localhost;" + "dbname=test;" + "user=postgres"; -
- Console.WriteLine("Setting ConnectionString: " +
- connectionString);
- cnc.ConnectionString = connectionString;
-
- Console.WriteLine("Opening database connection...");
- cnc.Open();
-
- Console.WriteLine("Do Tests....");
+ + Console.WriteLine("Setting ConnectionString: " + + connectionString); + cnc.ConnectionString = connectionString; + + Console.WriteLine("Opening database connection..."); + cnc.Open(); + + Console.WriteLine("Do Tests...."); DoPostgresTest(cnc); Console.WriteLine("Close database connection..."); diff --git a/mcs/class/System.Data/Test/SqlTest.cs b/mcs/class/System.Data/Test/SqlTest.cs index 858e16f184f..7eb10f6e12c 100644 --- a/mcs/class/System.Data/Test/SqlTest.cs +++ b/mcs/class/System.Data/Test/SqlTest.cs @@ -527,55 +527,55 @@ namespace Test.Mono.Data.SqlClient { // used internally by ReadData() to read each result set static void ReadResult(IDataReader rdr, DataTable dt) { -
- // number of columns in the table
- Console.WriteLine(" Total Columns: " +
- dt.Rows.Count);
-
- // display the schema
- foreach (DataRow schemaRow in dt.Rows) {
- foreach (DataColumn schemaCol in dt.Columns)
- Console.WriteLine(schemaCol.ColumnName +
- " = " +
- schemaRow[schemaCol]);
- Console.WriteLine();
- }
-
- int nRows = 0;
- int c = 0;
- string output, metadataValue, dataValue;
- // Read and display the rows
- Console.WriteLine("Gonna do a Read() now...");
- while(rdr.Read()) {
- Console.WriteLine(" Row " + nRows + ": ");
-
- for(c = 0; c < rdr.FieldCount; c++) {
- // column meta data
- DataRow dr = dt.Rows[c];
- metadataValue =
- " Col " +
- c + ": " +
- dr["ColumnName"];
-
- // column data
- if (rdr.IsDBNull(c) == true)
- dataValue = " is NULL";
+ + // number of columns in the table + Console.WriteLine(" Total Columns: " + + dt.Rows.Count); + + // display the schema + foreach (DataRow schemaRow in dt.Rows) { + foreach (DataColumn schemaCol in dt.Columns) + Console.WriteLine(schemaCol.ColumnName + + " = " + + schemaRow[schemaCol]); + Console.WriteLine(); + } + + int nRows = 0; + int c = 0; + string output, metadataValue, dataValue; + // Read and display the rows + Console.WriteLine("Gonna do a Read() now..."); + while(rdr.Read()) { + Console.WriteLine(" Row " + nRows + ": "); + + for(c = 0; c < rdr.FieldCount; c++) { + // column meta data + DataRow dr = dt.Rows[c]; + metadataValue = + " Col " + + c + ": " + + dr["ColumnName"]; + + // column data + if (rdr.IsDBNull(c) == true) + dataValue = " is NULL"; else if ((Type) dr["DataType"] == typeof (byte[])) dataValue = ": 0x" + BitConverter.ToString ((byte[]) rdr.GetValue (c)).Replace ("-", "").ToLower (); - else
- dataValue =
- ": " +
- rdr.GetValue(c);
-
- // display column meta data and data
- output = metadataValue + dataValue;
- Console.WriteLine(output);
- }
- nRows++;
- }
- Console.WriteLine(" Total Rows Retrieved: " +
+ else + dataValue = + ": " + + rdr.GetValue(c); + + // display column meta data and data + output = metadataValue + dataValue; + Console.WriteLine(output); + } + nRows++; + } + Console.WriteLine(" Total Rows Retrieved: " + nRows); } @@ -588,36 +588,36 @@ namespace Test.Mono.Data.SqlClient { Console.WriteLine("IDataReader has a Null Reference."); } else { - do {
- DataTable dt = rdr.GetSchemaTable();
- if(rdr.RecordsAffected != -1) {
- // Results for
- // SQL INSERT, UPDATE, DELETE Commands
- // have RecordsAffected >= 0
- Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected);
- }
- else if(dt == null)
- // Results for
- // SQL Commands not INSERT, UPDATE, nor DELETE
- // have RecordsAffected == -1
- // and GetSchemaTable() returns a null reference
- Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected);
- else {
- // Results for
- // SQL SELECT Queries
- // have RecordsAffected = -1
- // and GetSchemaTable() returns a reference to a DataTable
- Console.WriteLine("Result is from a SELECT SQL Query. Records Affected: " + rdr.RecordsAffected);
-
- results++;
- Console.WriteLine("Result Set " + results + "...");
-
- ReadResult(rdr, dt);
- }
-
- } while(rdr.NextResult());
- Console.WriteLine("Total Result sets: " + results);
-
+ do { + DataTable dt = rdr.GetSchemaTable(); + if(rdr.RecordsAffected != -1) { + // Results for + // SQL INSERT, UPDATE, DELETE Commands + // have RecordsAffected >= 0 + Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected); + } + else if(dt == null) + // Results for + // SQL Commands not INSERT, UPDATE, nor DELETE + // have RecordsAffected == -1 + // and GetSchemaTable() returns a null reference + Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE). Records Affected: " + rdr.RecordsAffected); + else { + // Results for + // SQL SELECT Queries + // have RecordsAffected = -1 + // and GetSchemaTable() returns a reference to a DataTable + Console.WriteLine("Result is from a SELECT SQL Query. Records Affected: " + rdr.RecordsAffected); + + results++; + Console.WriteLine("Result Set " + results + "..."); + + ReadResult(rdr, dt); + } + + } while(rdr.NextResult()); + Console.WriteLine("Total Result sets: " + results); + rdr.Close(); } } @@ -694,15 +694,15 @@ namespace Test.Mono.Data.SqlClient { Console.WriteLine("\t\tCall ExecuteReader with a SQL Command. (Is INSERT,UPDATE,DELETE)."); reader = SelectDataUsingInsertCommand(cnc); ReadData(reader); -
- // Call a Stored Procedure named Version()
- Console.WriteLine("\t\tCalling stored procedure sp_server_info()");
- object obj = CallStoredProcedure(cnc);
- Console.WriteLine("Result: " + obj);
-
- Console.WriteLine("Database Server Version: " +
- ((SqlConnection)cnc).ServerVersion);
-
+ + // Call a Stored Procedure named Version() + Console.WriteLine("\t\tCalling stored procedure sp_server_info()"); + object obj = CallStoredProcedure(cnc); + Console.WriteLine("Result: " + obj); + + Console.WriteLine("Database Server Version: " + + ((SqlConnection)cnc).ServerVersion); + /* Clean up */ Console.WriteLine ("Clean up..."); Console.WriteLine ("\t\tDrop table..."); @@ -714,12 +714,12 @@ namespace Test.Mono.Data.SqlClient { } } - [STAThread]
- static void Main(string[] args) {
- string connectionString = "";
-
- if(args.Length == 3 || args.Length == 4) {
- if(args.Length == 3) {
+ [STAThread] + static void Main(string[] args) { + string connectionString = ""; + + if(args.Length == 3 || args.Length == 4) { + if(args.Length == 3) { connectionString = String.Format( "Server={0};" + "Database={1};" + @@ -739,11 +739,11 @@ namespace Test.Mono.Data.SqlClient { Console.WriteLine("Usage: mono SqlTest.exe sql_server database user_id password"); return; } -
- SqlConnection cnc = new SqlConnection ();
- cnc.ConnectionString = connectionString;
-
- cnc.Open();
+ + SqlConnection cnc = new SqlConnection (); + cnc.ConnectionString = connectionString; + + cnc.Open(); DoSqlTest(cnc); cnc.Close(); } diff --git a/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/RowNotInTableException/RowNotInTableException_Generate.cs b/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/RowNotInTableException/RowNotInTableException_Generate.cs index 289c9d87e11..fe38e3ddcbc 100644 --- a/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/RowNotInTableException/RowNotInTableException_Generate.cs +++ b/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/RowNotInTableException/RowNotInTableException_Generate.cs @@ -1,41 +1,41 @@ -// Authors: -// Rafael Mizrahi <rafim@mainsoft.com> -// Erez Lotan <erezl@mainsoft.com> -// Oren Gurfinkel <oreng@mainsoft.com> -// Ofer Borstein -// -// Copyright (c) 2004 Mainsoft Co. -// -// 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. +// Authors:
+// Rafael Mizrahi <rafim@mainsoft.com>
+// Erez Lotan <erezl@mainsoft.com>
+// Oren Gurfinkel <oreng@mainsoft.com>
+// Ofer Borstein
+//
+// Copyright (c) 2004 Mainsoft Co.
+//
+// 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 NUnit.Framework; - - -using System; -using System.Data; - -using GHTUtils; +using NUnit.Framework;
+
+
+using System;
+using System.Data;
+
+using GHTUtils;
using GHTUtils.Base;
-namespace tests.system_data_dll.System_Data +namespace tests.system_data_dll.System_Data
{
[TestFixture] public class RowNotInTableException_Generate : GHTBase
{
diff --git a/mcs/class/System.Data/Test/TestExecuteScalar.cs b/mcs/class/System.Data/Test/TestExecuteScalar.cs index a85835f69f6..c88657ecc10 100644 --- a/mcs/class/System.Data/Test/TestExecuteScalar.cs +++ b/mcs/class/System.Data/Test/TestExecuteScalar.cs @@ -30,29 +30,29 @@ //
// (C) 2002 Daniel Morgan
//
- -// -// 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.Data;
@@ -70,10 +70,10 @@ namespace TestSystemDataSqlClient String connectionString = null;
String sql = null;
- connectionString = - "host=localhost;" + - "dbname=test;" + - "user=postgres"; + connectionString =
+ "host=localhost;" +
+ "dbname=test;" +
+ "user=postgres";
try {
string maxStrValue;
@@ -156,8 +156,8 @@ namespace TestSystemDataSqlClient Console.WriteLine(e.ToString());
}
finally {
- if(con != null) - if(con.State == ConnectionState.Open) + if(con != null)
+ if(con.State == ConnectionState.Open)
con.Close();
}
}
diff --git a/mcs/class/System.Data/Test/TestSqlConnection.cs b/mcs/class/System.Data/Test/TestSqlConnection.cs index 3cc07426018..b1c23d69851 100644 --- a/mcs/class/System.Data/Test/TestSqlConnection.cs +++ b/mcs/class/System.Data/Test/TestSqlConnection.cs @@ -20,29 +20,29 @@ // -lib:C:/cygwin/home/MyHome/mono/install/lib -r System.Data.dll \
// -r Mono.Data.SybaseClient.dll -r Mono.Data.TdsClient.dll
//
- -// -// 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.
+//
//#define IncludeSybaseAndTdsClient
diff --git a/mcs/class/System.Data/Test/TestSqlDataReader.cs b/mcs/class/System.Data/Test/TestSqlDataReader.cs index 2964163797a..5824eab0137 100644 --- a/mcs/class/System.Data/Test/TestSqlDataReader.cs +++ b/mcs/class/System.Data/Test/TestSqlDataReader.cs @@ -11,29 +11,29 @@ //
// (C) 2002 Daniel Morgan
//
- -// -// 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.Data;
@@ -63,11 +63,11 @@ namespace Test.Mono.Data.PostgreSqlClient { Console.WriteLine("ExecuteReader...");
rdr = cmd.ExecuteReader(behavior);
- if(rdr == null) { - - Console.WriteLine("IDataReader has a Null Reference."); - } - else { + if(rdr == null) {
+
+ Console.WriteLine("IDataReader has a Null Reference.");
+ }
+ else {
do {
// get the DataTable that holds
@@ -153,10 +153,10 @@ namespace Test.Mono.Data.PostgreSqlClient { [STAThread]
static void Main(string[] args) {
String connectionString = null;
- connectionString = - "host=localhost;" + - "dbname=test;" + - "user=postgres"; + connectionString =
+ "host=localhost;" +
+ "dbname=test;" +
+ "user=postgres";
PgSqlConnection con;
con = new PgSqlConnection(connectionString);
diff --git a/mcs/class/System.Data/Test/TestSqlParameters.cs b/mcs/class/System.Data/Test/TestSqlParameters.cs index 9c309d650b0..137c2862728 100644 --- a/mcs/class/System.Data/Test/TestSqlParameters.cs +++ b/mcs/class/System.Data/Test/TestSqlParameters.cs @@ -10,29 +10,29 @@ //
// (c)copyright 2002 Daniel Morgan
//
- -// -// 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;
@@ -46,10 +46,10 @@ namespace TestSystemDataPgSqlClient { Console.WriteLine("** Start Test...");
String connectionString = null;
- connectionString = - "host=localhost;" + - "dbname=test;" + - "user=postgres"; + connectionString =
+ "host=localhost;" +
+ "dbname=test;" +
+ "user=postgres";
PgSqlConnection con;
Console.WriteLine("** Creating connection...");
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/.gitattributes b/mcs/class/System.DirectoryServices/System.DirectoryServices/.gitattributes index cf0a270b0d9..4694884ca77 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/.gitattributes +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/.gitattributes @@ -1,3 +1,2 @@ -/DirectorySearcher.cs -crlf /SearchScope.cs -crlf /SortDirection.cs -crlf diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectorySearcher.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectorySearcher.cs index 6ff88a1373c..e9a65f6f749 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectorySearcher.cs +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectorySearcher.cs @@ -634,24 +634,24 @@ namespace System.DirectoryServices cons.ServerTimeLimit = (int)ServerTimeLimit.TotalSeconds; } - int connScope = LdapConnection.SCOPE_SUB;
- switch (_SearchScope)
- {
- case SearchScope.Base:
- connScope = LdapConnection.SCOPE_BASE;
- break;
-
- case SearchScope.OneLevel:
- connScope = LdapConnection.SCOPE_ONE;
- break;
-
- case SearchScope.Subtree:
- connScope = LdapConnection.SCOPE_SUB;
- break;
-
- default:
- connScope = LdapConnection.SCOPE_SUB;
- break;
+ int connScope = LdapConnection.SCOPE_SUB; + switch (_SearchScope) + { + case SearchScope.Base: + connScope = LdapConnection.SCOPE_BASE; + break; + + case SearchScope.OneLevel: + connScope = LdapConnection.SCOPE_ONE; + break; + + case SearchScope.Subtree: + connScope = LdapConnection.SCOPE_SUB; + break; + + default: + connScope = LdapConnection.SCOPE_SUB; + break; } LdapSearchResults lsc=_conn.Search( SearchRoot.Fdn, connScope, @@ -707,11 +707,11 @@ namespace System.DirectoryServices [MonoTODO] protected override void Dispose(bool disposing) { - if (disposing) {
- if(_conn != null && _conn.Connected) {
- _conn.Disconnect();
- }
- }
+ if (disposing) { + if(_conn != null && _conn.Connected) { + _conn.Disconnect(); + } + } base.Dispose(disposing); } diff --git a/mcs/class/System.DirectoryServices/Test/System.DirectoryServices/DirectoryServicesPermissionTest.cs b/mcs/class/System.DirectoryServices/Test/System.DirectoryServices/DirectoryServicesPermissionTest.cs index 7452ba356ec..1f885d0e1e6 100644 --- a/mcs/class/System.DirectoryServices/Test/System.DirectoryServices/DirectoryServicesPermissionTest.cs +++ b/mcs/class/System.DirectoryServices/Test/System.DirectoryServices/DirectoryServicesPermissionTest.cs @@ -210,12 +210,12 @@ namespace MonoTests.System.DirectoryServices { [Test]
public void IsSubset_Null ()
{
- DirectoryServicesPermission dsp = new DirectoryServicesPermission (PermissionState.None); + DirectoryServicesPermission dsp = new DirectoryServicesPermission (PermissionState.None);
#if NET_2_0
- Assert.IsTrue (dsp.IsSubsetOf (null), "null"); + Assert.IsTrue (dsp.IsSubsetOf (null), "null");
#else
- Assert.IsFalse (dsp.IsSubsetOf (null), "null"); -#endif + Assert.IsFalse (dsp.IsSubsetOf (null), "null");
+#endif
}
[Test]
diff --git a/mcs/class/System.Drawing/Samples/System.Drawing/.gitattributes b/mcs/class/System.Drawing/Samples/System.Drawing/.gitattributes deleted file mode 100644 index ee5c00219e2..00000000000 --- a/mcs/class/System.Drawing/Samples/System.Drawing/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -/GraphicsUnits.cs -crlf -/RegionsRectangle.cs -crlf diff --git a/mcs/class/System.Drawing/Samples/System.Drawing/GraphicsUnits.cs b/mcs/class/System.Drawing/Samples/System.Drawing/GraphicsUnits.cs index 3fe5f362e6a..fb8b3f74bbe 100644 --- a/mcs/class/System.Drawing/Samples/System.Drawing/GraphicsUnits.cs +++ b/mcs/class/System.Drawing/Samples/System.Drawing/GraphicsUnits.cs @@ -45,36 +45,36 @@ public class PrintingMargins PointF[] polygon_pnts = {new PointF(150.0F, 150.0F), new PointF(200.0F, 125.0F), new PointF(300.0F, 105.0F), new PointF(350.0F, 150.0F), new PointF(400.0F, 200.0F), - new PointF(450.0F, 300.0F), new PointF(350.0F, 350.0F) };
+ new PointF(450.0F, 300.0F), new PointF(350.0F, 350.0F) }; - // Default Display
+ // Default Display gr.DrawRectangle (Pens.Red, rect); gr.DrawString ("Unit " + gr.PageUnit, new Font ("Arial", 10), Brushes.Red, 50, 50); gr.DrawArc (Pens.Red, 30, 30, 60, 60, 0, 180); - gr.DrawPolygon (Pens.Red, polygon_pnts);
+ gr.DrawPolygon (Pens.Red, polygon_pnts); - // Point
- gr.PageUnit = GraphicsUnit.Point;
+ // Point + gr.PageUnit = GraphicsUnit.Point; gr.DrawRectangle (Pens.Yellow, rect); gr.DrawString ("Unit " + gr.PageUnit, new Font ("Arial", 10), Brushes.Yellow, 50, 50); gr.DrawArc (Pens.Yellow, 30, 30, 60, 60, 0, 180); gr.DrawPolygon (Pens.Yellow, polygon_pnts); - // Document
- gr.PageUnit = GraphicsUnit.Document;
+ // Document + gr.PageUnit = GraphicsUnit.Document; gr.DrawRectangle (Pens.Pink, rect); gr.DrawString ("Unit " + gr.PageUnit, new Font ("Arial", 10), Brushes.Pink, 50, 50); gr.DrawArc (Pens.Pink, 30, 30, 60, 60, 0, 180); gr.DrawPolygon (Pens.Pink, polygon_pnts); - // Inc
- gr.PageUnit = GraphicsUnit.Inch;
+ // Inc + gr.PageUnit = GraphicsUnit.Inch; gr.DrawRectangle (Pens.Blue, 3f, 1f, 1f, 1f); gr.DrawString ("Unit " + gr.PageUnit, new Font ("Arial", 10), Brushes.Blue, 0.7f, 0.7f); gr.DrawArc (Pens.Blue, 3f, 3f, 1f, 1f, 0, 180); -
+ bmp.Save ("units1.bmp"); bmp.Dispose (); gr.Dispose (); @@ -82,21 +82,21 @@ public class PrintingMargins bmp = new Bitmap (600, 600); gr = Graphics.FromImage (bmp); - GraphicsPath graphPath = new GraphicsPath();
+ GraphicsPath graphPath = new GraphicsPath(); graphPath.AddEllipse (0, 80, 100, 200); - // Default Display
+ // Default Display gr.DrawBezier (Pens.Red, new Point (10, 10), new Point (20, 10), new Point (35, 50), new Point (50, 10)); - gr.DrawEllipse (Pens.Red, 10, 50, 30, 50);
+ gr.DrawEllipse (Pens.Red, 10, 50, 30, 50); gr.DrawPath (Pens.Red, graphPath); gr.DrawPie (Pens.Red, 150, 20, 60, 60, 100, 140); - gr.DrawCurve (Pens.Red, polygon_pnts, 2, 4, 0.5f);
+ gr.DrawCurve (Pens.Red, polygon_pnts, 2, 4, 0.5f); // Point - gr.PageUnit = GraphicsUnit.Display;
+ gr.PageUnit = GraphicsUnit.Display; gr.PageUnit = GraphicsUnit.Point; gr.DrawBezier (Pens.Pink, new Point (10, 10), new Point (20, 10), new Point (35, 50), new Point (50, 10)); @@ -106,7 +106,7 @@ public class PrintingMargins gr.DrawPath (Pens.Pink, graphPath); gr.DrawPie (Pens.Pink, 150, 20, 60, 60, 100, 140); - // Document
+ // Document gr.PageUnit = GraphicsUnit.Document; gr.DrawBezier (Pens.Yellow, new Point (10, 10), new Point (20, 10), new Point (35, 50), new Point (50, 10)); @@ -116,8 +116,8 @@ public class PrintingMargins gr.DrawPie (Pens.Yellow, 150, 20, 60, 60, 100, 140); gr.DrawCurve (Pens.Yellow, polygon_pnts, 2, 4, 0.5f); - // Inc
- gr.PageUnit = GraphicsUnit.Inch;
+ // Inc + gr.PageUnit = GraphicsUnit.Inch; gr.DrawBezier (Pens.Blue, new Point (10, 10), new Point (20, 10), new Point (35, 50), new Point (50, 10)); diff --git a/mcs/class/System.Drawing/Samples/System.Drawing/RegionsRectangle.cs b/mcs/class/System.Drawing/Samples/System.Drawing/RegionsRectangle.cs index 1ffa07ce93f..991d50544e8 100644 --- a/mcs/class/System.Drawing/Samples/System.Drawing/RegionsRectangle.cs +++ b/mcs/class/System.Drawing/Samples/System.Drawing/RegionsRectangle.cs @@ -421,8 +421,8 @@ public class Regions x = 0; if (xor) { - rect1 = new Rectangle (20+x, 330+300, 40, 50);
- rect2 = new Rectangle (40+x, 360+300, 20, 20);
+ rect1 = new Rectangle (20+x, 330+300, 40, 50); + rect2 = new Rectangle (40+x, 360+300, 20, 20); dc.DrawRectangle (Pens.Red, rect1); dc.DrawRectangle (Pens.Green, rect2); rgn1 = new Region (rect1); diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/.gitattributes b/mcs/class/System.Drawing/System.Drawing.Drawing2D/.gitattributes index daec6f909f9..a866bb46b06 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/.gitattributes +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/.gitattributes @@ -1,6 +1,2 @@ /ExtendedGeneralPath.jvm.cs -crlf /GeneralPathIterator.jvm.cs -crlf -/GraphicsContainer.jvm.cs -crlf -/GraphicsPathIterator.jvm.cs -crlf -/GraphicsState.jvm.cs -crlf -/PathGradientBrush.jvm.cs -crlf diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ExtendedGeneralPath.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ExtendedGeneralPath.jvm.cs index 3d72b7c5798..0b777b6f459 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ExtendedGeneralPath.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ExtendedGeneralPath.jvm.cs @@ -1,29 +1,29 @@ -// -// System.Drawing.Drawing2D.ExtendedGeneralPath.cs -// -// Author: -// Bors Kirzner <boris@mainsoft.com> -// -// Copyright (C) 2005 Mainsoft Corporation, (http://www.mainsoft.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. +//
+// System.Drawing.Drawing2D.ExtendedGeneralPath.cs
+//
+// Author:
+// Bors Kirzner <boris@mainsoft.com>
+//
+// Copyright (C) 2005 Mainsoft Corporation, (http://www.mainsoft.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;
diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.jvm.cs index 7981c0acd09..881266c2e39 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.jvm.cs @@ -32,12 +32,12 @@ // using System; -namespace System.Drawing.Drawing2D
+namespace System.Drawing.Drawing2D { /// <summary> /// Summary description for GraphicsContainer. /// </summary> - public sealed class GraphicsContainer : MarshalByRefObject
+ public sealed class GraphicsContainer : MarshalByRefObject { readonly GraphicsState _stateObject; diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.jvm.cs index f0ce626b88c..7cdd36c128b 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.jvm.cs @@ -51,7 +51,7 @@ namespace System.Drawing.Drawing2D #region Properites - public int Count
+ public int Count { get { return _path.NativeObject.PointCount; } } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsState.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsState.jvm.cs index 79e445b5f59..1cfb65ad375 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsState.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsState.jvm.cs @@ -32,7 +32,7 @@ using System.Drawing.Text; using geom = java.awt.geom; using awt = java.awt; -namespace System.Drawing.Drawing2D
+namespace System.Drawing.Drawing2D { /// <summary> /// Summary description for GraphicsState. diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.jvm.cs index dc59acff752..dda2bc6c835 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.jvm.cs @@ -74,27 +74,27 @@ namespace System.Drawing.Drawing2D { lgb.SetBlendTriangularShape(0.5f); g.FillPath( lgb, pt ); } - private PointF GetVertical(PointF c, PointF p1, PointF p2) {
- if (p1.X == p2.X)
- return new PointF(p1.X, c.Y);
- if (p1.Y == p2.Y)
- return new PointF(c.X, p2.Y);
-
- float a = (float)(p2.Y - p1.Y) / (p2.X - p1.X);
- float av = - 1 / a;
-
- float b1 = p1.Y - a * p1.X;
- float b2 = c.Y - av * c.X;
-
- float ox = (b1 - b2) / (av - a);
- float oy = av * ox + b2;
-
- return new PointF(ox, oy);
- }
-
- #endregion
-
- #region ctors
+ private PointF GetVertical(PointF c, PointF p1, PointF p2) { + if (p1.X == p2.X) + return new PointF(p1.X, c.Y); + if (p1.Y == p2.Y) + return new PointF(c.X, p2.Y); + + float a = (float)(p2.Y - p1.Y) / (p2.X - p1.X); + float av = - 1 / a; + + float b1 = p1.Y - a * p1.X; + float b2 = c.Y - av * c.X; + + float ox = (b1 - b2) / (av - a); + float oy = av * ox + b2; + + return new PointF(ox, oy); + } + + #endregion + + #region ctors public PathGradientBrush (GraphicsPath path) { Initialize( path, WrapMode.Clamp, true, true ); diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/.gitattributes b/mcs/class/System.Drawing/System.Drawing.Imaging/.gitattributes index 2a2f3eb66b6..56401427ed8 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/.gitattributes +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/.gitattributes @@ -1,3 +1,2 @@ /ImageAttributes.jvm.cs -crlf /ImageCodec.jvm.cs -crlf -/ImageCodecInfo.jvm.cs -crlf diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.jvm.cs index fde74ff8cf0..dafafc83b5e 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.jvm.cs @@ -1,12 +1,12 @@ - -using System; -using System.Drawing; -using System.Drawing.Drawing2D; - -namespace System.Drawing.Imaging -{ - /// <summary> - /// Summary description for ImageAttributes. +
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace System.Drawing.Imaging
+{
+ /// <summary>
+ /// Summary description for ImageAttributes.
/// </summary>
///
[MonoTODO]
@@ -293,6 +293,6 @@ namespace System.Drawing.Imaging public Color col;
public bool bClamp;
public ColorPalette clrPalette;
- public bool bNoOp; - } + public bool bNoOp;
+ }
}
\ No newline at end of file diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecInfo.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecInfo.jvm.cs index e0843ef386c..9cf9da7a810 100644 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecInfo.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecInfo.jvm.cs @@ -70,7 +70,7 @@ namespace System.Drawing.Imaging { int i=0; foreach (ImageCodecInfo codec in oldInfo.Values) { newInfo [i++] = (ImageCodecInfo) codec.MemberwiseClone (); - }
+ } return newInfo; } diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/.gitattributes b/mcs/class/System.Drawing/System.Drawing.Printing/.gitattributes index 2abff61e073..f458bd14b84 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/.gitattributes +++ b/mcs/class/System.Drawing/System.Drawing.Printing/.gitattributes @@ -1,15 +1,10 @@ /Duplex.cs -crlf -/MarginsConverter.cs -crlf /PaperKind.cs -crlf -/PaperSource.cs -crlf /PaperSourceKind.cs -crlf -/PrintAction.cs -crlf -/PrintController.cs -crlf /PrintPageEventHandler.cs -crlf /PrintRange.cs -crlf /PrinterResolution.cs -crlf /PrinterResolutionKind.cs -crlf /PrinterUnit.cs -crlf /PrintingPermissionLevel.cs -crlf -/PrintingServices.cs -crlf /QueryPageSettingsEventArgs.cs -crlf diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/MarginsConverter.cs b/mcs/class/System.Drawing/System.Drawing.Printing/MarginsConverter.cs index c437a1c4b68..32f21b8bea4 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/MarginsConverter.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/MarginsConverter.cs @@ -35,7 +35,7 @@ using System.ComponentModel; using System.Globalization; using System.Text.RegularExpressions; using System.ComponentModel.Design.Serialization; -using System.Reflection;
+using System.Reflection; namespace System.Drawing.Printing { /// <summary> diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs index d379f1ef5d3..1b85c52ad01 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs @@ -4,37 +4,37 @@ // (C) 2002 Ximian, Inc. http://www.ximian.com
// Author: Dennis Hayes (dennish@raytek.com)
//
- -// -// 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; +
+//
+// 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;
namespace System.Drawing.Printing
{
-#if NET_2_0 - [Serializable] +#if NET_2_0
+ [Serializable]
#endif
- public enum PaperKind + public enum PaperKind
{
A2 = 66,
A3 = 8,
@@ -57,8 +57,8 @@ namespace System.Drawing.Printing APlus = 57,
B4 = 12,
B4Envelope = 33,
- B4JisRotated = 79, - B5 = 13, + B4JisRotated = 79,
+ B5 = 13,
B5Envelope = 34,
B5Extra = 65,
B5JisRotated = 80,
@@ -70,7 +70,7 @@ namespace System.Drawing.Printing C3Envelope = 29,
C4Envelope = 30,
C5Envelope = 28,
- C65Envelope = 32, + C65Envelope = 32,
C6Envelope = 31,
CSheet = 24,
Custom = 0,
@@ -82,7 +82,7 @@ namespace System.Drawing.Printing GermanLegalFanfold = 41,
GermanStandardFanfold = 40,
InviteEnvelope = 47,
- IsoB4 = 42, + IsoB4 = 42,
ItalyEnvelope = 36,
JapaneseDoublePostcard = 69,
JapaneseDoublePostcardRotated = 82,
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PaperSource.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PaperSource.cs index ffd339cac35..735c3f1bfb6 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/PaperSource.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/PaperSource.cs @@ -96,7 +96,7 @@ namespace System.Drawing.Printing kind = (PaperSourceKind)value; } } -#endif
+#endif internal bool IsDefault { get { return is_default;} diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintAction.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintAction.cs index efe7aaef663..8047300e831 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintAction.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintAction.cs @@ -37,7 +37,7 @@ namespace System.Drawing.Printing PrintToFile = 0, PrintToPreview = 1, PrintToPrinter = 2 - }
+ } } diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintController.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintController.cs index ec27be93bcc..05448dcce88 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintController.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintController.cs @@ -35,7 +35,7 @@ namespace System.Drawing.Printing { public virtual bool IsPreview { get { return false; } } -#else
+#else public PrintController () { } diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs index 8dc0c229195..4725c2baf4b 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs @@ -96,15 +96,15 @@ namespace System.Drawing.Printing } internal static GlobalPrintingServices GlobalService { - get {
- if (global_printing_services == null) {
- if (is_unix)
- global_printing_services = new GlobalPrintingServicesUnix ();
- else
- global_printing_services = new GlobalPrintingServicesWin32 ();
- }
-
- return global_printing_services;
+ get { + if (global_printing_services == null) { + if (is_unix) + global_printing_services = new GlobalPrintingServicesUnix (); + else + global_printing_services = new GlobalPrintingServicesWin32 (); + } + + return global_printing_services; } } diff --git a/mcs/class/System.Drawing/System.Drawing/.gitattributes b/mcs/class/System.Drawing/System.Drawing/.gitattributes index 3a7f3377f8c..b43c576d4f1 100644 --- a/mcs/class/System.Drawing/System.Drawing/.gitattributes +++ b/mcs/class/System.Drawing/System.Drawing/.gitattributes @@ -1,10 +1,4 @@ /AdvancedStroke.jvm.cs -crlf -/Brush.jvm.cs -crlf -/Graphics.jvm.cs -crlf -/Image.jvm.cs -crlf /PlainImage.jvm.cs -crlf /PlainImageCollection.jvm.cs -crlf -/SolidBrush.jvm.cs -crlf -/StringFormat.jvm.cs -crlf /StrokeFactory.jvm.cs -crlf -/SystemColors.jvm.cs -crlf diff --git a/mcs/class/System.Drawing/System.Drawing/Brush.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Brush.jvm.cs index c7fa4051e08..8ec1ed5368d 100644 --- a/mcs/class/System.Drawing/System.Drawing/Brush.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/Brush.jvm.cs @@ -93,8 +93,8 @@ namespace System.Drawing BrushMultiplyTransform(matrix, MatrixOrder.Prepend); } protected internal void BrushMultiplyTransform (Matrix matrix, MatrixOrder order) { - if (matrix == null)
- throw new ArgumentNullException("matrix");
+ if (matrix == null) + throw new ArgumentNullException("matrix"); _brushTransform.Multiply(matrix, order); } diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs index 3a9b3ae88a6..05becc8075d 100644 --- a/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs @@ -1145,7 +1145,7 @@ namespace System.Drawing { try { TextLineIterator iter = new TextLineIterator(s, font, NativeObject.getFontRenderContext(), format, width, height); NativeObject.transform(iter.Transform); - for (LineLayout layout = iter.NextLine(); layout != null; layout = iter.NextLine()) {
+ for (LineLayout layout = iter.NextLine(); layout != null; layout = iter.NextLine()) { layout.Draw (NativeObject, x * UnitConversion [(int) PageUnit], y * UnitConversion [(int) PageUnit]); } } diff --git a/mcs/class/System.Drawing/System.Drawing/Image.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Image.jvm.cs index 11be7601fc4..e6334dfd0e3 100644 --- a/mcs/class/System.Drawing/System.Drawing/Image.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/Image.jvm.cs @@ -37,23 +37,23 @@ namespace System.Drawing { #region flags enum [Flags] - protected enum ImageFlags {
- ImageFlagsNone = 0,
- ImageFlagsScalable = 0x0001,
- ImageFlagsHasAlpha = 0x0002,
- ImageFlagsHasTranslucent = 0x0004,
- ImageFlagsPartiallyScalable = 0x0008,
- ImageFlagsColorSpaceRGB = 0x0010,
- ImageFlagsColorSpaceCMYK = 0x0020,
- ImageFlagsColorSpaceGRAY = 0x0040,
- ImageFlagsColorSpaceYCBCR = 0x0080,
- ImageFlagsColorSpaceYCCK = 0x0100,
- ImageFlagsHasRealDPI = 0x1000,
- ImageFlagsHasRealPixelSize = 0x2000,
- ImageFlagsReadOnly = 0x00010000,
- ImageFlagsCaching = 0x00020000
- }
- #endregion
+ protected enum ImageFlags { + ImageFlagsNone = 0, + ImageFlagsScalable = 0x0001, + ImageFlagsHasAlpha = 0x0002, + ImageFlagsHasTranslucent = 0x0004, + ImageFlagsPartiallyScalable = 0x0008, + ImageFlagsColorSpaceRGB = 0x0010, + ImageFlagsColorSpaceCMYK = 0x0020, + ImageFlagsColorSpaceGRAY = 0x0040, + ImageFlagsColorSpaceYCBCR = 0x0080, + ImageFlagsColorSpaceYCCK = 0x0100, + ImageFlagsHasRealDPI = 0x1000, + ImageFlagsHasRealPixelSize = 0x2000, + ImageFlagsReadOnly = 0x00010000, + ImageFlagsCaching = 0x00020000 + } + #endregion #region Constructor public void Dispose () { @@ -290,8 +290,8 @@ namespace System.Drawing { default: throw new ArgumentOutOfRangeException(); } - image.AffineTransformOp op = new image.AffineTransformOp(tx, image.AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
- CurrentImage.NativeImage = op.filter((BufferedImage)CurrentImage.NativeImage, null);
+ image.AffineTransformOp op = new image.AffineTransformOp(tx, image.AffineTransformOp.TYPE_NEAREST_NEIGHBOR); + CurrentImage.NativeImage = op.filter((BufferedImage)CurrentImage.NativeImage, null); } #endregion diff --git a/mcs/class/System.Drawing/System.Drawing/SolidBrush.jvm.cs b/mcs/class/System.Drawing/System.Drawing/SolidBrush.jvm.cs index ed9a06f99be..7d0e4df26b0 100644 --- a/mcs/class/System.Drawing/System.Drawing/SolidBrush.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/SolidBrush.jvm.cs @@ -40,11 +40,11 @@ namespace System.Drawing internal bool isModifiable = true; Color _color; - protected override java.awt.Paint NativeObject {
- get {
- return _color.NativeObject;
- }
- }
+ protected override java.awt.Paint NativeObject { + get { + return _color.NativeObject; + } + } public SolidBrush (Color color) { @@ -70,8 +70,8 @@ namespace System.Drawing protected override void Dispose (bool disposing) { - if (!isModifiable && disposing)
- throw new ArgumentException ("This SolidBrush object can't be modified.");
- }
+ if (!isModifiable && disposing) + throw new ArgumentException ("This SolidBrush object can't be modified."); + } } } diff --git a/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs b/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs index e8e829dc037..3d9ec7944ff 100644 --- a/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs @@ -49,8 +49,8 @@ namespace System.Drawing { private StringTrimming _trimming; private float _firstTabOffset; - private float [] _tabStops;
-
+ private float [] _tabStops; + private bool _genericTypeographic = false; #region Constructors @@ -179,7 +179,7 @@ namespace System.Drawing { StringFormatFlags.LineLimit | StringFormatFlags.NoClip, 0 ); - genericTypographic.Trimming = StringTrimming.None;
+ genericTypographic.Trimming = StringTrimming.None; genericTypographic._genericTypeographic = true; return genericTypographic; } @@ -188,53 +188,53 @@ namespace System.Drawing { #endregion #region internal accessors - internal bool NoWrap {
- get {
- return (FormatFlags & StringFormatFlags.NoWrap) != 0;
- }
- }
-
- internal bool IsVertical {
- get {
- return (FormatFlags & StringFormatFlags.DirectionVertical) != 0;
- }
- }
-
- internal bool MeasureTrailingSpaces {
- get {
- return (FormatFlags & StringFormatFlags.MeasureTrailingSpaces) != 0;
- }
- }
-
- internal bool LineLimit {
- get {
- return (FormatFlags & StringFormatFlags.LineLimit) != 0;
- }
- }
-
- internal bool NoClip {
- get {
- return (FormatFlags & StringFormatFlags.NoClip) != 0;
- }
+ internal bool NoWrap { + get { + return (FormatFlags & StringFormatFlags.NoWrap) != 0; + } + } + + internal bool IsVertical { + get { + return (FormatFlags & StringFormatFlags.DirectionVertical) != 0; + } } - internal bool IsRightToLeft {
- get {
- return (FormatFlags & StringFormatFlags.DirectionRightToLeft) != 0;
- }
+ internal bool MeasureTrailingSpaces { + get { + return (FormatFlags & StringFormatFlags.MeasureTrailingSpaces) != 0; + } + } + + internal bool LineLimit { + get { + return (FormatFlags & StringFormatFlags.LineLimit) != 0; + } + } + + internal bool NoClip { + get { + return (FormatFlags & StringFormatFlags.NoClip) != 0; + } + } + + internal bool IsRightToLeft { + get { + return (FormatFlags & StringFormatFlags.DirectionRightToLeft) != 0; + } } internal CharacterRange [] CharRanges { get { return _charRanges; } - }
-
- internal bool IsGenericTypographic
- {
- get {
- return _genericTypeographic;
- }
+ } + + internal bool IsGenericTypographic + { + get { + return _genericTypeographic; + } } #endregion diff --git a/mcs/class/System.Drawing/System.Drawing/SystemColors.jvm.cs b/mcs/class/System.Drawing/System.Drawing/SystemColors.jvm.cs index 24845cb42bf..af1d7b18fb9 100644 --- a/mcs/class/System.Drawing/System.Drawing/SystemColors.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/SystemColors.jvm.cs @@ -33,12 +33,12 @@ namespace System.Drawing { public sealed class SystemColors { - private SystemColors (){}
-
- static Color [] SystemColorsCache {
- get {
- return KnownColors.Values;
- }
+ private SystemColors (){} + + static Color [] SystemColorsCache { + get { + return KnownColors.Values; + } } static public Color ActiveBorder diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs b/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs index 694569a3381..32d79a13b29 100644 --- a/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs +++ b/mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs @@ -1036,16 +1036,16 @@ namespace Test.Sys.Drawing.GraphicsFixtures { }
static string getInFile (string file) {
- string sRslt; - - sRslt = Path.GetFullPath (file); - - if (! File.Exists (file)) - sRslt = Path.Combine ( - Path.Combine ("..", ".."), - file); - - return sRslt; + string sRslt;
+
+ sRslt = Path.GetFullPath (file);
+
+ if (! File.Exists (file))
+ sRslt = Path.Combine (
+ Path.Combine ("..", ".."),
+ file);
+
+ return sRslt;
}
[Test]
diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/.gitattributes b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/.gitattributes index 7e0daa78a6d..966bbf7cf8d 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/.gitattributes +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/.gitattributes @@ -1,4 +1,2 @@ -/TestBmpCodec.cs -crlf /TestColorMatrix.cs -crlf -/TestJpegCodec.cs -crlf /tests-ms.sh -crlf diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs index a792b9fcaed..f792ecced86 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs @@ -547,37 +547,37 @@ namespace MonoTests.System.Drawing.Imaging { } } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_24bppRgb () { Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb, true); } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_32bppRgb () { Save (PixelFormat.Format32bppRgb, PixelFormat.Format32bppRgb, true); } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_32bppArgb () { Save (PixelFormat.Format32bppArgb, PixelFormat.Format32bppRgb, true); } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_32bppPArgb () { Save (PixelFormat.Format32bppPArgb, PixelFormat.Format32bppRgb, true); diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs index 91b80c468c5..228594e7269 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs @@ -249,7 +249,7 @@ namespace MonoTests.System.Drawing.Imaging { Assert.AreEqual (0, cm[4,3], "4,3");
Assert.AreEqual (0, cm[4,4], "4,4");
}
- +
[Test]
public void IndividualProperties ()
{
diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs index 1d737a2b49b..5044a1ad3e3 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs @@ -448,37 +448,37 @@ namespace MonoTests.System.Drawing.Imaging { } } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_24bppRgb () { Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb); } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_32bppRgb () { Save (PixelFormat.Format32bppRgb, PixelFormat.Format24bppRgb); } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_32bppArgb () { Save (PixelFormat.Format32bppArgb, PixelFormat.Format24bppRgb); } - [Test]
+ [Test] #if TARGET_JVM [Category("NotWorking")] -#endif
+#endif public void Save_32bppPArgb () { Save (PixelFormat.Format32bppPArgb, PixelFormat.Format24bppRgb); diff --git a/mcs/class/System.Management/System.Management.Instrumentation/.gitattributes b/mcs/class/System.Management/System.Management.Instrumentation/.gitattributes index 6935b510abd..00fd1d46ca5 100644 --- a/mcs/class/System.Management/System.Management.Instrumentation/.gitattributes +++ b/mcs/class/System.Management/System.Management.Instrumentation/.gitattributes @@ -1,4 +1,2 @@ -/Instance.cs -crlf /InstrumentationClassAttribute.cs -crlf -/InstrumentedAttribute.cs -crlf /ManagedNameAttribute.cs -crlf diff --git a/mcs/class/System.Management/System.Management.Instrumentation/Instance.cs b/mcs/class/System.Management/System.Management.Instrumentation/Instance.cs index cc40a4267fc..2c4d9eeb70c 100644 --- a/mcs/class/System.Management/System.Management.Instrumentation/Instance.cs +++ b/mcs/class/System.Management/System.Management.Instrumentation/Instance.cs @@ -29,16 +29,16 @@ // namespace System.Management.Instrumentation -{
- [InstrumentationClass (InstrumentationType.Instance)]
+{ + [InstrumentationClass (InstrumentationType.Instance)] public abstract class Instance : IInstance { - bool published;
-
- [MonoTODO]
- protected Instance ()
- {
- }
-
+ bool published; + + [MonoTODO] + protected Instance () + { + } + [IgnoreMember] public bool Published { get { return published; } diff --git a/mcs/class/System.Management/System.Management.Instrumentation/InstrumentedAttribute.cs b/mcs/class/System.Management/System.Management.Instrumentation/InstrumentedAttribute.cs index 88c53372c36..4281661f36e 100644 --- a/mcs/class/System.Management/System.Management.Instrumentation/InstrumentedAttribute.cs +++ b/mcs/class/System.Management/System.Management.Instrumentation/InstrumentedAttribute.cs @@ -36,18 +36,18 @@ namespace System.Management.Instrumentation [MonoTODO] public InstrumentedAttribute() { - }
-
- [MonoTODO]
- public InstrumentedAttribute (string namespaceName) : this(namespaceName, null)
- {
- }
-
- [MonoTODO]
- public InstrumentedAttribute (string namespaceName, string securityDescriptor)
- {
- }
-
+ } + + [MonoTODO] + public InstrumentedAttribute (string namespaceName) : this(namespaceName, null) + { + } + + [MonoTODO] + public InstrumentedAttribute (string namespaceName, string securityDescriptor) + { + } + public string NamespaceName { [MonoTODO] get { throw new NotImplementedException(); } diff --git a/mcs/class/System.Messaging/System.Messaging/.gitattributes b/mcs/class/System.Messaging/System.Messaging/.gitattributes index 2364574b377..ef45bf81257 100644 --- a/mcs/class/System.Messaging/System.Messaging/.gitattributes +++ b/mcs/class/System.Messaging/System.Messaging/.gitattributes @@ -19,7 +19,6 @@ /MessageQueueCriteria.cs -crlf /MessageQueueEnumerator.cs -crlf /MessageQueueErrorCode.cs -crlf -/MessageQueueInstaller.cs -crlf /MessageQueuePermission.cs -crlf /MessageQueuePermissionAccess.cs -crlf /MessageQueuePermissionAttribute.cs -crlf diff --git a/mcs/class/System.Messaging/System.Messaging/AccessControlEntry.cs b/mcs/class/System.Messaging/System.Messaging/AccessControlEntry.cs index f6c849c8de4..5b45f1d5e1c 100644 --- a/mcs/class/System.Messaging/System.Messaging/AccessControlEntry.cs +++ b/mcs/class/System.Messaging/System.Messaging/AccessControlEntry.cs @@ -6,27 +6,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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;
namespace System.Messaging
diff --git a/mcs/class/System.Messaging/System.Messaging/DefaultPropertiesToSend.cs b/mcs/class/System.Messaging/System.Messaging/DefaultPropertiesToSend.cs index 05f2f0cad0a..8048e58d9e0 100644 --- a/mcs/class/System.Messaging/System.Messaging/DefaultPropertiesToSend.cs +++ b/mcs/class/System.Messaging/System.Messaging/DefaultPropertiesToSend.cs @@ -6,27 +6,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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.ComponentModel;
diff --git a/mcs/class/System.Messaging/System.Messaging/MessagePropertyFilter.cs b/mcs/class/System.Messaging/System.Messaging/MessagePropertyFilter.cs index eb3bb6232d5..716927a6606 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessagePropertyFilter.cs +++ b/mcs/class/System.Messaging/System.Messaging/MessagePropertyFilter.cs @@ -6,27 +6,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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.ComponentModel;
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueCriteria.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueCriteria.cs index dde103b768f..885edc8eefd 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessageQueueCriteria.cs +++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueCriteria.cs @@ -7,27 +7,27 @@ //
// (C) 2003 Peter Van Isacker, Rafael Teixeira
//
- -// -// 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. -// +
+//
+// 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;
namespace System.Messaging
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueEnumerator.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueEnumerator.cs index e76e7596b54..54923099c36 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessageQueueEnumerator.cs +++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueEnumerator.cs @@ -7,27 +7,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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;
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs index 2f049247e83..04b00dbbf0b 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs +++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs @@ -6,27 +6,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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;
namespace System.Messaging
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs index 5aa186aa5ac..d3b9889a80d 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs +++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs @@ -70,9 +70,9 @@ namespace System.Messaging get {throw new NotImplementedException();} [MonoTODO] set {throw new NotImplementedException();} - }
-
- [DefaultValue (EncryptionRequired.None)]
+ } + + [DefaultValue (EncryptionRequired.None)] public EncryptionRequired EncryptionRequired { [MonoTODO] get {throw new NotImplementedException();} @@ -129,9 +129,9 @@ namespace System.Messaging get {throw new NotImplementedException();} [MonoTODO] set {throw new NotImplementedException();} - }
-
- [DefaultValue (UninstallAction.Remove)]
+ } + + [DefaultValue (UninstallAction.Remove)] public UninstallAction UninstallAction { [MonoTODO] get {throw new NotImplementedException();} diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueuePermissionEntryCollection.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueuePermissionEntryCollection.cs index c3fb8cd32f3..d89042e1455 100644 --- a/mcs/class/System.Messaging/System.Messaging/MessageQueuePermissionEntryCollection.cs +++ b/mcs/class/System.Messaging/System.Messaging/MessageQueuePermissionEntryCollection.cs @@ -6,27 +6,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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;
diff --git a/mcs/class/System.Messaging/System.Messaging/Trustee.cs b/mcs/class/System.Messaging/System.Messaging/Trustee.cs index f0829c7442c..981e526e6db 100644 --- a/mcs/class/System.Messaging/System.Messaging/Trustee.cs +++ b/mcs/class/System.Messaging/System.Messaging/Trustee.cs @@ -7,27 +7,27 @@ //
// (C) 2003 Peter Van Isacker
//
- -// -// 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. -// +
+//
+// 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;
namespace System.Messaging
diff --git a/mcs/class/System.Messaging/Test/System.Messaging/MessageQueuePermissionAttributeTest.cs b/mcs/class/System.Messaging/Test/System.Messaging/MessageQueuePermissionAttributeTest.cs index 5d63d3954e1..9a39df8939d 100644 --- a/mcs/class/System.Messaging/Test/System.Messaging/MessageQueuePermissionAttributeTest.cs +++ b/mcs/class/System.Messaging/Test/System.Messaging/MessageQueuePermissionAttributeTest.cs @@ -171,9 +171,9 @@ namespace MonoTests.System.Messaging { case 12:
case 13:
case 32:
- case 92: + case 92:
#if NET_2_0
- case 133: + case 133:
#endif
case 160:
// known invalid chars
diff --git a/mcs/class/System.Numerics/DLR-0.92-BigIntegerv2.patch b/mcs/class/System.Numerics/DLR-0.92-BigIntegerv2.patch index 8da412a0cd1..2ac5532f671 100644 --- a/mcs/class/System.Numerics/DLR-0.92-BigIntegerv2.patch +++ b/mcs/class/System.Numerics/DLR-0.92-BigIntegerv2.patch @@ -1,6 +1,6 @@ ---- ./Runtime/Microsoft.Dynamic/Math/BigIntegerV2.cs 2009-10-19 13:36:38.000000000 -0400 -+++ /cvs/mcs/class/System.Numerics/System.Numerics/BigInteger.cs 2009-10-31 12:13:55.000000000 -0400 -@@ -12,7 +12,6 @@ +--- ./Runtime/Microsoft.Dynamic/Math/BigIntegerV2.cs 2009-10-19 13:36:38.000000000 -0400
++++ /cvs/mcs/class/System.Numerics/System.Numerics/BigInteger.cs 2009-10-31 12:13:55.000000000 -0400
+@@ -12,7 +12,6 @@
*
*
* ***************************************************************************/
@@ -8,7 +8,7 @@ using System;
using System.Collections.Generic;
-@@ -20,8 +19,6 @@ +@@ -20,8 +19,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Text;
@@ -17,7 +17,7 @@ namespace Microsoft.Scripting.Math {
/// <summary>
-@@ -104,7 +101,8 @@ +@@ -104,7 +101,8 @@
/// (inverse of ToByteArray())
/// </summary>
public static BigInteger Create(byte[] v) {
@@ -27,7 +27,7 @@ if (v.Length == 0) return Create(0);
int byteCount = v.Length;
-@@ -339,10 +337,13 @@ +@@ -339,10 +337,13 @@
[CLSCompliant(false)]
public BigInteger(int sign, params uint[] data) {
@@ -44,7 +44,7 @@ this.data = data;
this.sign = (short)(length == 0 ? 0 : sign);
-@@ -507,7 +508,7 @@ +@@ -507,7 +508,7 @@
}
public bool TryToFloat64(out double result) {
@@ -53,7 +53,7 @@ System.Globalization.NumberStyles.Number,
System.Globalization.CultureInfo.InvariantCulture.NumberFormat,
out result);
-@@ -1355,17 +1356,92 @@ +@@ -1355,17 +1356,92 @@
return this * this;
}
@@ -151,7 +151,7 @@ public override int GetHashCode() {
// The Object.GetHashCode function needs to be consistent with the Object.Equals function.
// Languages that build on top of this may have a more flexible equality function and
-@@ -1395,12 +1471,10 @@ +@@ -1395,12 +1471,10 @@
}
}
@@ -164,7 +164,7 @@ public bool Equals(BigInteger other) {
if (object.ReferenceEquals(other, null)) return false;
return this == other;
-@@ -1492,17 +1566,14 @@ +@@ -1492,17 +1566,14 @@
#region IConvertible Members
@@ -182,7 +182,7 @@ public byte ToByte(IFormatProvider provider) {
uint ret;
if (AsUInt32(out ret) && (ret & ~0xFF) == 0) {
-@@ -1561,7 +1632,6 @@ +@@ -1561,7 +1632,6 @@
return trimmedBytes;
}
@@ -190,7 +190,7 @@ public char ToChar(IFormatProvider provider) {
int ret;
if (AsInt32(out ret) && (ret <= Char.MaxValue) && (ret >= Char.MinValue)) {
-@@ -1570,24 +1640,20 @@ +@@ -1570,24 +1640,20 @@
throw new OverflowException("big integer won't fit into char");
}
@@ -215,7 +215,7 @@ public short ToInt16(IFormatProvider provider) {
int ret;
if (AsInt32(out ret) && (ret <= short.MaxValue) && (ret >= short.MinValue)) {
-@@ -1596,7 +1662,6 @@ +@@ -1596,7 +1662,6 @@
throw new OverflowException("big integer won't fit into short");
}
@@ -223,7 +223,7 @@ public int ToInt32(IFormatProvider provider) {
int ret;
if (AsInt32(out ret)) {
-@@ -1605,7 +1670,6 @@ +@@ -1605,7 +1670,6 @@
throw new OverflowException("big integer won't fit into int");
}
@@ -231,7 +231,7 @@ public long ToInt64(IFormatProvider provider) {
long ret;
if (AsInt64(out ret)) {
-@@ -1614,7 +1678,7 @@ +@@ -1614,7 +1678,7 @@
throw new OverflowException("big integer won't fit into long");
}
@@ -240,7 +240,7 @@ public sbyte ToSByte(IFormatProvider provider) {
int ret;
if (AsInt32(out ret) && (ret <= sbyte.MaxValue) && (ret >= sbyte.MinValue)) {
-@@ -1623,17 +1687,14 @@ +@@ -1623,17 +1687,14 @@
throw new OverflowException("big integer won't fit into sbyte");
}
@@ -258,7 +258,7 @@ public object ToType(Type conversionType, IFormatProvider provider) {
if (conversionType == typeof(BigInteger)) {
return this;
-@@ -1641,7 +1702,7 @@ +@@ -1641,7 +1702,7 @@
throw new NotImplementedException();
}
@@ -267,7 +267,7 @@ public ushort ToUInt16(IFormatProvider provider) {
uint ret;
if (AsUInt32(out ret) && ret <= ushort.MaxValue) {
-@@ -1650,7 +1711,7 @@ +@@ -1650,7 +1711,7 @@
throw new OverflowException("big integer won't fit into ushort");
}
@@ -276,7 +276,7 @@ public uint ToUInt32(IFormatProvider provider) {
uint ret;
if (AsUInt32(out ret)) {
-@@ -1659,7 +1720,7 @@ +@@ -1659,7 +1720,7 @@
throw new OverflowException("big integer won't fit into uint");
}
@@ -285,7 +285,7 @@ public ulong ToUInt64(IFormatProvider provider) {
ulong ret;
if (AsUInt64(out ret)) {
-@@ -1724,4 +1785,3 @@ +@@ -1724,4 +1785,3 @@
#endregion
}
}
diff --git a/mcs/class/System.Numerics/System.Numerics/.gitattributes b/mcs/class/System.Numerics/System.Numerics/.gitattributes deleted file mode 100644 index 0dae3abe2e7..00000000000 --- a/mcs/class/System.Numerics/System.Numerics/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/BigInteger.cs -crlf diff --git a/mcs/class/System.Numerics/System.Numerics/BigInteger.cs b/mcs/class/System.Numerics/System.Numerics/BigInteger.cs index bd06f06958c..1e0ea5cb300 100644 --- a/mcs/class/System.Numerics/System.Numerics/BigInteger.cs +++ b/mcs/class/System.Numerics/System.Numerics/BigInteger.cs @@ -43,12 +43,12 @@ * * ***************************************************************************/ -using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
+using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.Text; using System.Threading; /* @@ -60,8 +60,8 @@ Optimization Optimize BitScanBackward Use a carry variable to make shift opts do half the number of array ops. Schoolbook multiply is O(n^2), use Karatsuba /Toom-3 for large numbers -*/
-namespace System.Numerics {
+*/ +namespace System.Numerics { public struct BigInteger : IComparable, IFormattable, IComparable<BigInteger>, IEquatable<BigInteger> { //LSB on [0] @@ -488,22 +488,22 @@ namespace System.Numerics { { //FIXME try { - return double.Parse (value.ToString (),
+ return double.Parse (value.ToString (), System.Globalization.CultureInfo.InvariantCulture.NumberFormat); } catch (OverflowException) { return value.sign == -1 ? double.NegativeInfinity : double.PositiveInfinity; - }
+ } } public static explicit operator float (BigInteger value) { //FIXME try { - return float.Parse (value.ToString (),
- System.Globalization.CultureInfo.InvariantCulture.NumberFormat);
+ return float.Parse (value.ToString (), + System.Globalization.CultureInfo.InvariantCulture.NumberFormat); } catch (OverflowException) { return value.sign == -1 ? float.NegativeInfinity : float.PositiveInfinity; - }
+ } } public static explicit operator decimal (BigInteger value) @@ -1339,7 +1339,7 @@ namespace System.Numerics { static uint[] MakeTwoComplement (uint[] v) { - uint[] res = new uint [v.Length];
+ uint[] res = new uint [v.Length]; ulong carry = 1; for (int i = 0; i < v.Length; ++i) { @@ -1356,8 +1356,8 @@ namespace System.Numerics { for (int i = 1; i < idx; ++i) mask = (mask << 8) | 0xFF; - res [res.Length - 1] = last & mask;
- return res;
+ res [res.Length - 1] = last & mask; + return res; } string ToString (uint radix, IFormatProvider provider) @@ -2009,17 +2009,17 @@ namespace System.Numerics { } static byte[] Resize (byte[] v, int len) - {
- byte[] res = new byte [len];
- Array.Copy (v, res, Math.Min (v.Length, len));
- return res;
+ { + byte[] res = new byte [len]; + Array.Copy (v, res, Math.Min (v.Length, len)); + return res; } static uint[] Resize (uint[] v, int len) { - uint[] res = new uint [len];
- Array.Copy (v, res, Math.Min (v.Length, len));
- return res;
+ uint[] res = new uint [len]; + Array.Copy (v, res, Math.Min (v.Length, len)); + return res; } static uint[] CoreAdd (uint[] a, uint[] b) @@ -2310,4 +2310,4 @@ namespace System.Numerics { } } } -}
+} diff --git a/mcs/class/System.Numerics/Test/System.Numerics/.gitattributes b/mcs/class/System.Numerics/Test/System.Numerics/.gitattributes deleted file mode 100644 index 75ef85c723e..00000000000 --- a/mcs/class/System.Numerics/Test/System.Numerics/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/BigIntegerTest.cs -crlf diff --git a/mcs/class/System.Numerics/Test/System.Numerics/BigIntegerTest.cs b/mcs/class/System.Numerics/Test/System.Numerics/BigIntegerTest.cs index 7c2397d03bf..46b8d2fb8fe 100644 --- a/mcs/class/System.Numerics/Test/System.Numerics/BigIntegerTest.cs +++ b/mcs/class/System.Numerics/Test/System.Numerics/BigIntegerTest.cs @@ -24,13 +24,13 @@ namespace MonoTests.System.Numerics static byte[] huge_add = new byte[] {0xB3, 0x38, 0xD5, 0xFD, 0x45, 0x1A, 0x46, 0xD8, 0xB6, 0xC, 0x2C, 0x9E, 0x9C, 0x61, 0xC4, 0xE0, 0x26, 0xDB, 0xEF, 0x31, 0xC0, 0x67, 0xC3, 0xDD, 0xF0, 0x68, 0x57, 0xBD, 0xEF, 0x79, 0xFF, 0x78, 0x3, 0x35, 0x7, 0x15, 0x95, 0x22, 0x6A, 0x3A, 0x41, 0xCD, 0xD7, 0xD2, 0x91, 0x14, 0x8, 0xB3, 0x65, 0x16, 0xBF, 0x3D, 0x20, 0x95, 0xE6, 0x4C, 0xE1, 0xE0, 0x4B, 0x49, 0xD5, 0x5A, 0xB7, }; - static byte[] a_m_b = new byte[] { 0x87, 0x2D, 0x21, 0x0, 0x1E, 0xEB, 0xC3, 0xB0, 0xDD, 0xAC, 0xCB, 0x43, 0x7E, 0x10, 0x9E, 0xAE, 0x45, 0xF2, 0x55, 0x71, 0x73, 0xD4, 0x7A, 0xEB, 0x88, 0xD3, 0xD4, 0xEE, 0x36, 0xBE, 0x9B, 0x2D, 0xB6, 0xB3, 0x8B, 0x66, 0x60, 0x8B, 0x16, 0x76, 0x17, 0x74, 0xFE, 0xD7, 0xB2, 0x96, 0x7B, 0xBD, 0xE2, 0xC4, 0x2D, 0xDC, 0xDE, 0x6A, 0x19, 0xB3, 0x1E, 0x1F, 0xB4, 0xB6, 0x2A, 0xA5, 0x48, };
- static byte[] b_m_a = new byte[] { 0x79, 0xD2, 0xDE, 0xFF, 0xE1, 0x14, 0x3C, 0x4F, 0x22, 0x53, 0x34, 0xBC, 0x81, 0xEF, 0x61, 0x51, 0xBA, 0xD, 0xAA, 0x8E, 0x8C, 0x2B, 0x85, 0x14, 0x77, 0x2C, 0x2B, 0x11, 0xC9, 0x41, 0x64, 0xD2, 0x49, 0x4C, 0x74, 0x99, 0x9F, 0x74, 0xE9, 0x89, 0xE8, 0x8B, 0x1, 0x28, 0x4D, 0x69, 0x84, 0x42, 0x1D, 0x3B, 0xD2, 0x23, 0x21, 0x95, 0xE6, 0x4C, 0xE1, 0xE0, 0x4B, 0x49, 0xD5, 0x5A, 0xB7, };
+ static byte[] a_m_b = new byte[] { 0x87, 0x2D, 0x21, 0x0, 0x1E, 0xEB, 0xC3, 0xB0, 0xDD, 0xAC, 0xCB, 0x43, 0x7E, 0x10, 0x9E, 0xAE, 0x45, 0xF2, 0x55, 0x71, 0x73, 0xD4, 0x7A, 0xEB, 0x88, 0xD3, 0xD4, 0xEE, 0x36, 0xBE, 0x9B, 0x2D, 0xB6, 0xB3, 0x8B, 0x66, 0x60, 0x8B, 0x16, 0x76, 0x17, 0x74, 0xFE, 0xD7, 0xB2, 0x96, 0x7B, 0xBD, 0xE2, 0xC4, 0x2D, 0xDC, 0xDE, 0x6A, 0x19, 0xB3, 0x1E, 0x1F, 0xB4, 0xB6, 0x2A, 0xA5, 0x48, }; + static byte[] b_m_a = new byte[] { 0x79, 0xD2, 0xDE, 0xFF, 0xE1, 0x14, 0x3C, 0x4F, 0x22, 0x53, 0x34, 0xBC, 0x81, 0xEF, 0x61, 0x51, 0xBA, 0xD, 0xAA, 0x8E, 0x8C, 0x2B, 0x85, 0x14, 0x77, 0x2C, 0x2B, 0x11, 0xC9, 0x41, 0x64, 0xD2, 0x49, 0x4C, 0x74, 0x99, 0x9F, 0x74, 0xE9, 0x89, 0xE8, 0x8B, 0x1, 0x28, 0x4D, 0x69, 0x84, 0x42, 0x1D, 0x3B, 0xD2, 0x23, 0x21, 0x95, 0xE6, 0x4C, 0xE1, 0xE0, 0x4B, 0x49, 0xD5, 0x5A, 0xB7, }; static byte[] huge_mul = new byte[] { 0xFE, 0x83, 0xE1, 0x9B, 0x8D, 0x61, 0x40, 0xD1, 0x60, 0x19, 0xBD, 0x38, 0xF0, 0xFF, 0x90, 0xAE, 0xDD, 0xAE, 0x73, 0x2C, 0x20, 0x23, 0xCF, 0x6, 0x7A, 0xB4, 0x1C, 0xE7, 0xD9, 0x64, 0x96, 0x2C, 0x87, 0x7E, 0x1D, 0xB3, 0x8F, 0xD4, 0x33, 0xBA, 0xF4, 0x22, 0xB4, 0xDB, 0xC0, 0x5B, 0xA5, 0x64, 0xA0, 0xBC, 0xCA, 0x3E, 0x94, 0x95, 0xDA, 0x49, 0xE2, 0xA8, 0x33, 0xA2, 0x6A, 0x33, 0xB1, 0xF2, 0xEA, 0x99, 0x32, 0xD0, 0xB2, 0xAE, 0x55, 0x75, 0xBD, 0x19, 0xFC, 0x9A, 0xEC, 0x54, 0x87, 0x2A, 0x6, 0xCC, 0x78, 0xDA, 0x88, 0xBB, 0xAB, 0xA5, 0x47, 0xEF, 0xC7, 0x2B, 0xC7, 0x5B, 0x32, 0x31, 0xCD, 0xD9, 0x53, 0x96, 0x1A, 0x9D, 0x9A, 0x57, 0x40, 0x51, 0xB6, 0x5D, 0xC, 0x17, 0xD1, 0x86, 0xE9, 0xA4, 0x20, }; - static byte[] huge_div = new byte[] { 0x0, };
- static byte[] huge_rem = new byte[] { 0x1D, 0x33, 0xFB, 0xFE, 0xB1, 0x2, 0x85, 0x44, 0xCA, 0xDC, 0xFB, 0x70, 0xD, 0x39, 0xB1, 0x47, 0xB6, 0xE6, 0xA2, 0xD1, 0x19, 0x1E, 0x9F, 0xE4, 0x3C, 0x1E, 0x16, 0x56, 0x13, 0x9C, 0x4D, 0xD3, 0x5C, 0x74, 0xC9, 0xBD, 0xFA, 0x56, 0x40, 0x58, 0xAC, 0x20, 0x6B, 0x55, 0xA2, 0xD5, 0x41, 0x38, 0xA4, 0x6D, 0xF6, 0x8C, };
+ static byte[] huge_div = new byte[] { 0x0, }; + static byte[] huge_rem = new byte[] { 0x1D, 0x33, 0xFB, 0xFE, 0xB1, 0x2, 0x85, 0x44, 0xCA, 0xDC, 0xFB, 0x70, 0xD, 0x39, 0xB1, 0x47, 0xB6, 0xE6, 0xA2, 0xD1, 0x19, 0x1E, 0x9F, 0xE4, 0x3C, 0x1E, 0x16, 0x56, 0x13, 0x9C, 0x4D, 0xD3, 0x5C, 0x74, 0xC9, 0xBD, 0xFA, 0x56, 0x40, 0x58, 0xAC, 0x20, 0x6B, 0x55, 0xA2, 0xD5, 0x41, 0x38, 0xA4, 0x6D, 0xF6, 0x8C, }; static byte[][] add_a = new byte[][] { new byte[] {1}, new byte[] {0xFF}, diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/.gitattributes b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/.gitattributes deleted file mode 100644 index 4190dd726a4..00000000000 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/SimpleWireFormat.cs -crlf diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleWireFormat.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleWireFormat.cs index c41b6ecfaf6..0c4d4d69c8b 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleWireFormat.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Simple/SimpleWireFormat.cs @@ -68,7 +68,7 @@ namespace System.Runtime.Remoting.Channels.Simple { Type type = obj.GetType (); - if (type == typeof (String))
+ if (type == typeof (String)) { writer.Write ((byte)TypeId.String); writer.Write ((String)obj); diff --git a/mcs/class/System.Runtime.Remoting/Test/CallSeq.cs b/mcs/class/System.Runtime.Remoting/Test/CallSeq.cs index 605b76087dc..40780730d96 100644 --- a/mcs/class/System.Runtime.Remoting/Test/CallSeq.cs +++ b/mcs/class/System.Runtime.Remoting/Test/CallSeq.cs @@ -98,4 +98,4 @@ namespace MonoTests.Remoting set { calls = value; }
}
}
-} +}
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs index 13d19bd7e1d..a28e34cc0ac 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/InternalSoapValuesTest.cs @@ -71,21 +71,21 @@ namespace SoapShared [Serializable]
class SerializedClass
{
- public string str = "rrr"; - public bool m_bool; - public sbyte m_sbyte; - public byte m_byte; - public long m_long; - public ulong m_ulong; - public int m_int; - public uint m_uint; - public float m_float; - public double m_double; - public decimal m_decimal; - public short m_short; - public ushort m_ushort; - public object m_object = new object(); - public TimeSpan m_timeSpan = TimeSpan.FromTicks(TimeSpan.TicksPerDay); + public string str = "rrr";
+ public bool m_bool;
+ public sbyte m_sbyte;
+ public byte m_byte;
+ public long m_long;
+ public ulong m_ulong;
+ public int m_int;
+ public uint m_uint;
+ public float m_float;
+ public double m_double;
+ public decimal m_decimal;
+ public short m_short;
+ public ushort m_ushort;
+ public object m_object = new object();
+ public TimeSpan m_timeSpan = TimeSpan.FromTicks(TimeSpan.TicksPerDay);
public byte[] m_bytes = new byte[10];
public DateTime m_time = DateTime.Now;
}
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs index d7110591612..107f14e2cb2 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SoapFormatterTest.cs @@ -9,7 +9,7 @@ using System.Runtime.Serialization.Formatters; using System.Runtime.Serialization.Formatters.Soap;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.IO;
-using NUnit.Framework; +using NUnit.Framework;
namespace MonoTests.System.Runtime.Serialization.Formatters.Soap {
@@ -346,10 +346,10 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap { Assertion.AssertEquals("#Version1 Version2", "Version2", objReturn.GetType().Name);
Assertion.AssertEquals("#_value", 123, ((Version2) objReturn)._value);
Assertion.AssertEquals("#_foo", "Default value", ((Version2) objReturn)._foo);
- } - + }
+
[Test]
- public void TestMethodSignatureSerialization () + public void TestMethodSignatureSerialization ()
{
Header h = new Header ("__MethodSignature", new Type [] { typeof(string),typeof(SignatureTest[]) }, false, "http://schemas.microsoft.com/clr/soap/messageProperties");
@@ -368,22 +368,22 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap { SoapMessage t = new SoapMessage ();
sf.TopObject = t;
- t = (SoapMessage) sf.Deserialize (ms); - + t = (SoapMessage) sf.Deserialize (ms);
+
Assertion.AssertNotNull ("#1", t.Headers[0].Value);
- Assertion.AssertEquals ("#2", t.Headers[0].Value.GetType (), typeof(Type[])); - - Type[] ts = (Type[]) t.Headers[0].Value; - - Assertion.AssertEquals ("#3", 2, ts.Length); + Assertion.AssertEquals ("#2", t.Headers[0].Value.GetType (), typeof(Type[]));
+
+ Type[] ts = (Type[]) t.Headers[0].Value;
+
+ Assertion.AssertEquals ("#3", 2, ts.Length);
Assertion.AssertNotNull ("#4", ts[0]);
- Assertion.AssertNotNull ("#5", ts[1]); - Console.WriteLine ("PPP:" + ts[0].GetType()); + Assertion.AssertNotNull ("#5", ts[1]);
+ Console.WriteLine ("PPP:" + ts[0].GetType());
Assertion.AssertEquals ("#6", typeof(string), ts[0]);
Assertion.AssertEquals ("#7", typeof(SignatureTest[]), ts[1]);
}
- } - + }
+
[Serializable]
public class SignatureTest
{
diff --git a/mcs/class/System.Runtime.Serialization/Test/.gitattributes b/mcs/class/System.Runtime.Serialization/Test/.gitattributes deleted file mode 100644 index e90e78bbead..00000000000 --- a/mcs/class/System.Runtime.Serialization/Test/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/XmlComparer.cs -crlf diff --git a/mcs/class/System.Runtime.Serialization/Test/XmlComparer.cs b/mcs/class/System.Runtime.Serialization/Test/XmlComparer.cs index 73d25273459..750ff860786 100644 --- a/mcs/class/System.Runtime.Serialization/Test/XmlComparer.cs +++ b/mcs/class/System.Runtime.Serialization/Test/XmlComparer.cs @@ -1,9 +1,9 @@ using System; -using System.Xml;
+using System.Xml; using NUnit.Framework; namespace MonoTests -{
+{ public class XmlComparer { [Flags] @@ -126,31 +126,31 @@ namespace MonoTests public string Expected { get { return _expected; } - }
-
- public static void AssertAreEqual (string expected, string actual) {
- AssertAreEqual (expected, actual, String.Empty);
- }
-
- public static void AssertAreEqual (string expected, string actual, string msg) {
-
- try {
- XmlDocument or = new XmlDocument ();
- or.LoadXml (expected);
- XmlDocument dr = new XmlDocument ();
- dr.LoadXml (actual);
- XmlComparer comparer = new XmlComparer ();
- if (!comparer.AreEqual (or, dr))
- Assert.AreEqual (comparer.Expected, comparer.Actual, msg);
- }
- catch (AssertionException) {
- throw;
- }
- catch (Exception e) {
- //swallow e when there is XML error and fallback
- //to the text comparison
- Assert.AreEqual (expected, actual, msg);
- }
+ } + + public static void AssertAreEqual (string expected, string actual) { + AssertAreEqual (expected, actual, String.Empty); + } + + public static void AssertAreEqual (string expected, string actual, string msg) { + + try { + XmlDocument or = new XmlDocument (); + or.LoadXml (expected); + XmlDocument dr = new XmlDocument (); + dr.LoadXml (actual); + XmlComparer comparer = new XmlComparer (); + if (!comparer.AreEqual (or, dr)) + Assert.AreEqual (comparer.Expected, comparer.Actual, msg); + } + catch (AssertionException) { + throw; + } + catch (Exception e) { + //swallow e when there is XML error and fallback + //to the text comparison + Assert.AreEqual (expected, actual, msg); + } } } } diff --git a/mcs/class/System.Security/System.Security.Cryptography/.gitattributes b/mcs/class/System.Security/System.Security.Cryptography/.gitattributes index 1ea63cf2646..db436e72e33 100644 --- a/mcs/class/System.Security/System.Security.Cryptography/.gitattributes +++ b/mcs/class/System.Security/System.Security.Cryptography/.gitattributes @@ -1,3 +1,2 @@ -/CryptographicAttributeCollection.cs -crlf /ProtectedData.cs -crlf /ProtectedMemory.cs -crlf diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs index 60d3851a77a..6261ff4b09a 100644 --- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs @@ -38,13 +38,13 @@ namespace System.Security.Cryptography { private ArrayList _list; public CryptographicAttributeObjectCollection () - {
+ { _list = new ArrayList (); } public CryptographicAttributeObjectCollection (CryptographicAttributeObject attribute) : this () - {
+ { _list.Add (attribute); } @@ -71,33 +71,33 @@ namespace System.Security.Cryptography { public int Add (AsnEncodedData asnEncodedData) { if (asnEncodedData == null) - throw new ArgumentNullException ("asnEncodedData");
-
- AsnEncodedDataCollection coll = new AsnEncodedDataCollection (asnEncodedData);
+ throw new ArgumentNullException ("asnEncodedData"); + + AsnEncodedDataCollection coll = new AsnEncodedDataCollection (asnEncodedData); return Add (new CryptographicAttributeObject (asnEncodedData.Oid, coll)); } public int Add (CryptographicAttributeObject attribute) { if (attribute == null) - throw new ArgumentNullException ("attribute");
-
- int existing = -1;
- string oid = attribute.Oid.Value;
- for (int i=0; i < _list.Count; i++) {
- if ((_list[i] as CryptographicAttributeObject).Oid.Value == oid) {
- existing = i;
- break;
- }
- }
- if (existing >= 0) {
- CryptographicAttributeObject cao = this[existing];
- foreach (AsnEncodedData value in attribute.Values) {
- cao.Values.Add (value);
- }
- return existing;
- } else {
- return _list.Add (attribute);
+ throw new ArgumentNullException ("attribute"); + + int existing = -1; + string oid = attribute.Oid.Value; + for (int i=0; i < _list.Count; i++) { + if ((_list[i] as CryptographicAttributeObject).Oid.Value == oid) { + existing = i; + break; + } + } + if (existing >= 0) { + CryptographicAttributeObject cao = this[existing]; + foreach (AsnEncodedData value in attribute.Values) { + cao.Values.Add (value); + } + return existing; + } else { + return _list.Add (attribute); } } @@ -122,10 +122,10 @@ namespace System.Security.Cryptography { } public void Remove (CryptographicAttributeObject attribute) - {
- if (attribute == null)
- throw new ArgumentNullException ("attribute");
-
+ { + if (attribute == null) + throw new ArgumentNullException ("attribute"); + _list.Remove (attribute); } } diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs index 8f76401e748..48a0b103b2f 100644 --- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs +++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs @@ -41,7 +41,7 @@ namespace MonoTests.System.ServiceModel.Web public class WebServiceHostTest
{
[Test]
- [Category("NotWorking")] + [Category("NotWorking")]
public void ServiceDebugBehaviorTest () {
var host = new WebServiceHost (typeof (MyService), new Uri ("http://localhost:8080/"));
@@ -79,7 +79,7 @@ namespace MonoTests.System.ServiceModel.Web }
[Test]
- [Category("NotWorking")] + [Category("NotWorking")]
public void WebHttpBehaviorTest2 () {
var host = new WebServiceHost (typeof (MyService), new Uri ("http://localhost:8080/"));
diff --git a/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/.gitattributes b/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/.gitattributes index cbeea502313..954701b2b53 100644 --- a/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/.gitattributes +++ b/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/.gitattributes @@ -2,4 +2,3 @@ /DualContractTester.cs -crlf /ExitProcessHelper.cs -crlf /OperationContractTester.cs -crlf -/XmlComparer.cs -crlf diff --git a/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/XmlComparer.cs b/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/XmlComparer.cs index d9b4b22c68b..c2a8ca88c22 100644 --- a/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/XmlComparer.cs +++ b/mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/XmlComparer.cs @@ -1,5 +1,5 @@ using System; -using System.Xml;
+using System.Xml; using System.IO; namespace MonoTests.stand_alone.WebHarness @@ -115,17 +115,17 @@ namespace MonoTests.stand_alone.WebHarness return false;//and another has none return AreEqualNodeList (expected.ChildNodes, actual.ChildNodes); } - }
-
- public bool AreEqual (string expected, string actual)
- {
- XmlDocument eDocument = new XmlDocument();
- eDocument.LoadXml(expected);
- XmlNode eNode = eDocument.DocumentElement;
- XmlDocument aDocument = new XmlDocument ();
- aDocument.LoadXml (actual);
- XmlNode aNode = aDocument.DocumentElement;
- return AreEqual (eNode, aNode);
+ } + + public bool AreEqual (string expected, string actual) + { + XmlDocument eDocument = new XmlDocument(); + eDocument.LoadXml(expected); + XmlNode eNode = eDocument.DocumentElement; + XmlDocument aDocument = new XmlDocument (); + aDocument.LoadXml (actual); + XmlNode aNode = aDocument.DocumentElement; + return AreEqual (eNode, aNode); } public string LastCompare diff --git a/mcs/class/System.ServiceModel/resources/.gitattributes b/mcs/class/System.ServiceModel/resources/.gitattributes deleted file mode 100644 index 4c919bac437..00000000000 --- a/mcs/class/System.ServiceModel/resources/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/WS-Addressing.schema -crlf diff --git a/mcs/class/System.ServiceModel/resources/WS-Addressing.schema b/mcs/class/System.ServiceModel/resources/WS-Addressing.schema index 4e2a44ada6d..d1ca4a4006f 100644 --- a/mcs/class/System.ServiceModel/resources/WS-Addressing.schema +++ b/mcs/class/System.ServiceModel/resources/WS-Addressing.schema @@ -10,8 +10,8 @@ <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0" /> <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"> <xs:annotation> - <xs:documentation>
- If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).
+ <xs:documentation> + If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements). </xs:documentation> </xs:annotation> </xs:any> diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Services/.gitattributes b/mcs/class/System.Web.Extensions/System.Web.Script.Services/.gitattributes index 348a53eebcb..f257f82b69a 100644 --- a/mcs/class/System.Web.Extensions/System.Web.Script.Services/.gitattributes +++ b/mcs/class/System.Web.Extensions/System.Web.Script.Services/.gitattributes @@ -1,3 +1,2 @@ /AuthenticationService.cs -crlf /ProxyGenerator.cs -crlf -/ScriptHandlerFactory.cs -crlf diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Services/AuthenticationService.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Services/AuthenticationService.cs index c32c3a6ae97..0f5bf1ac2a6 100644 --- a/mcs/class/System.Web.Extensions/System.Web.Script.Services/AuthenticationService.cs +++ b/mcs/class/System.Web.Extensions/System.Web.Script.Services/AuthenticationService.cs @@ -43,7 +43,7 @@ namespace System.Web.Script.Services readonly ScriptingAuthenticationServiceSection _section;
public AuthenticationService () {
- _section = (ScriptingAuthenticationServiceSection) WebConfigurationManager.GetSection ("system.web.extensions/scripting/webServices/authenticationService"); + _section = (ScriptingAuthenticationServiceSection) WebConfigurationManager.GetSection ("system.web.extensions/scripting/webServices/authenticationService");
}
void EnsureEnabled() {
diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Services/ScriptHandlerFactory.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Services/ScriptHandlerFactory.cs index 77279e7b0e2..9836cca9209 100644 --- a/mcs/class/System.Web.Extensions/System.Web.Script.Services/ScriptHandlerFactory.cs +++ b/mcs/class/System.Web.Extensions/System.Web.Script.Services/ScriptHandlerFactory.cs @@ -49,7 +49,7 @@ namespace System.Web.Script.Services string contentType = request.ContentType; if (!String.IsNullOrEmpty (contentType) && contentType.StartsWith ("application/json", StringComparison.OrdinalIgnoreCase)) { Type handlerType = null; - if (url.EndsWith (ProfileService.DefaultWebServicePath, StringComparison.Ordinal))
+ if (url.EndsWith (ProfileService.DefaultWebServicePath, StringComparison.Ordinal)) handlerType = typeof (ProfileService); else if (url.EndsWith (AuthenticationService.DefaultWebServicePath, StringComparison.Ordinal)) diff --git a/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/.gitattributes b/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/.gitattributes deleted file mode 100644 index 0c4dff870f3..00000000000 --- a/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/ListViewTest.cs -crlf diff --git a/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs b/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs index 7c16e021c2a..1cf0e5f3b82 100644 --- a/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs +++ b/mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs @@ -1283,7 +1283,7 @@ namespace MonoTests.System.Web.UI.WebControls { string originalHtml = @"<span id=""Bug604053ListView1""><table id=""Bug604053ListView1_itemPlaceholderContainer"" border=""0"" style=""""><tr style=""""><th> M1</th><th> - M2</th>
+ M2</th> </tr> <tr style=""""> <td> @@ -1293,7 +1293,7 @@ namespace MonoTests.System.Web.UI.WebControls <span id=""Bug604053ListView1_ctl10_M2Label"">0</span> </td> </tr> -
+ <tr style=""""> <td> @@ -1303,25 +1303,25 @@ namespace MonoTests.System.Web.UI.WebControls <span id=""Bug604053ListView1_ctl12_M2Label"">1</span> </td> </tr> -
-
-
-</table>
+ + + +</table> <table><tr><td> - </td>
+ </td> </tr><tr><td style=""""> <span id=""DataPager1""><input type=""submit"" name=""Bug604053ListView1$DataPager1$ctl00$ctl00"" value=""First"" disabled=""disabled"" /> <span>1</span> <a href=""javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl01','')"">2</a> <a href=""javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl02','')"">3</a> <a href=""javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl03','')"">4</a> <a href=""javascript:__doPostBack('Bug604053ListView1$DataPager1$ctl01$ctl04','')"">5</a> <input type=""submit"" name=""Bug604053ListView1$DataPager1$ctl02$ctl00"" value=""Last"" /> </span> - </td>
- </tr>
-
-</table>
+ </td> + </tr> + +</table> </span> <span id=""Bug604053ListView2""><table id=""Bug604053ListView2_itemPlaceholderContainer"" border=""0"" style=""""><tr style=""""><th> M1</th><th> - M2</th>
+ M2</th> </tr> <tr style=""""> <td> @@ -1331,7 +1331,7 @@ namespace MonoTests.System.Web.UI.WebControls <span id=""Bug604053ListView2_ctl10_M2Label"">0</span> </td> </tr> -
+ <tr style=""""> <td> @@ -1341,20 +1341,20 @@ namespace MonoTests.System.Web.UI.WebControls <span id=""Bug604053ListView2_ctl12_M2Label"">1</span> </td> </tr> -
-
-
-</table>
+ + + +</table> <table><tr><td> - </td>
+ </td> </tr><tr><td style=""""> <span id=""DataPager1""><input type=""submit"" name=""Bug604053ListView2$DataPager1$ctl00$ctl00"" value=""First"" disabled=""disabled"" /> <input type=""submit"" name=""Bug604053ListView2$DataPager1$ctl00$ctl01"" value=""Previous"" disabled=""disabled"" /> <input type=""submit"" name=""Bug604053ListView2$DataPager1$ctl00$ctl02"" value=""Next"" /> <input type=""submit"" name=""Bug604053ListView2$DataPager1$ctl00$ctl03"" value=""Last"" /> </span> - </td>
- </tr>
-
-</table>
+ </td> + </tr> + +</table> </span>"; diff --git a/mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs b/mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs index 4a06eb8c083..81c991d17a7 100644 --- a/mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs +++ b/mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs @@ -58,6 +58,6 @@ using System.Security; [assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames",
Justification = "Assembly is delay-signed.")]
- +
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../winfx.pub")]
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs index 7edcb3be4a0..1d4d64bc2ba 100644 --- a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs +++ b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultDisplayTemplates.cs @@ -185,9 +185,9 @@ namespace System.Web.Mvc.Html { private static bool ShouldShow(ModelMetadata metadata, TemplateInfo templateInfo) {
return
metadata.ShowForDisplay
-#if false +#if false
&& metadata.ModelType != typeof(EntityState)
-#endif +#endif
&& !metadata.IsComplexType
&& !templateInfo.Visited(metadata);
}
diff --git a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs index a478dbc5b03..3a5dc834237 100644 --- a/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs +++ b/mcs/class/System.Web.Mvc2/System.Web.Mvc/Html/DefaultEditorTemplates.cs @@ -191,9 +191,9 @@ namespace System.Web.Mvc.Html { private static bool ShouldShow(ModelMetadata metadata, TemplateInfo templateInfo) {
return
metadata.ShowForEdit
-#if false +#if false
&& metadata.ModelType != typeof(EntityState)
-#endif +#endif
&& !metadata.IsComplexType
&& !templateInfo.Visited(metadata);
}
diff --git a/mcs/class/System.Web.Services/Test/standalone/server/.gitattributes b/mcs/class/System.Web.Services/Test/standalone/server/.gitattributes deleted file mode 100644 index d5f0a4b3396..00000000000 --- a/mcs/class/System.Web.Services/Test/standalone/server/.gitattributes +++ /dev/null @@ -1,6 +0,0 @@ -/Test1.asmx -crlf -/Test2.asmx -crlf -/TestBinding3.asmx -crlf -/TestBinding4.asmx -crlf -/TestBinding5.asmx -crlf -/TestBinding6.asmx -crlf diff --git a/mcs/class/System.Web.Services/Test/standalone/server/Test1.asmx b/mcs/class/System.Web.Services/Test/standalone/server/Test1.asmx index 7219ed23c58..b40286fa178 100644 --- a/mcs/class/System.Web.Services/Test/standalone/server/Test1.asmx +++ b/mcs/class/System.Web.Services/Test/standalone/server/Test1.asmx @@ -1,4 +1,4 @@ -<%@ WebService Language="c#" Codebehind="InteropTestDocLitParameters.wsdl.cs" Class="InteropTestDocLitParameters.wsdl.WSDLInteropTestDocLitParameters" %>
+<%@ WebService Language="c#" Codebehind="InteropTestDocLitParameters.wsdl.cs" Class="InteropTestDocLitParameters.wsdl.WSDLInteropTestDocLitParameters" %> using System.Xml.Serialization; using System; using System.Web.Services.Protocols; @@ -17,7 +17,7 @@ public class WSDLInteropTestDocLitParameters : System.Web.Services.WebService { [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://soapinterop.org/", RequestNamespace="http://soapinterop.org/xsd", ResponseNamespace="http://soapinterop.org/xsd", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] [return: System.Xml.Serialization.XmlElementAttribute("return", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] public SOAPStruct echoStruct([System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] SOAPStruct param0, SOAPStruct X_WS_ReturnValue_X) - {
+ { return null; } diff --git a/mcs/class/System.Web.Services/Test/standalone/server/Test2.asmx b/mcs/class/System.Web.Services/Test/standalone/server/Test2.asmx index 171f0ef2101..600180a4b27 100644 --- a/mcs/class/System.Web.Services/Test/standalone/server/Test2.asmx +++ b/mcs/class/System.Web.Services/Test/standalone/server/Test2.asmx @@ -1,4 +1,4 @@ -<%@ WebService Language="c#" Codebehind="BusinessList.wsdl.cs" Class="BusinessList.wsdl.BusinessList" %>
+<%@ WebService Language="c#" Codebehind="BusinessList.wsdl.cs" Class="BusinessList.wsdl.BusinessList" %> using System.Xml.Serialization; using System; using System.Web.Services.Protocols; diff --git a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding3.asmx b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding3.asmx index 1f18d8cf4dd..d037cc08c94 100644 --- a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding3.asmx +++ b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding3.asmx @@ -1,5 +1,5 @@ -<%@ WebService Language="c#" Codebehind="main.wsdl.cs" Class="main.wsdl.Main" %>
-
+<%@ WebService Language="c#" Codebehind="main.wsdl.cs" Class="main.wsdl.Main" %> + using System.Xml.Serialization; using System; using System.Web.Services.Protocols; diff --git a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding4.asmx b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding4.asmx index d2be3433f5a..f9a4d4ab0ff 100644 --- a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding4.asmx +++ b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding4.asmx @@ -1,5 +1,5 @@ -<%@ WebService Language="c#" Codebehind="GetData.wsdl.cs" Class="GetData.wsdl.GetData" %>
-
+<%@ WebService Language="c#" Codebehind="GetData.wsdl.cs" Class="GetData.wsdl.GetData" %> + using System.Xml.Serialization; using System; using System.Xml; diff --git a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding5.asmx b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding5.asmx index 55600026072..b04f7bfdda1 100644 --- a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding5.asmx +++ b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding5.asmx @@ -1,5 +1,5 @@ -<%@ WebService Language="c#" Codebehind="GetData.wsdl.cs" Class="GetData.wsdl.GetData" %>
-
+<%@ WebService Language="c#" Codebehind="GetData.wsdl.cs" Class="GetData.wsdl.GetData" %> + using System.Xml.Serialization; using System; using System.Web.Services.Protocols; diff --git a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding6.asmx b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding6.asmx index d431fb52a0b..d56fefd090e 100644 --- a/mcs/class/System.Web.Services/Test/standalone/server/TestBinding6.asmx +++ b/mcs/class/System.Web.Services/Test/standalone/server/TestBinding6.asmx @@ -1,4 +1,4 @@ -<%@ WebService Language="c#" Codebehind="InteropTestExtensibilityRequired.wsdl.cs" Class="InteropTestExtensibilityRequired.wsdl.InteropTestExtensibilityRequired" %>
+<%@ WebService Language="c#" Codebehind="InteropTestExtensibilityRequired.wsdl.cs" Class="InteropTestExtensibilityRequired.wsdl.InteropTestExtensibilityRequired" %> using System.Xml.Serialization; using System; using System.Web.Services.Protocols; diff --git a/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/.gitattributes b/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/.gitattributes deleted file mode 100644 index b06d6ef1263..00000000000 --- a/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/XmlSerializer.xml -crlf diff --git a/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/XmlSerializer.xml b/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/XmlSerializer.xml index 388f38892e6..5998d5c9be4 100755 --- a/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/XmlSerializer.xml +++ b/mcs/class/System.XML/Documentation/en/System.Xml.Serialization/XmlSerializer.xml @@ -49,7 +49,7 @@ public class MyObject { { MyObject o = new MyObject (5, 8); using (FileStream fs = new FileStream("test.xml", FileMode.Create)) { - XmlSerializer serializer = new XmlSerializer(typeof(MyObject));
+ XmlSerializer serializer = new XmlSerializer(typeof(MyObject)); serializer.Serialize(fs, o); } } @@ -79,7 +79,7 @@ public class MyObject { public static void Main(string[] args) { MyObject o; using (FileStream fs = File.OpenRead("test.xml")) { - XmlSerializer serializer = new XmlSerializer(typeof(MyObject));
+ XmlSerializer serializer = new XmlSerializer(typeof(MyObject)); o = (MyObject) serializer.Deserialize(fs); } Console.WriteLine("Deserialized object: " + o.X + "," + o.Y); diff --git a/mcs/class/System.XML/Mono.Xml.Schema/.gitattributes b/mcs/class/System.XML/Mono.Xml.Schema/.gitattributes index c93acb9f18f..f38229f31d1 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/.gitattributes +++ b/mcs/class/System.XML/Mono.Xml.Schema/.gitattributes @@ -1,2 +1 @@ -/XsdParticleValidationState.cs -crlf /XsdWildcard.cs -crlf diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdParticleValidationState.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdParticleValidationState.cs index 1d541406c3a..139273de842 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/XsdParticleValidationState.cs +++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdParticleValidationState.cs @@ -410,20 +410,20 @@ namespace Mono.Xml.Schema return seq.ValidatedMinOccurs <= Occured && seq.ValidatedMaxOccurs >= Occured; } - internal override bool EvaluateIsEmptiable ()
- {
- if (seq.ValidatedMinOccurs > Occured + 1)
- return false;
- if (seq.ValidatedMinOccurs == 0 && currentAutomata == null)
- return true;
-
- if (emptiable)
- return true;
- if (seq.CompiledItems.Count == 0)
- return true;
-
+ internal override bool EvaluateIsEmptiable () + { + if (seq.ValidatedMinOccurs > Occured + 1) + return false; + if (seq.ValidatedMinOccurs == 0 && currentAutomata == null) + return true; + + if (emptiable) + return true; + if (seq.CompiledItems.Count == 0) + return true; + int idx = current < 0 ? 0 : current; - XsdValidationState xa = currentAutomata;
+ XsdValidationState xa = currentAutomata; if (xa == null) xa = Manager.Create (seq.CompiledItems [idx] as XmlSchemaParticle); while (xa != null) { @@ -437,7 +437,7 @@ namespace Mono.Xml.Schema } emptiable = true; return true; - }
+ } } @@ -509,30 +509,30 @@ namespace Mono.Xml.Schema return false; } - internal override bool EvaluateIsEmptiable ()
- {
+ internal override bool EvaluateIsEmptiable () + { if (emptiableComputed) return emptiable; -
- if (choice.ValidatedMaxOccurs < Occured)
- return false;
- else if (choice.ValidatedMinOccurs > Occured + 1)
- return false;
-
- for (int i = Occured; i < choice.ValidatedMinOccurs; i++) {
- bool next = false;
+ + if (choice.ValidatedMaxOccurs < Occured) + return false; + else if (choice.ValidatedMinOccurs > Occured + 1) + return false; + + for (int i = Occured; i < choice.ValidatedMinOccurs; i++) { + bool next = false; for (int pi = 0; pi < choice.CompiledItems.Count; pi++) { - XmlSchemaParticle p = (XmlSchemaParticle) choice.CompiledItems [pi];
+ XmlSchemaParticle p = (XmlSchemaParticle) choice.CompiledItems [pi]; if (Manager.Create (p).EvaluateIsEmptiable ()) { next = true; break; } - }
- if (!next)
- return false;
- }
- return true;
- }
+ } + if (!next) + return false; + } + return true; + } } internal class XsdAllValidationState : XsdValidationState @@ -591,8 +591,8 @@ namespace Mono.Xml.Schema return true; } - internal override bool EvaluateIsEmptiable ()
- {
+ internal override bool EvaluateIsEmptiable () + { if (all.Emptiable || all.ValidatedMinOccurs == 0) return true; for (int i = 0; i < all.CompiledItems.Count; i++) { @@ -601,7 +601,7 @@ namespace Mono.Xml.Schema return false; } return true; - }
+ } } internal class XsdAnyValidationState : XsdValidationState @@ -656,11 +656,11 @@ namespace Mono.Xml.Schema return EvaluateIsEmptiable (); } - internal override bool EvaluateIsEmptiable ()
- {
+ internal override bool EvaluateIsEmptiable () + { return any.ValidatedMinOccurs <= Occured && any.ValidatedMaxOccurs >= Occured; - }
+ } } internal class XsdAppendedValidationState : XsdValidationState @@ -706,13 +706,13 @@ namespace Mono.Xml.Schema return rest.EvaluateEndElement (); } - internal override bool EvaluateIsEmptiable ()
- {
- if (head.EvaluateIsEmptiable ())
- return rest.EvaluateIsEmptiable ();
- else
- return false;
- }
+ internal override bool EvaluateIsEmptiable () + { + if (head.EvaluateIsEmptiable ()) + return rest.EvaluateIsEmptiable (); + else + return false; + } } internal class XsdEmptyValidationState : XsdValidationState @@ -739,11 +739,11 @@ namespace Mono.Xml.Schema return true; } - internal override bool EvaluateIsEmptiable ()
- {
- return true;
- }
-
+ internal override bool EvaluateIsEmptiable () + { + return true; + } + } internal class XsdInvalidValidationState : XsdValidationState @@ -770,10 +770,10 @@ namespace Mono.Xml.Schema return false; } - internal override bool EvaluateIsEmptiable ()
- {
- return false;
- }
-
+ internal override bool EvaluateIsEmptiable () + { + return false; + } + } } diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdWildcard.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdWildcard.cs index 280049c298e..e74617150bf 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/XsdWildcard.cs +++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdWildcard.cs @@ -1,36 +1,36 @@ -// -// Mono.Xml.Schema.XsdWildcard.cs -// -// Author: -// Atsushi Enomoto (ginga@kit.hi-ho.ne.jp) -// -// (C)2003 Atsushi Enomoto -// -// -// This class represents common part of xs:any and xs:anyAttribute -// -// - -// -// 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. -// +//
+// Mono.Xml.Schema.XsdWildcard.cs
+//
+// Author:
+// Atsushi Enomoto (ginga@kit.hi-ho.ne.jp)
+//
+// (C)2003 Atsushi Enomoto
+//
+//
+// This class represents common part of xs:any and xs:anyAttribute
+//
+//
+
+//
+// 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.Specialized;
using System.Xml;
@@ -75,42 +75,42 @@ namespace Mono.Xml.Schema int nscount = 0;
string actualNamespace = nss == null ? "##any" : nss;
string[] nslist = XmlSchemaUtil.SplitList(actualNamespace);
- for (int i = 0; i < nslist.Length; i++) { - string ns = nslist [i]; + for (int i = 0; i < nslist.Length; i++) {
+ string ns = nslist [i];
switch(ns) {
case "##any":
- if (HasValueAny) - xsobj.error (h, "Multiple specification of ##any was found."); + if (HasValueAny)
+ xsobj.error (h, "Multiple specification of ##any was found.");
nscount |= 1;
- HasValueAny = true; + HasValueAny = true;
break;
case "##other":
- if (HasValueOther) - xsobj.error (h, "Multiple specification of ##other was found."); + if (HasValueOther)
+ xsobj.error (h, "Multiple specification of ##other was found.");
nscount |= 2;
- HasValueOther = true; + HasValueOther = true;
break;
case "##targetNamespace":
- if (HasValueTargetNamespace) - xsobj.error (h, "Multiple specification of ##targetNamespace was found."); + if (HasValueTargetNamespace)
+ xsobj.error (h, "Multiple specification of ##targetNamespace was found.");
nscount |= 4;
HasValueTargetNamespace = true;
break;
case "##local":
- if (HasValueLocal) - xsobj.error (h, "Multiple specification of ##local was found."); + if (HasValueLocal)
+ xsobj.error (h, "Multiple specification of ##local was found.");
nscount |= 8;
- HasValueLocal = true; + HasValueLocal = true;
break;
default:
if(!XmlSchemaUtil.CheckAnyUri(ns))
xsobj.error(h,"the namespace is not a valid anyURI");
- else if (ResolvedNamespaces.Contains (ns)) - xsobj.error (h, "Multiple specification of '" + ns + "' was found."); + else if (ResolvedNamespaces.Contains (ns))
+ xsobj.error (h, "Multiple specification of '" + ns + "' was found.");
else {
nscount |= 16;
- ResolvedNamespaces.Add (ns); - } + ResolvedNamespaces.Add (ns);
+ }
break;
}
}
@@ -186,20 +186,20 @@ namespace Mono.Xml.Schema public bool ValidateWildcardAllowsNamespaceName (string ns,
ValidationEventHandler h, XmlSchema schema, bool raiseError)
{
- if (HasValueAny) - return true; - if (HasValueOther && ns != TargetNamespace) - return true; - if (HasValueTargetNamespace && ns == TargetNamespace) - return true; - if (HasValueLocal && ns == "") - return true; - for (int i = 0; i < ResolvedNamespaces.Count; i++) - if (ns == ResolvedNamespaces [i]) - return true; - if (raiseError) - xsobj.error (h, "This wildcard does not allow the namespace: " + ns); - return false; + if (HasValueAny)
+ return true;
+ if (HasValueOther && ns != TargetNamespace)
+ return true;
+ if (HasValueTargetNamespace && ns == TargetNamespace)
+ return true;
+ if (HasValueLocal && ns == "")
+ return true;
+ for (int i = 0; i < ResolvedNamespaces.Count; i++)
+ if (ns == ResolvedNamespaces [i])
+ return true;
+ if (raiseError)
+ xsobj.error (h, "This wildcard does not allow the namespace: " + ns);
+ return false;
}
// 3.10.6 Wildcard Subset
diff --git a/mcs/class/System.XML/Mono.Xml/.gitattributes b/mcs/class/System.XML/Mono.Xml/.gitattributes index a099fa3e3be..4b31b43ede8 100644 --- a/mcs/class/System.XML/Mono.Xml/.gitattributes +++ b/mcs/class/System.XML/Mono.Xml/.gitattributes @@ -1,3 +1 @@ -/IHasXmlParserContext.cs -crlf -/IHasXmlSchemaInfo.cs -crlf /XmlFilterReader.cs -crlf diff --git a/mcs/class/System.XML/Mono.Xml/IHasXmlParserContext.cs b/mcs/class/System.XML/Mono.Xml/IHasXmlParserContext.cs index 7c4f50739b1..9474cf194c7 100644 --- a/mcs/class/System.XML/Mono.Xml/IHasXmlParserContext.cs +++ b/mcs/class/System.XML/Mono.Xml/IHasXmlParserContext.cs @@ -30,11 +30,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // using System.Xml; -
-namespace Mono.Xml
-{
- internal interface IHasXmlParserContext
- {
- XmlParserContext ParserContext { get; }
- }
-}
+ +namespace Mono.Xml +{ + internal interface IHasXmlParserContext + { + XmlParserContext ParserContext { get; } + } +} diff --git a/mcs/class/System.XML/Mono.Xml/IHasXmlSchemaInfo.cs b/mcs/class/System.XML/Mono.Xml/IHasXmlSchemaInfo.cs index 1c751f0680c..684ce3028de 100644 --- a/mcs/class/System.XML/Mono.Xml/IHasXmlSchemaInfo.cs +++ b/mcs/class/System.XML/Mono.Xml/IHasXmlSchemaInfo.cs @@ -30,11 +30,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // using System.Xml; -
-namespace Mono.Xml
-{
- internal interface IHasXmlSchemaInfo
- {
- object SchemaType { get; }
- }
-}
+ +namespace Mono.Xml +{ + internal interface IHasXmlSchemaInfo + { + object SchemaType { get; } + } +} diff --git a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs index 628f4ce989c..43d46d557e3 100644 --- a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs +++ b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs @@ -5,26 +5,26 @@ // Atsushi Enomoto <atsushi@ximian.com>
//
// Copyright (c) 2004 Novell Inc. All rights reserved
-// -// 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. -// +//
+// 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.
+//
//
// Similar to SAX DefaultHandler
diff --git a/mcs/class/System.XML/Test/System.Xml/.gitattributes b/mcs/class/System.XML/Test/System.Xml/.gitattributes index 2562c59726b..225527ddda2 100644 --- a/mcs/class/System.XML/Test/System.Xml/.gitattributes +++ b/mcs/class/System.XML/Test/System.Xml/.gitattributes @@ -1,7 +1,6 @@ /XmlDocumentEventTests.cs -crlf /XmlNodeReaderTests.cs -crlf /XmlReaderCommonTests.cs -crlf -/XmlResolverTest.cs -crlf /XmlUrlResolverTests.cs -crlf /XmlValidatingReaderTests.cs -crlf /XmlWriterTests.cs -crlf diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/.gitattributes b/mcs/class/System.XML/Test/System.Xml/W3C/.gitattributes index 5f3c308d9d2..e07899bbfa4 100644 --- a/mcs/class/System.XML/Test/System.Xml/W3C/.gitattributes +++ b/mcs/class/System.XML/Test/System.Xml/W3C/.gitattributes @@ -1,4 +1,3 @@ /Makefile -crlf /README.j2ee -crlf /TODO -crlf -/xmlconf.cs -crlf diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs b/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs index 2cc6390cffb..2384a5e0b11 100644 --- a/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs +++ b/mcs/class/System.XML/Test/System.Xml/W3C/xmlconf.cs @@ -6,11 +6,11 @@ using System.Text; namespace MonoTests.W3C_xmlconf { using NUnit.Core; - using NUnit.Framework;
-
+ using NUnit.Framework; + public abstract class BaseTests { - TestSuite _suite;
+ TestSuite _suite; #region test list fields protected readonly ArrayList ignoredTests = new ArrayList (); @@ -93,9 +93,9 @@ namespace MonoTests.W3C_xmlconf { : base (suite) { } - }
-
- public class CleanTests : BaseTests
+ } + + public class CleanTests : BaseTests { [Suite] static public TestSuite Suite{ @@ -119,9 +119,9 @@ namespace MonoTests.W3C_xmlconf { base.ProcessTest (testId, test); } - }
-
- public class KnownFailureTests : BaseTests
+ } + + public class KnownFailureTests : BaseTests { [Suite] static public TestSuite Suite{ @@ -149,8 +149,8 @@ namespace MonoTests.W3C_xmlconf { base.ProcessTest (testId, test); } - }
-
+ } + public class TestFromCatalog : NUnit.Core.TestCase { XmlElement _test; diff --git a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs index 5865dbe07bc..bfd2cb5aa27 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs @@ -103,6 +103,6 @@ namespace MonoTest.System.Xml { u2 = xr.ResolveUri (null, "file:///mystuff"); Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/file"); } -#endif
+#endif } } diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/.gitattributes b/mcs/class/System.XML/Test/System.Xml/nist_dom/.gitattributes index 16791bb654e..f8489200d9f 100644 --- a/mcs/class/System.XML/Test/System.Xml/nist_dom/.gitattributes +++ b/mcs/class/System.XML/Test/System.Xml/nist_dom/.gitattributes @@ -1,3 +1,2 @@ /ITest.cs -crlf /readme.txt -crlf -/util.cs -crlf diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/.gitattributes b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/.gitattributes deleted file mode 100644 index 2a2bc33f0fa..00000000000 --- a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/Attr.cs -crlf diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs index 38a20db8200..c7ce390d9b9 100644 --- a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs +++ b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs @@ -12,26 +12,26 @@ // Mainsoft Corporation (c) 2003-2004 // //************************************************************************** -using System;
-using System.Xml;
+using System; +using System.Xml; using nist_dom; -using NUnit.Framework;
-
-namespace nist_dom.fundamental
+using NUnit.Framework; + +namespace nist_dom.fundamental { - [TestFixture]
- public class AttrTest//, ITest
- {
- public static int i = 1;
-/*
- public testResults[] RunTests()
- {
+ [TestFixture] + public class AttrTest//, ITest + { + public static int i = 1; +/* + public testResults[] RunTests() + { testResults[] tests = new testResults[] {core0001A(), core0002A(), core0003A(),core0004A(), core0005A(), core0006A(), core0007A(), core0008A(), core0009A(), core0010A(), core0011A(), core0012A(), - core0013A(), core0014A()};
-
- return tests;
+ core0013A(), core0014A()}; + + return tests; } */ //------------------------ test case core-0001A ------------------------ @@ -73,7 +73,7 @@ namespace nist_dom.fundamental // Write out results // } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -125,7 +125,7 @@ namespace nist_dom.fundamental domesticAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("domestic"); computedValue = domesticAttr.PreviousSibling; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -177,7 +177,7 @@ namespace nist_dom.fundamental domesticAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("domestic"); computedValue = domesticAttr.NextSibling; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -237,7 +237,7 @@ namespace nist_dom.fundamental domesticAttr = (System.Xml.XmlAttribute)docFragment.FirstChild.Attributes.Item(0) ; computedValue = domesticAttr.Name; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -289,7 +289,7 @@ namespace nist_dom.fundamental domesticAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("domestic"); computedValue = domesticAttr.Value; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -349,7 +349,7 @@ namespace nist_dom.fundamental streetAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("street"); computedValue = streetAttr.Value; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -398,7 +398,7 @@ namespace nist_dom.fundamental streetAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("street"); computedValue = streetAttr.Name; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -450,7 +450,7 @@ namespace nist_dom.fundamental domesticAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("domestic");; computedValue = domesticAttr.Specified.ToString(); } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -504,7 +504,7 @@ namespace nist_dom.fundamental streetAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("street"); computedValue = streetAttr.Specified.ToString(); } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -561,7 +561,7 @@ namespace nist_dom.fundamental streetAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("street"); computedValue = streetAttr.Specified.ToString(); } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -620,7 +620,7 @@ namespace nist_dom.fundamental streetAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("street"); computedValue = streetAttr.Specified.ToString(); } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -674,7 +674,7 @@ namespace nist_dom.fundamental streetAttr = (System.Xml.XmlAttribute)testNode.Attributes.GetNamedItem("street"); computedValue = streetAttr.Value; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -730,7 +730,7 @@ namespace nist_dom.fundamental streetAttr.Value = "Y%ent1;"; computedValue = streetAttr.Value; } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -785,16 +785,16 @@ namespace nist_dom.fundamental // // attempt to set a value on a readonly node should raise an exception. // - try
+ try { readOnlyAttribute.Value = "ABCD"; } - catch (ArgumentException ex)
+ catch (ArgumentException ex) { computedValue = ex.GetType ().FullName; } } - catch(System.Exception ex)
+ catch(System.Exception ex) { computedValue = "Exception " + ex.Message; } @@ -807,6 +807,6 @@ namespace nist_dom.fundamental // return results; } //------------------------ End test case core-0014A -------------------------- - }
-
-}
+ } + +} diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/readme.txt b/mcs/class/System.XML/Test/System.Xml/nist_dom/readme.txt index 1d2d977051d..e6f2ce8c12c 100644 --- a/mcs/class/System.XML/Test/System.Xml/nist_dom/readme.txt +++ b/mcs/class/System.XML/Test/System.Xml/nist_dom/readme.txt @@ -11,7 +11,7 @@ rafim@mainsoft.com About the Test Suite:
==============================
NIST DOM is XML DOM Level 1 Test Suite,
-Mainsoft have converted part of the NIST DOM +Mainsoft have converted part of the NIST DOM
Test Suite
from ECMAScript (Java Script) into
C# .Net System.XML Conformance Test Suite.
diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/util.cs b/mcs/class/System.XML/Test/System.Xml/nist_dom/util.cs index 1a40ae25884..ec03b3b79b8 100644 --- a/mcs/class/System.XML/Test/System.Xml/nist_dom/util.cs +++ b/mcs/class/System.XML/Test/System.Xml/nist_dom/util.cs @@ -382,7 +382,7 @@ namespace nist_dom System.Xml.XmlNode tmpNode = getDOMDocument().ImportNode(getOriginalDOMDocument().DocumentElement,true); getDOMDocument().AppendChild(tmpNode); //getDOMDocument().AppendChild(getOriginalDOMDocument().DocumentElement.CloneNode(true)); - }
+ } catch (NotImplementedException ex) { throw ex; diff --git a/mcs/class/System/Microsoft.Win32/.gitattributes b/mcs/class/System/Microsoft.Win32/.gitattributes index 542bc45fd33..7643a87923e 100644 --- a/mcs/class/System/Microsoft.Win32/.gitattributes +++ b/mcs/class/System/Microsoft.Win32/.gitattributes @@ -6,8 +6,6 @@ /SessionEndedEventHandler.cs -crlf /SessionEndingEventArgs.cs -crlf /SessionEndingEventHandler.cs -crlf -/SystemEvents.cs -crlf -/TimerElapsedEventArgs.cs -crlf /TimerElapsedEventHandler.cs -crlf /UserPreferenceCategory.cs -crlf /UserPreferenceChangedEventArgs.cs -crlf diff --git a/mcs/class/System/Microsoft.Win32/SystemEvents.cs b/mcs/class/System/Microsoft.Win32/SystemEvents.cs index e8eb87b7a28..76fd57c5e9f 100644 --- a/mcs/class/System/Microsoft.Win32/SystemEvents.cs +++ b/mcs/class/System/Microsoft.Win32/SystemEvents.cs @@ -35,8 +35,8 @@ using System.ComponentModel; using System.Security.Permissions; using System.Timers; -namespace Microsoft.Win32 {
-
+namespace Microsoft.Win32 { + [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] public sealed class SystemEvents { @@ -178,4 +178,4 @@ namespace Microsoft.Win32 { remove { } } } -}
+} diff --git a/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs b/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs index 40bcccd92ee..4c7077fd829 100644 --- a/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs @@ -31,7 +31,7 @@ using System.Runtime.InteropServices; using System.Security.Permissions; -namespace Microsoft.Win32 {
+namespace Microsoft.Win32 { [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] diff --git a/mcs/class/System/System.IO/MonoIOError.cs b/mcs/class/System/System.IO/MonoIOError.cs index cb061a005fd..768986c426a 100644 --- a/mcs/class/System/System.IO/MonoIOError.cs +++ b/mcs/class/System/System.IO/MonoIOError.cs @@ -6,27 +6,27 @@ //
// (C) 2002
//
- -// -// 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. -// +
+//
+// 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;
diff --git a/mcs/class/System/System.Net.Configuration/.gitattributes b/mcs/class/System/System.Net.Configuration/.gitattributes deleted file mode 100644 index 4d8484b9d43..00000000000 --- a/mcs/class/System/System.Net.Configuration/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/SmtpSection.cs -crlf diff --git a/mcs/class/System/System.Net.Configuration/SmtpSection.cs b/mcs/class/System/System.Net.Configuration/SmtpSection.cs index e61fc13d1ff..d13dd0d6d15 100644 --- a/mcs/class/System/System.Net.Configuration/SmtpSection.cs +++ b/mcs/class/System/System.Net.Configuration/SmtpSection.cs @@ -39,24 +39,24 @@ namespace System.Net.Configuration { public sealed class SmtpSection : ConfigurationSection { [ConfigurationProperty ("deliveryMethod", DefaultValue = "Network")] - public SmtpDeliveryMethod DeliveryMethod {
- get { return (SmtpDeliveryMethod) base ["deliveryMethod"]; }
+ public SmtpDeliveryMethod DeliveryMethod { + get { return (SmtpDeliveryMethod) base ["deliveryMethod"]; } set { base ["deliveryMethod"] = value; } } [ConfigurationProperty ("from")] - public string From {
- get { return (string) base ["from"]; }
+ public string From { + get { return (string) base ["from"]; } set { base ["from"] = value; } } [ConfigurationProperty ("network")] - public SmtpNetworkElement Network {
+ public SmtpNetworkElement Network { get { return (SmtpNetworkElement) base ["network"]; } } [ConfigurationProperty ("specifiedPickupDirectory")] - public SmtpSpecifiedPickupDirectoryElement SpecifiedPickupDirectory {
+ public SmtpSpecifiedPickupDirectoryElement SpecifiedPickupDirectory { get { return (SmtpSpecifiedPickupDirectoryElement) base ["specifiedPickupDirectory"]; } } diff --git a/mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs b/mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs index ac0faba58e2..1d89c4e84fd 100644 --- a/mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs +++ b/mcs/class/System/System.Text.RegularExpressions/BaseMachine.cs @@ -71,7 +71,7 @@ namespace System.Text.RegularExpressions int gcount = m.Groups.Count;
for (int gindex = 1; gindex < gcount; gindex++) {
- Group grp = m.Groups [gindex]; + Group grp = m.Groups [gindex];
if (grp.Length > 0)
splits.Add (input.Substring (grp.Index, grp.Length));
}
diff --git a/mcs/class/System/Test/System.Collections.Specialized/.gitattributes b/mcs/class/System/Test/System.Collections.Specialized/.gitattributes deleted file mode 100644 index 72ece026553..00000000000 --- a/mcs/class/System/Test/System.Collections.Specialized/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/NameValueCollectionTest.cs -crlf diff --git a/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs b/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs index 5b76f619181..9d9baef99a3 100644 --- a/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs +++ b/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs @@ -384,24 +384,24 @@ namespace MonoTests.System.Collections.Specialized { new NameValueCollection (-1, new EqualityComparer ()); } - [Test]
- public void Constructor_IEqualityComparer_Null ()
- {
- NameValueCollection c1 = new NameValueCollection ((IEqualityComparer)null);
- c1.Add ("key", "value");
- Assert.AreEqual (c1.Get ("KEY"), "value", "Constructor_IEqualityComparer_Null");
- c1.Remove ("key");
- }
-
- [Test]
- public void Constructor_NameValueCollection ()
- {
- NameValueCollection c1 = new NameValueCollection (StringComparer.InvariantCultureIgnoreCase);
- c1.Add ("key", "value");
- NameValueCollection c2 = new NameValueCollection (c1);
- Assert.AreEqual (c2.Get ("KEY"), "value", "Constructor_NameValueCollection");
- c2.Remove ("key");
- } -#endif
+ [Test] + public void Constructor_IEqualityComparer_Null () + { + NameValueCollection c1 = new NameValueCollection ((IEqualityComparer)null); + c1.Add ("key", "value"); + Assert.AreEqual (c1.Get ("KEY"), "value", "Constructor_IEqualityComparer_Null"); + c1.Remove ("key"); + } + + [Test] + public void Constructor_NameValueCollection () + { + NameValueCollection c1 = new NameValueCollection (StringComparer.InvariantCultureIgnoreCase); + c1.Add ("key", "value"); + NameValueCollection c2 = new NameValueCollection (c1); + Assert.AreEqual (c2.Get ("KEY"), "value", "Constructor_NameValueCollection"); + c2.Remove ("key"); + } +#endif } } diff --git a/mcs/class/System/Test/System.Diagnostics/EventLogPermissionAttributeTest.cs b/mcs/class/System/Test/System.Diagnostics/EventLogPermissionAttributeTest.cs index e3639a5fe8b..34e4d86cfad 100644 --- a/mcs/class/System/Test/System.Diagnostics/EventLogPermissionAttributeTest.cs +++ b/mcs/class/System/Test/System.Diagnostics/EventLogPermissionAttributeTest.cs @@ -131,9 +131,9 @@ namespace MonoTests.System.Diagnostics { case 12:
case 13:
case 32:
- case 92: + case 92:
#if NET_2_0
- case 133: + case 133:
#endif
case 160:
// known invalid chars
diff --git a/mcs/class/System/Test/System.Diagnostics/PerformanceCounterPermissionAttributeTest.cs b/mcs/class/System/Test/System.Diagnostics/PerformanceCounterPermissionAttributeTest.cs index c0178584cd1..6223fbe5018 100644 --- a/mcs/class/System/Test/System.Diagnostics/PerformanceCounterPermissionAttributeTest.cs +++ b/mcs/class/System/Test/System.Diagnostics/PerformanceCounterPermissionAttributeTest.cs @@ -150,7 +150,7 @@ namespace MonoTests.System.Diagnostics { case 32:
case 92:
#if NET_2_0
- case 133: + case 133:
#endif
case 160:
// known invalid chars
diff --git a/mcs/class/System/Test/System.Net/.gitattributes b/mcs/class/System/Test/System.Net/.gitattributes index 2399e6bb6cd..e7f836da42d 100644 --- a/mcs/class/System/Test/System.Net/.gitattributes +++ b/mcs/class/System/Test/System.Net/.gitattributes @@ -1,7 +1,6 @@ /CookieCollectionTest.cs -crlf /CredentialCacheTest.cs -crlf /DnsTest.cs -crlf -/NetworkCredentialTest.cs -crlf /ServicePointManagerTest.cs -crlf /ServicePointTest.cs -crlf /SocketPermissionTest.cs -crlf diff --git a/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs b/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs index 8d0253bd9cd..54b28670c62 100644 --- a/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs +++ b/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs @@ -29,7 +29,7 @@ using System; using System.Net; -using NUnit.Framework;
+using NUnit.Framework; namespace MoonTest.System.Net { diff --git a/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs b/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs index fd97ca3e2dc..fbc2d7b91b4 100644 --- a/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs +++ b/mcs/class/System/Test/System.Web/AspNetHostingPermissionTest.cs @@ -90,12 +90,12 @@ namespace MonoTests.System.Web { Assert.AreEqual (AspNetHostingPermissionLevel.Unrestricted, anhp.Level, "Level");
Assert.IsTrue (anhp.IsUnrestricted (), "IsUnrestricted");
- SecurityElement se = anhp.ToXml (); -#if NET_2_0 + SecurityElement se = anhp.ToXml ();
+#if NET_2_0
// fixed in 2.0 RC
- Assert.IsNotNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted"); + Assert.IsNotNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted");
#else
- Assert.IsNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted"); + Assert.IsNull (se.Attribute ("Unrestricted"), "Xml-Unrestricted");
#endif
Assert.AreEqual ("Unrestricted", se.Attribute ("Level"), "Xml-Level");
Assert.IsNull (se.Children, "Xml-Children");
@@ -147,10 +147,10 @@ namespace MonoTests.System.Web { AspNetHostingPermission anhp = new AspNetHostingPermission (PermissionState.None);
// No intersection with null
foreach (AspNetHostingPermissionLevel ppl in AllLevel) {
- anhp.Level = ppl; - IPermission p = anhp.Intersect (null); -#if ! NET_2_0 - if (p != null) + anhp.Level = ppl;
+ IPermission p = anhp.Intersect (null);
+#if ! NET_2_0
+ if (p != null)
Assert.Ignore ("Behaviour changed in FX 1.1 SP1");
#endif
Assert.IsNull (p, ppl.ToString ());
diff --git a/mcs/class/WindowsBase/ChangeLog b/mcs/class/WindowsBase/ChangeLog index 8fa818ca8d9..2cd03d96c42 100644 --- a/mcs/class/WindowsBase/ChangeLog +++ b/mcs/class/WindowsBase/ChangeLog @@ -1,8 +1,8 @@ -2010-02-19 Alan McGovern <amcgovern@novell.com> - - * System.IO.Packaging/PackUriHelper.cs: Commit a fix for #570648 so - that PackUris can be combined properly. - +2010-02-19 Alan McGovern <amcgovern@novell.com>
+
+ * System.IO.Packaging/PackUriHelper.cs: Commit a fix for #570648 so
+ that PackUris can be combined properly.
+
2009-11-21 Raja R Harinath <harinath@hurrynot.org>
* System.Collections.ObjectModel/ObservableCollection.cs [NET_4_0]:
diff --git a/mcs/class/WindowsBase/System.Windows/.gitattributes b/mcs/class/WindowsBase/System.Windows/.gitattributes deleted file mode 100644 index 30b3639bc1d..00000000000 --- a/mcs/class/WindowsBase/System.Windows/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/Point.cs -crlf diff --git a/mcs/class/WindowsBase/System.Windows/Point.cs b/mcs/class/WindowsBase/System.Windows/Point.cs index c72a1713536..1784e65adb5 100644 --- a/mcs/class/WindowsBase/System.Windows/Point.cs +++ b/mcs/class/WindowsBase/System.Windows/Point.cs @@ -66,7 +66,7 @@ namespace System.Windows { } public override int GetHashCode () - {
+ { return (x.GetHashCode() ^ y.GetHashCode()); } @@ -146,46 +146,46 @@ namespace System.Windows { } public static Point Parse (string source) - {
- string[] points = source.Split(',');
-
- if (points.Length<2)
- throw new InvalidOperationException ("source does not contain two numbers");
- if (points.Length > 2)
- throw new InvalidOperationException ("source contains too many delimiters");
-
+ { + string[] points = source.Split(','); + + if (points.Length<2) + throw new InvalidOperationException ("source does not contain two numbers"); + if (points.Length > 2) + throw new InvalidOperationException ("source contains too many delimiters"); + CultureInfo ci = CultureInfo.InvariantCulture; return new Point (Convert.ToDouble(points[0],ci), Convert.ToDouble(points[1],ci)); } public override string ToString () - {
+ { return this.ToString(null, null); } public string ToString (IFormatProvider formatProvider) - {
+ { return this.ToString(null,formatProvider); } - private string ToString(string format,IFormatProvider formatProvider)
- {
- CultureInfo ci = (CultureInfo)formatProvider;
-
- if (ci == null)
- ci = CultureInfo.CurrentCulture;
- string seperator = ci.NumberFormat.NumberDecimalSeparator;
- if (seperator.Equals(","))
- seperator = ";";
- else
- seperator = ",";
- object[] ob = { this.x, seperator, this.y };
-
- return string.Format(formatProvider, "{0:" + format + "}{1}{2:" + format + "}", ob);
+ private string ToString(string format,IFormatProvider formatProvider) + { + CultureInfo ci = (CultureInfo)formatProvider; + + if (ci == null) + ci = CultureInfo.CurrentCulture; + string seperator = ci.NumberFormat.NumberDecimalSeparator; + if (seperator.Equals(",")) + seperator = ";"; + else + seperator = ","; + object[] ob = { this.x, seperator, this.y }; + + return string.Format(formatProvider, "{0:" + format + "}{1}{2:" + format + "}", ob); } string IFormattable.ToString (string format, IFormatProvider formatProvider) - {
+ { return this.ToString(format, formatProvider); } diff --git a/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/.gitattributes b/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/.gitattributes deleted file mode 100644 index 3b023e0c72a..00000000000 --- a/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/ObservableCollectionTest.cs -crlf diff --git a/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs b/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs index c1834a97031..1e104530d73 100644 --- a/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs +++ b/mcs/class/WindowsBase/Test/System.Collections.ObjectModel/ObservableCollectionTest.cs @@ -229,61 +229,61 @@ namespace MonoTests.System.Collections.ObjectModel { // Removing the PropertyChanged event handler should work as well: ((INotifyPropertyChanged)collection).PropertyChanged -= pceh; - }
-
- //Private test class for protected members of ObservableCollection
- private class ObservableCollectionTestHelper : ObservableCollection<char> {
- internal void DoubleEnterReentrant()
- {
- IDisposable object1 = BlockReentrancy ();
- IDisposable object2 = BlockReentrancy ();
-
- Assert.AreSame (object1, object2);
-
- //With double block, try the reentrant:
- NotifyCollectionChangedEventArgs args = null;
-
- CollectionChanged += delegate (object sender, NotifyCollectionChangedEventArgs e) {
- args = e;
- };
-
- // We need a second callback for reentrancy to matter
- CollectionChanged += delegate (object sender, NotifyCollectionChangedEventArgs e) {
- // Doesn't need to do anything; just needs more than one callback registered.
- };
-
- // Try adding - this should cause reentrancy, and fail
- try {
- Add ('I');
- Assert.Fail ("Reentrancy should not be allowed. -- #2");
- } catch (InvalidOperationException) {
- }
-
- // Release the first reentrant
- object1.Dispose ();
-
- // Try adding again - this should cause reentrancy, and fail again
- try {
- Add ('J');
- Assert.Fail ("Reentrancy should not be allowed. -- #3");
- } catch (InvalidOperationException) {
- }
-
- // Release the reentrant a second time
- object1.Dispose ();
-
- // This last add should work fine.
- Add ('K');
- CollectionChangedEventValidators.ValidateAddOperation (args, new char [] { 'K' }, 0, "REENTHELP_1");
- }
- }
-
- [Test]
- public void ReentrantReuseObject()
- {
- ObservableCollectionTestHelper helper = new ObservableCollectionTestHelper ();
-
- helper.DoubleEnterReentrant ();
+ } + + //Private test class for protected members of ObservableCollection + private class ObservableCollectionTestHelper : ObservableCollection<char> { + internal void DoubleEnterReentrant() + { + IDisposable object1 = BlockReentrancy (); + IDisposable object2 = BlockReentrancy (); + + Assert.AreSame (object1, object2); + + //With double block, try the reentrant: + NotifyCollectionChangedEventArgs args = null; + + CollectionChanged += delegate (object sender, NotifyCollectionChangedEventArgs e) { + args = e; + }; + + // We need a second callback for reentrancy to matter + CollectionChanged += delegate (object sender, NotifyCollectionChangedEventArgs e) { + // Doesn't need to do anything; just needs more than one callback registered. + }; + + // Try adding - this should cause reentrancy, and fail + try { + Add ('I'); + Assert.Fail ("Reentrancy should not be allowed. -- #2"); + } catch (InvalidOperationException) { + } + + // Release the first reentrant + object1.Dispose (); + + // Try adding again - this should cause reentrancy, and fail again + try { + Add ('J'); + Assert.Fail ("Reentrancy should not be allowed. -- #3"); + } catch (InvalidOperationException) { + } + + // Release the reentrant a second time + object1.Dispose (); + + // This last add should work fine. + Add ('K'); + CollectionChangedEventValidators.ValidateAddOperation (args, new char [] { 'K' }, 0, "REENTHELP_1"); + } + } + + [Test] + public void ReentrantReuseObject() + { + ObservableCollectionTestHelper helper = new ObservableCollectionTestHelper (); + + helper.DoubleEnterReentrant (); } [Test] diff --git a/mcs/class/WindowsBase/ZipSharp/.gitattributes b/mcs/class/WindowsBase/ZipSharp/.gitattributes deleted file mode 100644 index 58873a6f011..00000000000 --- a/mcs/class/WindowsBase/ZipSharp/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -/NativeZip.cs -crlf -/UnzipFileInfo.cs -crlf diff --git a/mcs/class/WindowsBase/ZipSharp/NativeZip.cs b/mcs/class/WindowsBase/ZipSharp/NativeZip.cs index dfa04ea66d4..225fc1acaba 100644 --- a/mcs/class/WindowsBase/ZipSharp/NativeZip.cs +++ b/mcs/class/WindowsBase/ZipSharp/NativeZip.cs @@ -58,8 +58,8 @@ namespace zipsharp } [DllImport ("MonoPosixHelper")] - static extern unsafe int zipWriteInFileInZip (ZipHandle handle,
- byte* buffer,
+ static extern unsafe int zipWriteInFileInZip (ZipHandle handle, + byte* buffer, uint len); [DllImport ("MonoPosixHelper")] diff --git a/mcs/class/WindowsBase/ZipSharp/UnzipFileInfo.cs b/mcs/class/WindowsBase/ZipSharp/UnzipFileInfo.cs index ec134d97668..9316c0a1773 100644 --- a/mcs/class/WindowsBase/ZipSharp/UnzipFileInfo.cs +++ b/mcs/class/WindowsBase/ZipSharp/UnzipFileInfo.cs @@ -11,23 +11,23 @@ namespace zipsharp { [StructLayout (LayoutKind.Sequential)] struct UnzipFileInfo - {
- IntPtr version; /* version made by 2 bytes */
- IntPtr version_needed; /* version needed to extract 2 bytes */
- IntPtr flag; /* general purpose bit flag 2 bytes */
- IntPtr compression_method; /* compression method 2 bytes */
- IntPtr dosDate; /* last mod file date in Dos fmt 4 bytes */
- IntPtr crc; /* crc-32 4 bytes */
- IntPtr compressed_size; /* compressed size 4 bytes */
- IntPtr uncompressed_size; /* uncompressed size 4 bytes */
- IntPtr size_filename; /* filename length 2 bytes */
- IntPtr size_file_extra; /* extra field length 2 bytes */
- IntPtr size_file_comment; /* file comment length 2 bytes */
-
- IntPtr disk_num_start; /* disk number start 2 bytes */
- IntPtr internal_fa; /* internal file attributes 2 bytes */
- IntPtr external_fa; /* external file attributes 4 bytes */
-
+ { + IntPtr version; /* version made by 2 bytes */ + IntPtr version_needed; /* version needed to extract 2 bytes */ + IntPtr flag; /* general purpose bit flag 2 bytes */ + IntPtr compression_method; /* compression method 2 bytes */ + IntPtr dosDate; /* last mod file date in Dos fmt 4 bytes */ + IntPtr crc; /* crc-32 4 bytes */ + IntPtr compressed_size; /* compressed size 4 bytes */ + IntPtr uncompressed_size; /* uncompressed size 4 bytes */ + IntPtr size_filename; /* filename length 2 bytes */ + IntPtr size_file_extra; /* extra field length 2 bytes */ + IntPtr size_file_comment; /* file comment length 2 bytes */ + + IntPtr disk_num_start; /* disk number start 2 bytes */ + IntPtr internal_fa; /* internal file attributes 2 bytes */ + IntPtr external_fa; /* external file attributes 4 bytes */ + ZipTime tmu_date; public ulong VersionNeeded { diff --git a/mcs/class/corlib/Documentation/en/System.Security.Cryptography/.gitattributes b/mcs/class/corlib/Documentation/en/System.Security.Cryptography/.gitattributes deleted file mode 100644 index db82017f975..00000000000 --- a/mcs/class/corlib/Documentation/en/System.Security.Cryptography/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/AsymmetricKeyExchangeFormatter.xml -crlf diff --git a/mcs/class/corlib/Documentation/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml b/mcs/class/corlib/Documentation/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml index fcf699cb703..ea8495d13e2 100755 --- a/mcs/class/corlib/Documentation/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml +++ b/mcs/class/corlib/Documentation/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml @@ -24,7 +24,7 @@ <ReturnValue /> <Parameters /> <Docs> - <summary>Constructor, no idea why it is here (abstract class) :-)
+ <summary>Constructor, no idea why it is here (abstract class) :-) </summary> <remarks>Included for compatibility with MS.</remarks> </Docs> diff --git a/mcs/class/corlib/System.Globalization/CodePageDataItem.cs b/mcs/class/corlib/System.Globalization/CodePageDataItem.cs index 68c194d3a30..73d876aed21 100644 --- a/mcs/class/corlib/System.Globalization/CodePageDataItem.cs +++ b/mcs/class/corlib/System.Globalization/CodePageDataItem.cs @@ -40,7 +40,7 @@ namespace System.Globalization {
[Serializable]
internal sealed class CodePageDataItem
- { + {
#pragma warning disable 169
private string m_bodyName;
private int m_codePage;
@@ -53,7 +53,7 @@ namespace System.Globalization private CodePageDataItem ()
{
- } + }
#pragma warning disable 169
}
}
diff --git a/mcs/class/corlib/System.IO/MonoIOError.cs b/mcs/class/corlib/System.IO/MonoIOError.cs index 18db7f9a82c..c84f4b70565 100644 --- a/mcs/class/corlib/System.IO/MonoIOError.cs +++ b/mcs/class/corlib/System.IO/MonoIOError.cs @@ -1,34 +1,34 @@ -// -// System.IO.MonoIOError.cs: Win32 error codes. Yuck. -// -// Author: -// Dan Lewis (dihlewis@yahoo.co.uk) -// -// (C) 2002 -// - -// -// 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. -// +//
+// System.IO.MonoIOError.cs: Win32 error codes. Yuck.
+//
+// Author:
+// Dan Lewis (dihlewis@yahoo.co.uk)
+//
+// (C) 2002
+//
+
+//
+// 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;
@@ -41,7 +41,7 @@ namespace System.IO ERROR_PATH_NOT_FOUND = 3,
ERROR_TOO_MANY_OPEN_FILES = 4,
ERROR_ACCESS_DENIED = 5,
- ERROR_INVALID_HANDLE = 6, + ERROR_INVALID_HANDLE = 6,
/* ERROR_ARENA_TRASHED = 7,
ERROR_NOT_ENOUGH_MEMORY = 8,
ERROR_INVALID_BLOCK = 9,
@@ -63,11 +63,11 @@ namespace System.IO ERROR_SEEK = 25,
ERROR_NOT_DOS_DISK = 26,
ERROR_SECTOR_NOT_FOUND = 27,
- ERROR_OUT_OF_PAPER = 28,*/ + ERROR_OUT_OF_PAPER = 28,*/
ERROR_WRITE_FAULT = 29,
ERROR_READ_FAULT = 30,
- ERROR_GEN_FAILURE = 31, - ERROR_SHARING_VIOLATION = 32, + ERROR_GEN_FAILURE = 31,
+ ERROR_SHARING_VIOLATION = 32,
ERROR_LOCK_VIOLATION = 33,
/* ERROR_WRONG_DISK = 34,
ERROR_SHARING_BUFFER_EXCEEDED = 36,
@@ -96,8 +96,8 @@ namespace System.IO ERROR_SHARING_PAUSED = 70,
ERROR_REQ_NOT_ACCEP = 71,
ERROR_REDIR_PAUSED = 72,
- */ ERROR_FILE_EXISTS = 80, - ERROR_CANNOT_MAKE = 82, + */ ERROR_FILE_EXISTS = 80,
+ ERROR_CANNOT_MAKE = 82,
/* ERROR_FAIL_I24 = 83,
ERROR_OUT_OF_STRUCTURES = 84,
ERROR_ALREADY_ASSIGNED = 85,
@@ -148,9 +148,9 @@ namespace System.IO ERROR_BUSY_DRIVE = 142,
ERROR_SAME_DRIVE = 143,
ERROR_DIR_NOT_ROOT = 144,
- */ + */
ERROR_DIR_NOT_EMPTY = 145,
- /* + /*
ERROR_IS_SUBST_PATH = 146,
ERROR_IS_JOIN_PATH = 147,
ERROR_PATH_BUSY = 148,
@@ -1023,9 +1023,9 @@ namespace System.IO ERROR_NODE_CANNOT_BE_CLUSTERED = 5898,
ERROR_CLUSTER_WRONG_OS_VERSION = 5899,
ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME = 5900,
- */ - ERROR_ENCRYPTION_FAILED = 6000, - /* + */
+ ERROR_ENCRYPTION_FAILED = 6000,
+ /*
ERROR_DECRYPTION_FAILED = 6001,
ERROR_FILE_ENCRYPTED = 6002,
ERROR_NO_RECOVERY_POLICY = 6003,
diff --git a/mcs/class/corlib/System.IO/SearchPattern.cs b/mcs/class/corlib/System.IO/SearchPattern.cs index b6579e6dba0..26694f4e40a 100644 --- a/mcs/class/corlib/System.IO/SearchPattern.cs +++ b/mcs/class/corlib/System.IO/SearchPattern.cs @@ -6,29 +6,29 @@ //
// (C) 2002
//
- -// -// 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;
diff --git a/mcs/class/corlib/System.PAL/IOperatingSystem.cs b/mcs/class/corlib/System.PAL/IOperatingSystem.cs index b2fa9f4275e..e4721a65805 100644 --- a/mcs/class/corlib/System.PAL/IOperatingSystem.cs +++ b/mcs/class/corlib/System.PAL/IOperatingSystem.cs @@ -1,26 +1,26 @@ - -// -// 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.
+//
/*---------------------------------------------------------------------
XX X XXX
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/.gitattributes b/mcs/class/corlib/System.Runtime.CompilerServices/.gitattributes deleted file mode 100644 index 8b270b2b777..00000000000 --- a/mcs/class/corlib/System.Runtime.CompilerServices/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/MethodCodeType.cs -crlf diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs b/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs index da2759bc67a..24792ffa4c4 100644 --- a/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs +++ b/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs @@ -1,13 +1,13 @@ -//------------------------------------------------------------------------------
-//
-// System.Runtime.CompilerServices.MethodCodeType.cs
-//
-// Copyright (C) 2001 Michael Lambert, All Rights Reserved
-//
-// Author: Michael Lambert, michaellambert@email.com
-// Created: Thu 07/18/2001
-//
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------ +// +// System.Runtime.CompilerServices.MethodCodeType.cs +// +// Copyright (C) 2001 Michael Lambert, All Rights Reserved +// +// Author: Michael Lambert, michaellambert@email.com +// Created: Thu 07/18/2001 +// +//------------------------------------------------------------------------------ // // Copyright (C) 2004 Novell, Inc (http://www.novell.com) diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/.gitattributes b/mcs/class/corlib/System.Runtime.Remoting.Contexts/.gitattributes deleted file mode 100644 index 0145592bf0b..00000000000 --- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/CrossContextChannel.cs -crlf diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextChannel.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextChannel.cs index 3457f1bd381..2ec4a6a20b3 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextChannel.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextChannel.cs @@ -28,17 +28,17 @@ // 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.Threading;
-using System.Runtime.Remoting.Messaging;
-using System.Runtime.Remoting.Activation;
-using System.Runtime.Remoting.Channels;
-
-namespace System.Runtime.Remoting.Contexts
-{
- internal class CrossContextChannel: IMessageSink
- {
+ +using System; +using System.Threading; +using System.Runtime.Remoting.Messaging; +using System.Runtime.Remoting.Activation; +using System.Runtime.Remoting.Channels; + +namespace System.Runtime.Remoting.Contexts +{ + internal class CrossContextChannel: IMessageSink + { public IMessage SyncProcessMessage (IMessage msg) { ServerIdentity identity = (ServerIdentity) RemotingServices.GetMessageTargetIdentity (msg); @@ -112,21 +112,21 @@ namespace System.Runtime.Remoting.Contexts public IMessageSink NextSink { get { return null; } - }
-
- class ContextRestoreSink: IMessageSink
- {
- IMessageSink _next;
- Context _context;
- IMessage _call;
-
- public ContextRestoreSink (IMessageSink next, Context context, IMessage call)
- {
- _next = next;
- _context = context;
- _call = call;
- }
-
+ } + + class ContextRestoreSink: IMessageSink + { + IMessageSink _next; + Context _context; + IMessage _call; + + public ContextRestoreSink (IMessageSink next, Context context, IMessage call) + { + _next = next; + _context = context; + _call = call; + } + public IMessage SyncProcessMessage (IMessage msg) { try @@ -143,7 +143,7 @@ namespace System.Runtime.Remoting.Contexts { if (_context != null) Context.SwitchToContext (_context); - }
+ } } public IMessageCtrl AsyncProcessMessage (IMessage msg, IMessageSink replySink) @@ -154,8 +154,8 @@ namespace System.Runtime.Remoting.Contexts public IMessageSink NextSink { get { return _next; } - }
- }
-
- }
-}
+ } + } + + } +} diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/.gitattributes b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/.gitattributes deleted file mode 100644 index c7999862cb2..00000000000 --- a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/Lease.cs -crlf diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs index 484846d2455..8261ce287f9 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs @@ -28,15 +28,15 @@ // 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.Threading;
-using System.Collections;
-
-namespace System.Runtime.Remoting.Lifetime
-{
- internal class Lease : MarshalByRefObject, ILease
- {
+ +using System; +using System.Threading; +using System.Collections; + +namespace System.Runtime.Remoting.Lifetime +{ + internal class Lease : MarshalByRefObject, ILease + { DateTime _leaseExpireTime; LeaseState _currentState; TimeSpan _initialLeaseTime; @@ -47,16 +47,16 @@ namespace System.Runtime.Remoting.Lifetime RenewalDelegate _renewalDelegate; delegate TimeSpan RenewalDelegate(ILease lease); -
- public Lease()
- {
- _currentState = LeaseState.Initial;
- _initialLeaseTime = LifetimeServices.LeaseTime;
- _renewOnCallTime = LifetimeServices.RenewOnCallTime;
- _sponsorshipTimeout = LifetimeServices.SponsorshipTimeout;
- _leaseExpireTime = DateTime.Now + _initialLeaseTime;
- }
-
+ + public Lease() + { + _currentState = LeaseState.Initial; + _initialLeaseTime = LifetimeServices.LeaseTime; + _renewOnCallTime = LifetimeServices.RenewOnCallTime; + _sponsorshipTimeout = LifetimeServices.SponsorshipTimeout; + _leaseExpireTime = DateTime.Now + _initialLeaseTime; + } + public TimeSpan CurrentLeaseTime { get { return _leaseExpireTime - DateTime.Now; } @@ -82,7 +82,7 @@ namespace System.Runtime.Remoting.Lifetime throw new RemotingException ("InitialLeaseTime property can only be set when the lease is in initial state; state is " + _currentState + "."); _initialLeaseTime = value; - _leaseExpireTime = DateTime.Now + _initialLeaseTime;
+ _leaseExpireTime = DateTime.Now + _initialLeaseTime; if (value == TimeSpan.Zero) _currentState = LeaseState.Null; } } @@ -211,5 +211,5 @@ namespace System.Runtime.Remoting.Lifetime Unregister ((ISponsor) _renewingSponsors.Dequeue()); // Drop the sponsor CheckNextSponsor (); } - }
-}
+ } +} diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/.gitattributes b/mcs/class/corlib/System.Runtime.Remoting.Messaging/.gitattributes index 6549d90b6f1..b6b234ce684 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/.gitattributes +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/.gitattributes @@ -1,12 +1,6 @@ -/ConstructionCallDictionary.cs -crlf -/ConstructionResponse.cs -crlf /EnvoyTerminatorSink.cs -crlf -/ErrorMessage.cs -crlf /Header.cs -crlf /IInternalMessage.cs -crlf /MethodCallDictionary.cs -crlf -/MethodCallMessageWrapper.cs -crlf /MethodReturnDictionary.cs -crlf -/MethodReturnMessageWrapper.cs -crlf /RemotingSurrogate.cs -crlf -/RemotingSurrogateSelector.cs -crlf diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionCallDictionary.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionCallDictionary.cs index bedd124cf7d..ea118025655 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionCallDictionary.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionCallDictionary.cs @@ -4,7 +4,7 @@ // Author: Lluis Sanchez Gual (lluis@ideary.com) // // (C) 2003, Lluis Sanchez Gual -//
+// // // Copyright (C) 2004 Novell, Inc (http://www.novell.com) @@ -28,20 +28,20 @@ // 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.Runtime.Remoting.Activation;
-
-namespace System.Runtime.Remoting.Messaging
-{
- class ConstructionCallDictionary : MethodDictionary
- {
- public static string[] InternalKeys = new string[] {"__Uri", "__MethodName", "__TypeName", "__MethodSignature", "__Args", "__CallContext", "__CallSiteActivationAttributes", "__ActivationType", "__ContextProperties", "__Activator", "__ActivationTypeName"};
-
- public ConstructionCallDictionary(IConstructionCallMessage message) : base (message)
- {
- MethodKeys = InternalKeys;
- }
+ +using System; +using System.Runtime.Remoting.Activation; + +namespace System.Runtime.Remoting.Messaging +{ + class ConstructionCallDictionary : MethodDictionary + { + public static string[] InternalKeys = new string[] {"__Uri", "__MethodName", "__TypeName", "__MethodSignature", "__Args", "__CallContext", "__CallSiteActivationAttributes", "__ActivationType", "__ContextProperties", "__Activator", "__ActivationTypeName"}; + + public ConstructionCallDictionary(IConstructionCallMessage message) : base (message) + { + MethodKeys = InternalKeys; + } protected override object GetMethodProperty (string key) { @@ -70,5 +70,5 @@ namespace System.Runtime.Remoting.Messaging default: base.SetMethodProperty (key, value); break; } } - }
-}
+ } +} diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionResponse.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionResponse.cs index cf01e54226b..1cceeccb684 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionResponse.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ConstructionResponse.cs @@ -4,7 +4,7 @@ // Author: Lluis Sanchez Gual (lluis@ideary.com) // // (C) 2003, Lluis Sanchez Gual -//
+// // // Copyright (C) 2004 Novell, Inc (http://www.novell.com) diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ErrorMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ErrorMessage.cs index 2a921c239d4..7a7ea06dd7a 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ErrorMessage.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ErrorMessage.cs @@ -38,7 +38,7 @@ namespace System.Runtime.Remoting.Messaging { // simple message to avoid serialization of crap data [Serializable] - internal class ErrorMessage : IMethodCallMessage
+ internal class ErrorMessage : IMethodCallMessage { string _uri = "Exception"; @@ -114,31 +114,31 @@ namespace System.Runtime.Remoting.Messaging { return "unknown"; } - public int InArgCount
- {
- get {
- return 0;
- }
- }
-
- public String GetInArgName(int index)
- {
- return null;
- }
-
- public Object GetInArg(int argNum)
- {
- return null;
- }
-
- public Object[] InArgs
- {
- get { return null; }
- }
-
- public LogicalCallContext LogicalCallContext
- {
- get { return null; }
- }
+ public int InArgCount + { + get { + return 0; + } + } + + public String GetInArgName(int index) + { + return null; + } + + public Object GetInArg(int argNum) + { + return null; + } + + public Object[] InArgs + { + get { return null; } + } + + public LogicalCallContext LogicalCallContext + { + get { return null; } + } } } diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs index 32ba7930796..5cc758ae26a 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs @@ -129,21 +129,21 @@ namespace System.Runtime.Remoting.Messaging { return _inArgInfo.GetInOutArgName(index); } - class DictionaryWrapper : MethodCallDictionary
- {
- IDictionary _wrappedDictionary;
- static string[] _keys = new string[] {"__Args"};
-
- public DictionaryWrapper(IMethodMessage message, IDictionary wrappedDictionary) : base (message)
- {
- _wrappedDictionary = wrappedDictionary;
- MethodKeys = _keys;
- }
- - protected override IDictionary AllocInternalProperties()
- {
- return _wrappedDictionary;
- }
+ class DictionaryWrapper : MethodCallDictionary + { + IDictionary _wrappedDictionary; + static string[] _keys = new string[] {"__Args"}; + + public DictionaryWrapper(IMethodMessage message, IDictionary wrappedDictionary) : base (message) + { + _wrappedDictionary = wrappedDictionary; + MethodKeys = _keys; + } + + protected override IDictionary AllocInternalProperties() + { + return _wrappedDictionary; + } protected override void SetMethodProperty (string key, object value) { diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs index 673442c82eb..6a7b49a70c5 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs @@ -64,7 +64,7 @@ namespace System.Runtime.Remoting.Messaging { get { return _args.Length; } } - public virtual object [] Args
+ public virtual object [] Args { get { return _args; } set { _args = value; } @@ -120,7 +120,7 @@ namespace System.Runtime.Remoting.Messaging { get { return ((IMethodReturnMessage)WrappedMessage).TypeName; } } - public string Uri
+ public string Uri { get { return ((IMethodReturnMessage)WrappedMessage).Uri; } set { Properties["__Uri"] = value; } @@ -146,21 +146,21 @@ namespace System.Runtime.Remoting.Messaging { return _outArgInfo.GetInOutArgName(index); } - class DictionaryWrapper : MethodReturnDictionary
- {
- IDictionary _wrappedDictionary;
- static string[] _keys = new string[] {"__Args", "__Return"};
-
- public DictionaryWrapper(IMethodReturnMessage message, IDictionary wrappedDictionary) : base (message)
- {
- _wrappedDictionary = wrappedDictionary;
- MethodKeys = _keys;
- }
- - protected override IDictionary AllocInternalProperties()
- {
- return _wrappedDictionary;
- }
+ class DictionaryWrapper : MethodReturnDictionary + { + IDictionary _wrappedDictionary; + static string[] _keys = new string[] {"__Args", "__Return"}; + + public DictionaryWrapper(IMethodReturnMessage message, IDictionary wrappedDictionary) : base (message) + { + _wrappedDictionary = wrappedDictionary; + MethodKeys = _keys; + } + + protected override IDictionary AllocInternalProperties() + { + return _wrappedDictionary; + } protected override void SetMethodProperty (string key, object value) { diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs index 0d89261c7bc..e192549dac9 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs @@ -39,11 +39,11 @@ namespace System.Runtime.Remoting.Messaging { [System.Runtime.InteropServices.ComVisible (true)] public class RemotingSurrogateSelector : ISurrogateSelector { - static Type s_cachedTypeObjRef = typeof(ObjRef);
+ static Type s_cachedTypeObjRef = typeof(ObjRef); static ObjRefSurrogate _objRefSurrogate = new ObjRefSurrogate(); static RemotingSurrogate _objRemotingSurrogate = new RemotingSurrogate(); - Object _rootObj = null;
+ Object _rootObj = null; MessageSurrogateFilter _filter = null; ISurrogateSelector _next; diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs index 00a64e5f844..b29dc095bf2 100644 --- a/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs +++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs @@ -45,11 +45,11 @@ namespace System.Runtime.Serialization.Formatters { {
string exceptionType;
string message;
- string stackTrace; - -#pragma warning disable 169 - // Used by some remoting magic - Exception exception; + string stackTrace;
+
+#pragma warning disable 169
+ // Used by some remoting magic
+ Exception exception;
#pragma warning restore 169
public ServerFault (string exceptionType, string message,
diff --git a/mcs/class/corlib/System.Security.Cryptography/.gitattributes b/mcs/class/corlib/System.Security.Cryptography/.gitattributes index 7965c23ea11..0de67a37e79 100644 --- a/mcs/class/corlib/System.Security.Cryptography/.gitattributes +++ b/mcs/class/corlib/System.Security.Cryptography/.gitattributes @@ -2,7 +2,6 @@ /AsymmetricKeyExchangeFormatter.cs -crlf /Base64Constants.cs -crlf /CspParameters.cs -crlf -/DES.cs -crlf /DSAParameters.cs -crlf /DeriveBytes.cs -crlf /MD5.cs -crlf @@ -12,4 +11,3 @@ /SHA256.cs -crlf /SHA384.cs -crlf /SHA512.cs -crlf -/SHAConstants.cs -crlf diff --git a/mcs/class/corlib/System.Security.Cryptography/DES.cs b/mcs/class/corlib/System.Security.Cryptography/DES.cs index 5722f49d6fd..ba69f162a3c 100644 --- a/mcs/class/corlib/System.Security.Cryptography/DES.cs +++ b/mcs/class/corlib/System.Security.Cryptography/DES.cs @@ -76,19 +76,19 @@ public abstract class DES : SymmetricAlgorithm { // Ek1(Ek2(m)) = m internal static readonly byte[,] semiWeakKeys = { - { 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x0E, 0x00, 0x0E }, // map to packed key 011F011F010E010E
- { 0x00, 0xE0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF0 }, // map to packed key 01E001E001F101F1
- { 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE }, // map to packed key 01FE01FE01FE01FE
- { 0x1E, 0x00, 0x1E, 0x00, 0x0E, 0x00, 0x0E, 0x00 }, // map to packed key 1F011F010E010E01
- { 0x1E, 0xE0, 0x1E, 0xE0, 0x0E, 0xF0, 0x0E, 0xF0 }, // map to packed key 1FE01FE00EF10EF1
- { 0x1E, 0xFE, 0x1E, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE }, // map to packed key 1FFE1FFE0EFE0EFE
- { 0xE0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF0, 0x00 }, // map to packed key E001E001F101F101
- { 0xE0, 0x1E, 0xE0, 0x1E, 0xF0, 0x0E, 0xF0, 0x0E }, // map to packed key E01FE01FF10EF10E
- { 0xE0, 0xFE, 0xE0, 0xFE, 0xF0, 0xFE, 0xF0, 0xFE }, // map to packed key E0FEE0FEF1FEF1FE
- { 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00 }, // map to packed key FE01FE01FE01FE01
- { 0xFE, 0x1E, 0xFE, 0x1E, 0xFE, 0x0E, 0xFE, 0x0E }, // map to packed key FE1FFE1FFE0EFE0E
- { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF0, 0xFE, 0xF0 }, // map to packed key FEE0FEE0FEF1FEF1
- };
+ { 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x0E, 0x00, 0x0E }, // map to packed key 011F011F010E010E + { 0x00, 0xE0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF0 }, // map to packed key 01E001E001F101F1 + { 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE }, // map to packed key 01FE01FE01FE01FE + { 0x1E, 0x00, 0x1E, 0x00, 0x0E, 0x00, 0x0E, 0x00 }, // map to packed key 1F011F010E010E01 + { 0x1E, 0xE0, 0x1E, 0xE0, 0x0E, 0xF0, 0x0E, 0xF0 }, // map to packed key 1FE01FE00EF10EF1 + { 0x1E, 0xFE, 0x1E, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE }, // map to packed key 1FFE1FFE0EFE0EFE + { 0xE0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF0, 0x00 }, // map to packed key E001E001F101F101 + { 0xE0, 0x1E, 0xE0, 0x1E, 0xF0, 0x0E, 0xF0, 0x0E }, // map to packed key E01FE01FF10EF10E + { 0xE0, 0xFE, 0xE0, 0xFE, 0xF0, 0xFE, 0xF0, 0xFE }, // map to packed key E0FEE0FEF1FEF1FE + { 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00 }, // map to packed key FE01FE01FE01FE01 + { 0xFE, 0x1E, 0xFE, 0x1E, 0xFE, 0x0E, 0xFE, 0x0E }, // map to packed key FE1FFE1FFE0EFE0E + { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF0, 0xFE, 0xF0 }, // map to packed key FEE0FEE0FEF1FEF1 + }; public static bool IsWeakKey (byte[] rgbKey) { diff --git a/mcs/class/corlib/System.Security.Cryptography/SHAConstants.cs b/mcs/class/corlib/System.Security.Cryptography/SHAConstants.cs index 80698888bd5..111d75fba54 100644 --- a/mcs/class/corlib/System.Security.Cryptography/SHAConstants.cs +++ b/mcs/class/corlib/System.Security.Cryptography/SHAConstants.cs @@ -23,7 +23,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace System.Security.Cryptography {
+namespace System.Security.Cryptography { internal static class SHAConstants { // SHA-256 Constants @@ -74,4 +74,4 @@ namespace System.Security.Cryptography { 0x4cc5d4becb3e42b6L, 0x597f299cfc657e2aL, 0x5fcb6fab3ad6faecL, 0x6c44198c4a475817L }; } -}
+} diff --git a/mcs/class/corlib/System.Security.Permissions/.gitattributes b/mcs/class/corlib/System.Security.Permissions/.gitattributes index c678f587a0c..59a841279a5 100644 --- a/mcs/class/corlib/System.Security.Permissions/.gitattributes +++ b/mcs/class/corlib/System.Security.Permissions/.gitattributes @@ -1,10 +1 @@ -/CodeAccessSecurityAttribute.cs -crlf -/EnvironmentPermission.cs -crlf -/EnvironmentPermissionAttribute.cs -crlf -/FileDialogPermission.cs -crlf -/FileDialogPermissionAttribute.cs -crlf -/FileIOPermissionAttribute.cs -crlf -/GacIdentityPermission.cs -crlf /IUnrestrictedPermission.cs -crlf -/IsolatedStoragePermissionAttribute.cs -crlf -/RegistryPermissionAttribute.cs -crlf diff --git a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs index 5fde74ed840..4e89bdc1d71 100644 --- a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs @@ -28,12 +28,12 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
+ +namespace System.Security.Permissions { #if NET_2_1 [Obsolete ("CAS support is not available with Silverlight applications.")] -#endif
+#endif [ComVisible (true)] [AttributeUsage( AttributeTargets.Assembly diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs index 9f0fa5800a4..b98b8485892 100644 --- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs @@ -32,9 +32,9 @@ using System.Collections; using System.Runtime.InteropServices; using System.Text; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [Serializable] public sealed class EnvironmentPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs index 6dc72ca663b..629f5633c2e 100644 --- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs @@ -30,9 +30,9 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs index d837acf6399..512d6a7dedd 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs @@ -28,9 +28,9 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [Serializable] public sealed class FileDialogPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs index 99a466ead91..fe0f9f08e16 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs @@ -30,9 +30,9 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs index 3c66c06746e..5f7fbff2d86 100644 --- a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs @@ -30,9 +30,9 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | diff --git a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs index a98c5a2bc5d..3ad3f369617 100644 --- a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs @@ -28,9 +28,9 @@ using System.Globalization; using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [Serializable] public sealed class GacIdentityPermission : CodeAccessPermission, IBuiltInPermission { diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs index a7f635e0447..5ec085a79c6 100644 --- a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs @@ -28,9 +28,9 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [AttributeUsage ( AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | diff --git a/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs index f6ac61d7c72..703dc0e3276 100644 --- a/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs @@ -30,9 +30,9 @@ // using System.Runtime.InteropServices; -
-namespace System.Security.Permissions {
-
+ +namespace System.Security.Permissions { + [ComVisible (true)] [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Constructor | diff --git a/mcs/class/corlib/System.Security/.gitattributes b/mcs/class/corlib/System.Security/.gitattributes deleted file mode 100644 index 33ac2bc4122..00000000000 --- a/mcs/class/corlib/System.Security/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/SecurityManager_2_1.cs -crlf diff --git a/mcs/class/corlib/System.Security/SecurityManager_2_1.cs b/mcs/class/corlib/System.Security/SecurityManager_2_1.cs index 9bd6441fc5f..bc010b23adf 100644 --- a/mcs/class/corlib/System.Security/SecurityManager_2_1.cs +++ b/mcs/class/corlib/System.Security/SecurityManager_2_1.cs @@ -53,8 +53,8 @@ namespace System.Security { HasElevatedPermissions = !SecurityEnabled; } - // note: this let us differentiate between running in the browser (w/CoreCLR) and
- // running on the desktop (e.g. smcs compiling stuff)
+ // note: this let us differentiate between running in the browser (w/CoreCLR) and + // running on the desktop (e.g. smcs compiling stuff) extern public static bool SecurityEnabled { [MethodImplAttribute (MethodImplOptions.InternalCall)] get; diff --git a/mcs/class/corlib/Test/System.IO.IsolatedStorage/.gitattributes b/mcs/class/corlib/Test/System.IO.IsolatedStorage/.gitattributes deleted file mode 100644 index abb2dfa51e7..00000000000 --- a/mcs/class/corlib/Test/System.IO.IsolatedStorage/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/IsolatedStorageFileCas.cs -crlf diff --git a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileCas.cs b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileCas.cs index 87e8d580052..031c4c4fd3b 100644 --- a/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileCas.cs +++ b/mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileCas.cs @@ -275,43 +275,43 @@ namespace MonoCasTests.System.IO.IsolatedStorageTest { isf.Close (); } -
- private ulong MaximumSize (SecurityZone zone)
- {
- IsolatedStorageScope scope = IsolatedStorageScope.User | IsolatedStorageScope.Assembly;
-
- Evidence ae = new Evidence ();
- ae.AddHost (new Zone (zone));
- IsolatedStorageFile isf = IsolatedStorageFile.GetStore (scope, null, null, ae, typeof (Zone));
- return isf.MaximumSize;
- }
-
- [Test]
- public void MaximumSize ()
- {
- Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.MyComputer), "MyComputer");
+ + private ulong MaximumSize (SecurityZone zone) + { + IsolatedStorageScope scope = IsolatedStorageScope.User | IsolatedStorageScope.Assembly; + + Evidence ae = new Evidence (); + ae.AddHost (new Zone (zone)); + IsolatedStorageFile isf = IsolatedStorageFile.GetStore (scope, null, null, ae, typeof (Zone)); + return isf.MaximumSize; + } + + [Test] + public void MaximumSize () + { + Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.MyComputer), "MyComputer"); Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.Intranet), "Intranet"); #if NET_2_0 - Assert.AreEqual (512000, MaximumSize (SecurityZone.Internet), "Internet");
+ Assert.AreEqual (512000, MaximumSize (SecurityZone.Internet), "Internet"); Assert.AreEqual (512000, MaximumSize (SecurityZone.Trusted), "Trusted"); #else - Assert.AreEqual (10240, MaximumSize (SecurityZone.Internet), "Internet");
+ Assert.AreEqual (10240, MaximumSize (SecurityZone.Internet), "Internet"); Assert.AreEqual (10240, MaximumSize (SecurityZone.Trusted), "Trusted"); -#endif
- }
-
- [Test]
- [ExpectedException (typeof (PolicyException))]
- public void MaximumSize_Untrusted ()
- {
- Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.Untrusted), "Untrusted");
- }
-
- [Test]
- [ExpectedException (typeof (PolicyException))]
- public void MaximumSize_NoZone ()
- {
- Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.NoZone), "NoZone");
- }
+#endif + } + + [Test] + [ExpectedException (typeof (PolicyException))] + public void MaximumSize_Untrusted () + { + Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.Untrusted), "Untrusted"); + } + + [Test] + [ExpectedException (typeof (PolicyException))] + public void MaximumSize_NoZone () + { + Assert.AreEqual (Int64.MaxValue, MaximumSize (SecurityZone.NoZone), "NoZone"); + } } } diff --git a/mcs/errors/.gitattributes b/mcs/errors/.gitattributes index f94f0dc26e7..e027e6d507f 100644 --- a/mcs/errors/.gitattributes +++ b/mcs/errors/.gitattributes @@ -2,7 +2,6 @@ /cs0019-21.cs -crlf /cs0019-22.cs -crlf /cs0019-23.cs -crlf -/cs0028-2.cs -crlf /cs0029-11.cs -crlf /cs0029-2.cs -crlf /cs0035.cs -crlf @@ -11,10 +10,8 @@ /cs0117-6.cs -crlf /cs0121-10.cs -crlf /cs0121-9.cs -crlf -/cs0132-2.cs -crlf /cs0144-3.cs -crlf /cs0154-3.cs -crlf -/cs0162-4.cs -crlf /cs0173-4.cs -crlf /cs0221-10.cs -crlf /cs0221-5.cs -crlf @@ -42,7 +39,6 @@ /cs1547-6.cs -crlf /cs1547-7.cs -crlf /cs1706-2.cs -crlf -/cs1717-5.cs -crlf /cs1729-12.cs -crlf /cs3003-6.cs -crlf /gcs0019-4.cs -crlf @@ -58,25 +54,14 @@ /gcs1961-10.cs -crlf /gcs1961-11.cs -crlf /gcs1961-12.cs -crlf -/gcs1961-13.cs -crlf -/gcs1961-14.cs -crlf /gcs1961-15.cs -crlf /gcs1961-16.cs -crlf /gcs1961-17.cs -crlf -/gcs1961-18.cs -crlf -/gcs1961-19.cs -crlf /gcs1961-2.cs -crlf -/gcs1961-20.cs -crlf -/gcs1961-21.cs -crlf -/gcs1961-22.cs -crlf -/gcs1961-23.cs -crlf /gcs1961-24.cs -crlf /gcs1961-25.cs -crlf /gcs1961-26.cs -crlf /gcs1961-27.cs -crlf -/gcs1961-28.cs -crlf -/gcs1961-29.cs -crlf -/gcs1961-3.cs -crlf /gcs1961-30.cs -crlf /gcs1961-31.cs -crlf /gcs1961-32.cs -crlf @@ -85,10 +70,5 @@ /gcs1961-35.cs -crlf /gcs1961-36.cs -crlf /gcs1961-37.cs -crlf -/gcs1961-4.cs -crlf -/gcs1961-5.cs -crlf -/gcs1961-6.cs -crlf -/gcs1961-7.cs -crlf -/gcs1961-8.cs -crlf /gcs1961-9.cs -crlf /gcs1961.cs -crlf diff --git a/mcs/errors/cs0019-21.cs b/mcs/errors/cs0019-21.cs index 0e2a0cf820c..795a44fd3bf 100644 --- a/mcs/errors/cs0019-21.cs +++ b/mcs/errors/cs0019-21.cs @@ -1,4 +1,4 @@ -// CS0019: Operator `+' cannot be applied to operands of type `AA' and `uint' +// CS0019: Operator `+' cannot be applied to operands of type `AA' and `uint'
// Line: 11
enum AA : byte { a, b = 200 }
@@ -10,4 +10,4 @@ public class C const uint ul = 1;
AA b = AA.a + ul;
}
-} +}
diff --git a/mcs/errors/cs0019-22.cs b/mcs/errors/cs0019-22.cs index 2645ce7f1a2..25a7e5bdd36 100644 --- a/mcs/errors/cs0019-22.cs +++ b/mcs/errors/cs0019-22.cs @@ -1,4 +1,4 @@ -// CS0019: Operator `-' cannot be applied to operands of type `AA' and `long' +// CS0019: Operator `-' cannot be applied to operands of type `AA' and `long'
// Line: 11
enum AA : short { a, b = 200 }
@@ -10,4 +10,4 @@ public class C const long ul = 1;
AA b = AA.a - ul;
}
-} +}
diff --git a/mcs/errors/cs0028-2.cs b/mcs/errors/cs0028-2.cs index 017fde1451f..7ac43ca26bf 100644 --- a/mcs/errors/cs0028-2.cs +++ b/mcs/errors/cs0028-2.cs @@ -4,7 +4,7 @@ class T { public static bool Main () - {
+ { return false; } } diff --git a/mcs/errors/cs0035.cs b/mcs/errors/cs0035.cs index 72e2380a73b..7caf83374c7 100644 --- a/mcs/errors/cs0035.cs +++ b/mcs/errors/cs0035.cs @@ -21,4 +21,4 @@ class M A a = new A ();
float f = -a;
}
-} +}
diff --git a/mcs/errors/cs0037-6.cs b/mcs/errors/cs0037-6.cs index 4563ed13adf..c9477420e3c 100644 --- a/mcs/errors/cs0037-6.cs +++ b/mcs/errors/cs0037-6.cs @@ -1,6 +1,6 @@ -// cs0037.cs: Cannot convert null to `bool' because it is a value type +// cs0037.cs: Cannot convert null to `bool' because it is a value type
// Line: 13
- +
using System;
public sealed class BoundAttribute : System.Attribute
diff --git a/mcs/errors/cs0117-6.cs b/mcs/errors/cs0117-6.cs index c9ad9b03c58..9a09d3c2820 100644 --- a/mcs/errors/cs0117-6.cs +++ b/mcs/errors/cs0117-6.cs @@ -1,5 +1,5 @@ -// CS0117: `string' does not contain a definition for `Parse' -// Line: 10 +// CS0117: `string' does not contain a definition for `Parse'
+// Line: 10
using System;
diff --git a/mcs/errors/cs0132-2.cs b/mcs/errors/cs0132-2.cs index 11d515567b1..5f413aff022 100644 --- a/mcs/errors/cs0132-2.cs +++ b/mcs/errors/cs0132-2.cs @@ -1,6 +1,6 @@ // cs0132.-2cs: `X.X(int)': The static constructor must be parameterless // Line: 5 -class X {
+class X { static int ii = 55; static X (int x) { diff --git a/mcs/errors/cs0154-3.cs b/mcs/errors/cs0154-3.cs index c4f3d239ef5..382c03b7b65 100644 --- a/mcs/errors/cs0154-3.cs +++ b/mcs/errors/cs0154-3.cs @@ -12,4 +12,4 @@ class C {
int i = new Test()[false];
}
-} +}
diff --git a/mcs/errors/cs0162-4.cs b/mcs/errors/cs0162-4.cs index 1859fb38921..1c41c527358 100644 --- a/mcs/errors/cs0162-4.cs +++ b/mcs/errors/cs0162-4.cs @@ -4,8 +4,8 @@ using System; -class C {
- bool T () { return true; }
+class C { + bool T () { return true; } void Close() { diff --git a/mcs/errors/cs0266-9.cs b/mcs/errors/cs0266-9.cs index b1287adf512..34addeaa806 100644 --- a/mcs/errors/cs0266-9.cs +++ b/mcs/errors/cs0266-9.cs @@ -7,4 +7,4 @@ enum E2 { A } class X {
const E1 e = ~E2.A;
}
- +
diff --git a/mcs/errors/cs0466.cs b/mcs/errors/cs0466.cs index 1588c21ce2b..dd9050eb55d 100644 --- a/mcs/errors/cs0466.cs +++ b/mcs/errors/cs0466.cs @@ -1,5 +1,5 @@ // cs0466.cs: `Base.I.M(params int[])': the explicit interface implementation cannot introduce the params modifier
-// Line: 10 +// Line: 10
interface I
{
diff --git a/mcs/errors/cs0469.cs b/mcs/errors/cs0469.cs index 233167bcba2..a6bf6abdb80 100644 --- a/mcs/errors/cs0469.cs +++ b/mcs/errors/cs0469.cs @@ -1,5 +1,5 @@ -// cs0469.cs: The `goto case' value is not implicitly convertible to type `char' -// Line: 16 +// cs0469.cs: The `goto case' value is not implicitly convertible to type `char'
+// Line: 16
// Compiler options: -warnaserror -warn:2
class Test
diff --git a/mcs/errors/cs0553-2.cs b/mcs/errors/cs0553-2.cs index 3fbf56655b3..bb1fd0f8c57 100644 --- a/mcs/errors/cs0553-2.cs +++ b/mcs/errors/cs0553-2.cs @@ -12,4 +12,4 @@ namespace plj return null;
}
}
-} +}
diff --git a/mcs/errors/cs0619-50.cs b/mcs/errors/cs0619-50.cs index e4d6c1d20ef..89c8f83a760 100644 --- a/mcs/errors/cs0619-50.cs +++ b/mcs/errors/cs0619-50.cs @@ -1,6 +1,6 @@ -// cs0619-50.cs: `A.B' is obsolete: `yes' +// cs0619-50.cs: `A.B' is obsolete: `yes'
// Line: 12
- +
using Z = A.B;
class A
diff --git a/mcs/errors/cs0619-51.cs b/mcs/errors/cs0619-51.cs index f651d432a9c..de93139646d 100644 --- a/mcs/errors/cs0619-51.cs +++ b/mcs/errors/cs0619-51.cs @@ -1,4 +1,4 @@ -// cs0619-51.cs: `A.comparer' is obsolete: `Please use ...' +// cs0619-51.cs: `A.comparer' is obsolete: `Please use ...'
// Line: 16
// Compiler options: -reference:CS0619-51-lib.dll
diff --git a/mcs/errors/cs0664-3.cs b/mcs/errors/cs0664-3.cs index 3eb26cf8c86..df11f4496fb 100644 --- a/mcs/errors/cs0664-3.cs +++ b/mcs/errors/cs0664-3.cs @@ -1,6 +1,6 @@ // cs0664-3.cs: Literal of type double cannot be implicitly converted to type `float'. Add suffix `f' to create a literal of this type
// Line: 13
- +
using System;
public sealed class BoundAttribute : System.Attribute
diff --git a/mcs/errors/cs1059-2.cs b/mcs/errors/cs1059-2.cs index 979088d14bb..4b1d55d95d0 100644 --- a/mcs/errors/cs1059-2.cs +++ b/mcs/errors/cs1059-2.cs @@ -7,4 +7,4 @@ public class Test { void Main () {
Console.WriteLine (++0);
}
-} +}
diff --git a/mcs/errors/cs1503.cs b/mcs/errors/cs1503.cs index c006bcd1428..577b9880200 100644 --- a/mcs/errors/cs1503.cs +++ b/mcs/errors/cs1503.cs @@ -14,4 +14,4 @@ class B {
A.Foo (1);
}
-} +}
diff --git a/mcs/errors/cs1706-2.cs b/mcs/errors/cs1706-2.cs index 03d77ecd408..19fd42116d7 100644 --- a/mcs/errors/cs1706-2.cs +++ b/mcs/errors/cs1706-2.cs @@ -1,4 +1,4 @@ -// CS1706: Anonymous methods and lambda expressions cannot be used in the current context +// CS1706: Anonymous methods and lambda expressions cannot be used in the current context
// Line: 14
public delegate void Proc();
@@ -15,4 +15,4 @@ public class Class public void Foo()
{
}
-} +}
diff --git a/mcs/errors/cs1717-5.cs b/mcs/errors/cs1717-5.cs index b96d8eced2f..dd7dc97c9a8 100644 --- a/mcs/errors/cs1717-5.cs +++ b/mcs/errors/cs1717-5.cs @@ -5,7 +5,7 @@ class A { public A () - {
+ { int a = a = 5; } }
\ No newline at end of file diff --git a/mcs/errors/cs1729-12.cs b/mcs/errors/cs1729-12.cs index c056b4135df..24714332871 100644 --- a/mcs/errors/cs1729-12.cs +++ b/mcs/errors/cs1729-12.cs @@ -14,4 +14,4 @@ class Example {
A a = new A.Foo ("test");
}
-} +}
diff --git a/mcs/errors/cs3003-6.cs b/mcs/errors/cs3003-6.cs index b6e109aa1fd..8cb2e10de21 100644 --- a/mcs/errors/cs3003-6.cs +++ b/mcs/errors/cs3003-6.cs @@ -1,6 +1,6 @@ // CS3003: Type of `I.Foo' is not CLS-compliant
-// Line: 10 -// Compiler options: -warnaserror -warn:1 +// Line: 10
+// Compiler options: -warnaserror -warn:1
using System;
[assembly:CLSCompliant (true)]
diff --git a/mcs/errors/gcs0019-4.cs b/mcs/errors/gcs0019-4.cs index 7014837fe65..e24febd725b 100644 --- a/mcs/errors/gcs0019-4.cs +++ b/mcs/errors/gcs0019-4.cs @@ -1,4 +1,4 @@ -// CS0019: Operator `+=' cannot be applied to operands of type `EventHandler' and `T' +// CS0019: Operator `+=' cannot be applied to operands of type `EventHandler' and `T'
// Line: 10
using System;
diff --git a/mcs/errors/gcs0266.cs b/mcs/errors/gcs0266.cs index 37f5cddc364..d09ff665108 100644 --- a/mcs/errors/gcs0266.cs +++ b/mcs/errors/gcs0266.cs @@ -1,5 +1,5 @@ -// CS0266: Cannot implicitly convert type `I' to `C'. An explicit conversion exists (are you missing a cast?) -// Line: 16 +// CS0266: Cannot implicitly convert type `I' to `C'. An explicit conversion exists (are you missing a cast?)
+// Line: 16
interface I
{
diff --git a/mcs/errors/gcs1961-13.cs b/mcs/errors/gcs1961-13.cs index a97e4af068c..457f795a405 100644 --- a/mcs/errors/gcs1961-13.cs +++ b/mcs/errors/gcs1961-13.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be covariantly valid on `B<T>.A'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be covariantly valid on `B<T>.A' +// Line: 9 // Compiler options: -langversion:future interface A<out T> diff --git a/mcs/errors/gcs1961-14.cs b/mcs/errors/gcs1961-14.cs index 2d53c5be33a..51a69a2b834 100644 --- a/mcs/errors/gcs1961-14.cs +++ b/mcs/errors/gcs1961-14.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-18.cs b/mcs/errors/gcs1961-18.cs index dbdb6c031f4..ac551a67dba 100644 --- a/mcs/errors/gcs1961-18.cs +++ b/mcs/errors/gcs1961-18.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.A'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.A' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-19.cs b/mcs/errors/gcs1961-19.cs index d998831abd1..e9df1fd8afc 100644 --- a/mcs/errors/gcs1961-19.cs +++ b/mcs/errors/gcs1961-19.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.A'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.A' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-20.cs b/mcs/errors/gcs1961-20.cs index 02809ac579f..e5b5e7d93cc 100644 --- a/mcs/errors/gcs1961-20.cs +++ b/mcs/errors/gcs1961-20.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C()'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C()' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-21.cs b/mcs/errors/gcs1961-21.cs index 8039575d256..22922553921 100644 --- a/mcs/errors/gcs1961-21.cs +++ b/mcs/errors/gcs1961-21.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C()'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C()' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-22.cs b/mcs/errors/gcs1961-22.cs index efce48141dc..098e8af9632 100644 --- a/mcs/errors/gcs1961-22.cs +++ b/mcs/errors/gcs1961-22.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-23.cs b/mcs/errors/gcs1961-23.cs index 248f988bb53..a53672830ba 100644 --- a/mcs/errors/gcs1961-23.cs +++ b/mcs/errors/gcs1961-23.cs @@ -1,5 +1,5 @@ -// CS1923: The covariant type parameter `T' must be invariantly valid on `B<T>.C(A<A<T>>)'
-// Line: 9
+// CS1923: The covariant type parameter `T' must be invariantly valid on `B<T>.C(A<A<T>>)' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-28.cs b/mcs/errors/gcs1961-28.cs index 24b61875bd8..37e87141f6b 100644 --- a/mcs/errors/gcs1961-28.cs +++ b/mcs/errors/gcs1961-28.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be contravariantly valid on `B<T>.A'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be contravariantly valid on `B<T>.A' +// Line: 9 // Compiler options: -langversion:future interface A<in T> diff --git a/mcs/errors/gcs1961-29.cs b/mcs/errors/gcs1961-29.cs index efce48141dc..098e8af9632 100644 --- a/mcs/errors/gcs1961-29.cs +++ b/mcs/errors/gcs1961-29.cs @@ -1,5 +1,5 @@ -// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)'
-// Line: 9
+// CS1961: The covariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-3.cs b/mcs/errors/gcs1961-3.cs index 03bba7f47e6..97138e0639c 100644 --- a/mcs/errors/gcs1961-3.cs +++ b/mcs/errors/gcs1961-3.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.A'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.A' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-4.cs b/mcs/errors/gcs1961-4.cs index d7d6260f99b..1ca5c603d85 100644 --- a/mcs/errors/gcs1961-4.cs +++ b/mcs/errors/gcs1961-4.cs @@ -1,5 +1,5 @@ // CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.A' -// Line: 9
+// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-5.cs b/mcs/errors/gcs1961-5.cs index 99c7d2cd725..5c92c2606f5 100644 --- a/mcs/errors/gcs1961-5.cs +++ b/mcs/errors/gcs1961-5.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C()'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C()' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-6.cs b/mcs/errors/gcs1961-6.cs index 76b7dbf394b..b0fee16550a 100644 --- a/mcs/errors/gcs1961-6.cs +++ b/mcs/errors/gcs1961-6.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C()'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C()' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-7.cs b/mcs/errors/gcs1961-7.cs index 2d53c5be33a..51a69a2b834 100644 --- a/mcs/errors/gcs1961-7.cs +++ b/mcs/errors/gcs1961-7.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C(A<T>)' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/errors/gcs1961-8.cs b/mcs/errors/gcs1961-8.cs index 8ab71b2921e..068a586df71 100644 --- a/mcs/errors/gcs1961-8.cs +++ b/mcs/errors/gcs1961-8.cs @@ -1,5 +1,5 @@ -// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C(A<A<T>>)'
-// Line: 9
+// CS1961: The contravariant type parameter `T' must be invariantly valid on `B<T>.C(A<A<T>>)' +// Line: 9 // Compiler options: -langversion:future interface A<T> diff --git a/mcs/tests/test-xml-008-ref.xml b/mcs/tests/test-xml-008-ref.xml index 681689e43b0..d1c41feaf36 100644 --- a/mcs/tests/test-xml-008-ref.xml +++ b/mcs/tests/test-xml-008-ref.xml @@ -5,7 +5,7 @@ </assembly>
<members>
<member name="T:Testing.Test">
- comment without markup on class - it is allowed + comment without markup on class - it is allowed
</member>
<!-- Badly formed XML comment ignored for member "T:Testing.Test2" -->
<!-- Badly formed XML comment ignored for member "T:Testing.Test3" -->
diff --git a/mcs/tests/test-xml-017-ref.xml b/mcs/tests/test-xml-017-ref.xml index 810bdf9a7bc..94ea04b52be 100644 --- a/mcs/tests/test-xml-017-ref.xml +++ b/mcs/tests/test-xml-017-ref.xml @@ -5,13 +5,13 @@ </assembly>
<members>
<member name="M:Testing.Test.Foo">
- comment on method without parameter + comment on method without parameter
</member>
<member name="M:Testing.Test.Foo(System.Int64,Testing.Test,System.Collections.ArrayList)">
- here is a documentation with parameters (and has same name) + here is a documentation with parameters (and has same name)
</member>
<member name="M:Testing.Test.Foo(System.String[])">
- here is a documentation with parameters (and has same name) + here is a documentation with parameters (and has same name)
</member>
</members>
</doc>
diff --git a/mcs/tests/test-xml-020-ref.xml b/mcs/tests/test-xml-020-ref.xml index cff42dfb04d..2af0c8fa538 100644 --- a/mcs/tests/test-xml-020-ref.xml +++ b/mcs/tests/test-xml-020-ref.xml @@ -5,10 +5,10 @@ </assembly>
<members>
<member name="M:Testing.Test.#ctor">
- comment for constructor + comment for constructor
</member>
<member name="M:Testing.Test.Finalize">
- comment for destructor + comment for destructor
</member>
</members>
</doc>
diff --git a/mcs/tests/test-xml-021-ref.xml b/mcs/tests/test-xml-021-ref.xml index a1842c9490c..50c77867089 100644 --- a/mcs/tests/test-xml-021-ref.xml +++ b/mcs/tests/test-xml-021-ref.xml @@ -5,10 +5,10 @@ </assembly>
<members>
<member name="T:Testing.Test.InternalClass">
- comment for internal class + comment for internal class
</member>
<member name="T:Testing.Test.InternalStruct">
- comment for internal struct + comment for internal struct
</member>
</members>
</doc>
diff --git a/mcs/tests/test-xml-023-ref.xml b/mcs/tests/test-xml-023-ref.xml index 5f25cedb410..b4ca1874167 100644 --- a/mcs/tests/test-xml-023-ref.xml +++ b/mcs/tests/test-xml-023-ref.xml @@ -5,7 +5,7 @@ </assembly>
<members>
<member name="M:Test.Foo(Test.A,System.Int32)">
- here is a documentation + here is a documentation
</member>
</members>
</doc>
diff --git a/mcs/tests/test-xml-033-ref.xml b/mcs/tests/test-xml-033-ref.xml index 70d300ad970..916dbc6d9fe 100644 --- a/mcs/tests/test-xml-033-ref.xml +++ b/mcs/tests/test-xml-033-ref.xml @@ -5,16 +5,16 @@ </assembly>
<members>
<member name="T:MyClass">
- <summary>help text</summary> + <summary>help text</summary>
</member>
<member name="M:MyClass.Main">
- <summary>help text</summary> + <summary>help text</summary>
</member>
<member name="M:MyClass.op_Explicit(MyClass)~System.Int32">
- <summary>help text</summary> + <summary>help text</summary>
</member>
<member name="M:MyClass.op_Implicit(MyClass)~System.Char">
- <summary>help text</summary> + <summary>help text</summary>
</member>
</members>
</doc>
diff --git a/mcs/tests/test-xml-034-ref.xml b/mcs/tests/test-xml-034-ref.xml index 30d95dac6d0..f1d9feb8191 100644 --- a/mcs/tests/test-xml-034-ref.xml +++ b/mcs/tests/test-xml-034-ref.xml @@ -5,7 +5,7 @@ </assembly>
<members>
<member name="T:Test">
- valid comment. + valid comment.
</member>
</members>
</doc>
diff --git a/mcs/tests/test-xml-037-ref.xml b/mcs/tests/test-xml-037-ref.xml index e0bce00b3f0..230bae7e20a 100644 --- a/mcs/tests/test-xml-037-ref.xml +++ b/mcs/tests/test-xml-037-ref.xml @@ -10,8 +10,8 @@ </summary>
</member>
<member name="M:Whatever.Main">
- <summary> - </summary> + <summary>
+ </summary>
</member>
</members>
</doc>
diff --git a/mcs/tools/mono-win32-setup.nsi b/mcs/tools/mono-win32-setup.nsi index fedc268d681..d4dc171879e 100755 --- a/mcs/tools/mono-win32-setup.nsi +++ b/mcs/tools/mono-win32-setup.nsi @@ -224,98 +224,98 @@ SectionEnd ; create bin/mono wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\mono.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe "$$@"'
FileClose $0
; create bin/mint wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\mint.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mint.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mint.exe "$$@"'
FileClose $0
; create bin/mcs wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\mcs.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/mcs.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/mcs.exe "$$@"'
FileClose $0
; create bin/mbas wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\mbas.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/mbas.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/mbas.exe "$$@"'
FileClose $0
; create bin/sqlsharp wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\sqlsharp.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/sqlsharp.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/sqlsharp.exe "$$@"'
FileClose $0
; create bin/monodis wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\monodis.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/monodis.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/monodis.exe "$$@"'
FileClose $0
; create bin/monoresgen wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\monoresgen.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/monoresgen.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/monoresgen.exe "$$@"'
FileClose $0
; create bin/monoilasm wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\monoilasm.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/monoilasm.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/monoilasm.exe "$$@"'
FileClose $0
; create bin/monosn wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\monosn.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/monosn.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/monosn.exe "$$@"'
FileClose $0
; create bin/secutil wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\secutil.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/secutil.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/secutil.exe "$$@"'
FileClose $0
; create bin/cert2spc wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\cert2spc.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/cert2spc.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/cert2spc.exe "$$@"'
FileClose $0
; create bin/cilc wrapper to be used if the user has cygwin
FileOpen $0 "$INSTDIR\bin\cilc.exe.sh" "w"
-FileWrite $0 "#!/bin/sh$\r$\n" -FileWrite $0 "export MONO_PATH=$6/lib$\r$\n" -FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n" -FileWrite $0 '$6/bin/mono.exe $6/bin/cilc.exe "$$@"' +FileWrite $0 "#!/bin/sh$\r$\n"
+FileWrite $0 "export MONO_PATH=$6/lib$\r$\n"
+FileWrite $0 "export MONO_CFG_DIR=$6/etc/mono$\r$\n"
+FileWrite $0 '$6/bin/mono.exe $6/bin/cilc.exe "$$@"'
FileClose $0
;
diff --git a/mcs/tools/monodoc/Lucene.Net/Demo/DemoLib/HTML/HTMLParserTokenManager.cs b/mcs/tools/monodoc/Lucene.Net/Demo/DemoLib/HTML/HTMLParserTokenManager.cs index 0371c260c0f..c86261fcadf 100644 --- a/mcs/tools/monodoc/Lucene.Net/Demo/DemoLib/HTML/HTMLParserTokenManager.cs +++ b/mcs/tools/monodoc/Lucene.Net/Demo/DemoLib/HTML/HTMLParserTokenManager.cs @@ -349,7 +349,7 @@ namespace Lucene.Net.Demo.Html ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop:
do
{
@@ -519,7 +519,7 @@ MatchLoop: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -591,7 +591,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -659,7 +659,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -695,7 +695,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -717,7 +717,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -813,7 +813,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -835,7 +835,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -856,7 +856,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -914,7 +914,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -950,7 +950,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -972,7 +972,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1071,7 +1071,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << (int) curChar;
+ ulong l = ((ulong) 1L) << (int) curChar;
MatchLoop1:
do
{
@@ -1116,7 +1116,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1139,7 +1139,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1305,7 +1305,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -1341,7 +1341,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1363,7 +1363,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1422,7 +1422,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -1481,7 +1481,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1538,7 +1538,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1645,7 +1645,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -1708,7 +1708,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1731,7 +1731,7 @@ MatchLoop1: else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs index 80a3e2367d5..b8e5f6ed130 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs @@ -97,7 +97,7 @@ namespace Monodoc.Lucene.Net.Analysis.Standard ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
do
{
switch (jjstateSet[--ii])
@@ -439,7 +439,7 @@ namespace Monodoc.Lucene.Net.Analysis.Standard }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
do
{
switch (jjstateSet[--ii])
@@ -789,7 +789,7 @@ namespace Monodoc.Lucene.Net.Analysis.Standard int i1 = hiByte >> 6;
ulong l1 = ((ulong) 1L) << (hiByte & 63);
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
do
{
switch (jjstateSet[--ii])
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Document/DateField.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Document/DateField.cs index 93e4e177610..5a8f0f18418 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Document/DateField.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Document/DateField.cs @@ -42,7 +42,7 @@ namespace Monodoc.Lucene.Net.Documents }
// make date strings long enough to last a millenium
- private static int DATE_LEN = SupportClass.Number.ToString( + private static int DATE_LEN = SupportClass.Number.ToString(
1000L * 365 * 24 * 60 * 60 * 1000, SupportClass.Number.MAX_RADIX).Length;
public static System.String MIN_DATE_STRING()
@@ -79,7 +79,7 @@ namespace Monodoc.Lucene.Net.Documents if (time < 0)
throw new System.SystemException("time too early");
- System.String s = SupportClass.Number.ToString(time, SupportClass.Number.MAX_RADIX); + System.String s = SupportClass.Number.ToString(time, SupportClass.Number.MAX_RADIX);
if (s.Length > DATE_LEN)
throw new System.SystemException("time too late");
@@ -105,11 +105,11 @@ namespace Monodoc.Lucene.Net.Documents /// <summary>Converts a string-encoded date into a Date object. </summary>
public static System.DateTime StringToDate(System.String s)
{
- long ticks = StringToTime(s) * TimeSpan.TicksPerMillisecond; - System.DateTime date = new System.DateTime(1970, 1, 1); - date = date.AddTicks(ticks); - date = date.Add(TimeZone.CurrentTimeZone.GetUtcOffset(date)); - return date; + long ticks = StringToTime(s) * TimeSpan.TicksPerMillisecond;
+ System.DateTime date = new System.DateTime(1970, 1, 1);
+ date = date.AddTicks(ticks);
+ date = date.Add(TimeZone.CurrentTimeZone.GetUtcOffset(date));
+ return date;
/*
System.TimeSpan ts = System.TimeSpan.FromMilliseconds(System.DateField.StringToTime(s));
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Index/DocumentWriter.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Index/DocumentWriter.cs index 0dcefed6f49..fed696228af 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Index/DocumentWriter.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Index/DocumentWriter.cs @@ -74,11 +74,11 @@ namespace Monodoc.Lucene.Net.Index fieldPositions = new int[fieldInfos.Size()]; // init fieldPositions
fieldBoosts = new float[fieldInfos.Size()]; // init fieldBoosts
- float boost = doc.GetBoost(); - for (int i = 0; i < fieldBoosts.Length; i++) - { - fieldBoosts[i] = boost; - } + float boost = doc.GetBoost();
+ for (int i = 0; i < fieldBoosts.Length; i++)
+ {
+ fieldBoosts[i] = boost;
+ }
InvertDocument(doc);
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/FastCharStream.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/FastCharStream.cs index 58902a68143..46571967ca6 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/FastCharStream.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/FastCharStream.cs @@ -80,13 +80,13 @@ namespace Monodoc.Lucene.Net.QueryParsers int charsRead = 0;
- try - { + try
+ {
charsRead = input.Read(buffer, newPosition, buffer.Length - newPosition);
}
- catch - { - } + catch
+ {
+ }
if (charsRead <= 0)
throw new System.IO.IOException("read past eof");
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/QueryParserTokenManager.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/QueryParserTokenManager.cs index fb20f2d6bcf..e1611b990f2 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/QueryParserTokenManager.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/QueryParser/QueryParserTokenManager.cs @@ -155,7 +155,7 @@ namespace Monodoc.Lucene.Net.QueryParsers ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop:
do
{
@@ -299,7 +299,7 @@ MatchLoop: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -475,7 +475,7 @@ MatchLoop1: int i1 = hiByte >> 6;
ulong l1 = ((ulong) 1L) << (hiByte & 63);
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -632,7 +632,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -686,7 +686,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -718,7 +718,7 @@ MatchLoop1: int i1 = hiByte >> 6;
ulong l1 = ((ulong) 1L) << (hiByte & 63);
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -782,7 +782,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -818,7 +818,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -837,7 +837,7 @@ MatchLoop1: int i1 = hiByte >> 6;
ulong l1 = ((ulong) 1L) << (hiByte & 63);
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -960,7 +960,7 @@ MatchLoop1: ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
MatchLoop1:
do
{
@@ -1014,7 +1014,7 @@ MatchLoop1: }
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
@@ -1046,7 +1046,7 @@ MatchLoop1: int i1 = hiByte >> 6;
ulong l1 = ((ulong) 1L) << (hiByte & 63);
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
MatchLoop1:
do
{
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/BooleanQuery.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/BooleanQuery.cs index 76dbc4212ed..a13bbf19580 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/BooleanQuery.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/BooleanQuery.cs @@ -397,8 +397,8 @@ namespace Monodoc.Lucene.Net.Search /// <summary>Returns a hash code value for this object.</summary>
public override int GetHashCode()
{
- int boostInt = BitConverter.ToInt32(BitConverter.GetBytes(GetBoost()), 0); - return boostInt ^ clauses.GetHashCode(); + int boostInt = BitConverter.ToInt32(BitConverter.GetBytes(GetBoost()), 0);
+ return boostInt ^ clauses.GetHashCode();
}
}
}
\ No newline at end of file diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/PhraseQuery.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/PhraseQuery.cs index e464093a125..6e6eb52edcf 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/PhraseQuery.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/PhraseQuery.cs @@ -333,10 +333,10 @@ namespace Monodoc.Lucene.Net.Search /// <summary>Returns a hash code value for this object.</summary>
public override int GetHashCode()
{
- return System.BitConverter.ToInt32(System.BitConverter.GetBytes(GetBoost()), 0) ^ - System.BitConverter.ToInt32(System.BitConverter.GetBytes(slop), 0) ^ - terms.GetHashCode() ^ - positions.GetHashCode(); + return System.BitConverter.ToInt32(System.BitConverter.GetBytes(GetBoost()), 0) ^
+ System.BitConverter.ToInt32(System.BitConverter.GetBytes(slop), 0) ^
+ terms.GetHashCode() ^
+ positions.GetHashCode();
}
override public System.Object Clone()
{
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/Query.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/Query.cs index a46b62905ea..8b21d7f1d56 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/Query.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Search/Query.cs @@ -128,10 +128,10 @@ namespace Monodoc.Lucene.Net.Search }
}
- BooleanQuery result = new BooleanQuery(); - foreach (BooleanClause booleanClause in allClauses.Keys) - { - result.Add(booleanClause); + BooleanQuery result = new BooleanQuery();
+ foreach (BooleanClause booleanClause in allClauses.Keys)
+ {
+ result.Add(booleanClause);
}
return result;
}
diff --git a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Store/FSDirectory.cs b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Store/FSDirectory.cs index 12ecac3c0dd..9550da47f71 100644 --- a/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Store/FSDirectory.cs +++ b/mcs/tools/monodoc/Lucene.Net/Lucene.Net/Store/FSDirectory.cs @@ -601,10 +601,10 @@ namespace Monodoc.Lucene.Net.Store /* DEBUG */
// {{Aroush
public long position;
- public Descriptor(FSInputStream enclosingInstance, System.IO.FileInfo file, System.IO.FileAccess fileAccess) - : base(new System.IO.FileStream(file.FullName, System.IO.FileMode.Open, fileAccess, System.IO.FileShare.ReadWrite)) - { - } + public Descriptor(FSInputStream enclosingInstance, System.IO.FileInfo file, System.IO.FileAccess fileAccess)
+ : base(new System.IO.FileStream(file.FullName, System.IO.FileMode.Open, fileAccess, System.IO.FileShare.ReadWrite))
+ {
+ }
//{{}}// public Descriptor(FSInputStream enclosingInstance, System.IO.FileInfo file, System.String mode) : base(file, mode)
//{{}}// {
@@ -707,7 +707,7 @@ namespace Monodoc.Lucene.Net.Store public FSOutputStream(System.IO.FileInfo path)
{
- file = new System.IO.BinaryWriter(new System.IO.FileStream(path.FullName, System.IO.FileMode.OpenOrCreate, System.IO.FileAccess.Write, System.IO.FileShare.ReadWrite)); + file = new System.IO.BinaryWriter(new System.IO.FileStream(path.FullName, System.IO.FileMode.OpenOrCreate, System.IO.FileAccess.Write, System.IO.FileShare.ReadWrite));
}
/// <summary>output methods: </summary>
diff --git a/mcs/tools/monodoc/Lucene.Net/Test/Analysis/TestStopAnalyzer.cs b/mcs/tools/monodoc/Lucene.Net/Test/Analysis/TestStopAnalyzer.cs index 99d9d11420e..e788bf17caa 100644 --- a/mcs/tools/monodoc/Lucene.Net/Test/Analysis/TestStopAnalyzer.cs +++ b/mcs/tools/monodoc/Lucene.Net/Test/Analysis/TestStopAnalyzer.cs @@ -63,11 +63,11 @@ namespace Lucene.Net.Analysis stopWordsSet.Add("analyzer", "analyzer");
// {{Aroush how can we copy 'stopWordsSet' to 'System.String[]'?
- System.String[] arrStopWordsSet = new System.String[3]; - arrStopWordsSet[0] = "good"; - arrStopWordsSet[1] = "test"; - arrStopWordsSet[2] = "analyzer"; - // Aroush}} + System.String[] arrStopWordsSet = new System.String[3];
+ arrStopWordsSet[0] = "good";
+ arrStopWordsSet[1] = "test";
+ arrStopWordsSet[2] = "analyzer";
+ // Aroush}}
StopAnalyzer newStop = new StopAnalyzer(arrStopWordsSet);
System.IO.StringReader reader = new System.IO.StringReader("This is a good test of the english stop analyzer");
diff --git a/mcs/tools/security/.gitattributes b/mcs/tools/security/.gitattributes index b22622f4cae..5e22e9a3ccf 100644 --- a/mcs/tools/security/.gitattributes +++ b/mcs/tools/security/.gitattributes @@ -1,3 +1 @@ /.cvsignore -crlf -/permview.cs -crlf -/signcode.cs -crlf diff --git a/mcs/tools/security/permview.cs b/mcs/tools/security/permview.cs index 0f20d1f880d..cfe379c11de 100644 --- a/mcs/tools/security/permview.cs +++ b/mcs/tools/security/permview.cs @@ -20,22 +20,22 @@ using Mono.Cecil; [assembly: AssemblyTitle ("Mono PermView")] [assembly: AssemblyDescription ("Managed Permission Viewer for .NET assemblies")] -namespace Mono.Tools {
-
- class SecurityElementComparer : IComparer {
-
- public int Compare (object x, object y)
- {
- SecurityElement sx = (x as SecurityElement);
- SecurityElement sy = (y as SecurityElement);
- if (sx == null)
- return (sy == null) ? 0 : -1;
- else if (sy == null)
- return 1;
-
- // compare by name (type name, method name, action name)
- return String.Compare (sx.Attribute ("Name"), sy.Attribute ("Name"));
- }
+namespace Mono.Tools { + + class SecurityElementComparer : IComparer { + + public int Compare (object x, object y) + { + SecurityElement sx = (x as SecurityElement); + SecurityElement sy = (y as SecurityElement); + if (sx == null) + return (sy == null) ? 0 : -1; + else if (sy == null) + return 1; + + // compare by name (type name, method name, action name) + return String.Compare (sx.Attribute ("Name"), sy.Attribute ("Name")); + } } class PermView { @@ -47,8 +47,8 @@ namespace Mono.Tools { Console.WriteLine ("Usage: permview [options] assembly{0}", Environment.NewLine); Console.WriteLine ("where options are:"); Console.WriteLine (" -output filename Output information into specified file."); - Console.WriteLine (" -decl Show declarative security attributes on classes and methods.");
- Console.WriteLine (" -xml Output in XML format");
+ Console.WriteLine (" -decl Show declarative security attributes on classes and methods."); + Console.WriteLine (" -xml Output in XML format"); Console.WriteLine (" -help Show help informations (this text)"); Console.WriteLine (); } @@ -165,15 +165,15 @@ namespace Mono.Tools { } static SecurityElement AddSecurityXml (SecurityDeclarationCollection declarations) - {
- ArrayList list = new ArrayList ();
- foreach (SecurityDeclaration declsec in declarations) {
- SecurityElement child = new SecurityElement ("Action");
- AddAttribute (child, "Name", declsec.Action.ToString ());
- child.AddChild (declsec.PermissionSet.ToXml ());
- list.Add (child);
- }
- // sort actions
+ { + ArrayList list = new ArrayList (); + foreach (SecurityDeclaration declsec in declarations) { + SecurityElement child = new SecurityElement ("Action"); + AddAttribute (child, "Name", declsec.Action.ToString ()); + child.AddChild (declsec.PermissionSet.ToXml ()); + list.Add (child); + } + // sort actions list.Sort (Comparer); SecurityElement se = new SecurityElement ("Actions"); @@ -181,8 +181,8 @@ namespace Mono.Tools { se.AddChild (child); } return se; - }
-
+ } + static SecurityElementComparer comparer; static IComparer Comparer { get { @@ -193,7 +193,7 @@ namespace Mono.Tools { } static bool ProcessAssemblyXml (TextWriter tw, AssemblyDefinition ad) - {
+ { SecurityElement se = new SecurityElement ("Assembly"); se.AddAttribute ("Name", ad.Name.FullName); @@ -201,7 +201,7 @@ namespace Mono.Tools { se.AddChild (AddSecurityXml (ad.SecurityDeclarations)); } - ArrayList tlist = new ArrayList ();
+ ArrayList tlist = new ArrayList (); ArrayList mlist = new ArrayList (); foreach (ModuleDefinition module in ad.Modules) { @@ -214,13 +214,13 @@ namespace Mono.Tools { SecurityElement typelem = null; if (type.SecurityDeclarations.Count > 0) { typelem = AddSecurityXml (type.SecurityDeclarations); - }
-
- if (mlist.Count > 0)
+ } + + if (mlist.Count > 0) mlist.Clear (); foreach (MethodDefinition method in type.Methods) { - if (method.SecurityDeclarations.Count > 0) {
+ if (method.SecurityDeclarations.Count > 0) { SecurityElement meth = new SecurityElement ("Method"); AddAttribute (meth, "Name", method.ToString ()); meth.AddChild (AddSecurityXml (method.SecurityDeclarations)); @@ -228,14 +228,14 @@ namespace Mono.Tools { } } - // sort methods
- mlist.Sort (Comparer);
- foreach (SecurityElement method in mlist) {
- methods.AddChild (method);
+ // sort methods + mlist.Sort (Comparer); + foreach (SecurityElement method in mlist) { + methods.AddChild (method); } if ((typelem != null) || ((methods.Children != null) && (methods.Children.Count > 0))) { - AddAttribute (klass, "Name", type.ToString ());
+ AddAttribute (klass, "Name", type.ToString ()); if (typelem != null) klass.AddChild (typelem); if ((methods.Children != null) && (methods.Children.Count > 0)) @@ -245,9 +245,9 @@ namespace Mono.Tools { } // sort types - tlist.Sort (Comparer);
- foreach (SecurityElement type in tlist) {
- se.AddChild (type);
+ tlist.Sort (Comparer); + foreach (SecurityElement type in tlist) { + se.AddChild (type); } } diff --git a/mcs/tools/security/signcode.cs b/mcs/tools/security/signcode.cs index f6df11103bc..2e8d475e643 100644 --- a/mcs/tools/security/signcode.cs +++ b/mcs/tools/security/signcode.cs @@ -237,32 +237,32 @@ namespace Mono.Tools { Console.WriteLine ("No certificates available to sign the assembly."); return 1; } - af.Certificates.AddRange (certs);
-
- if (!af.Sign (tbsFilename)) {
- Console.WriteLine ("Couldn't sign file '{0}'.", tbsFilename);
- return 1;
- }
- } else if (af.TimestampUrl != null) {
- bool ts = false;
- // only timestamp an already signed file
- for (int j = 0; j < timestampRetry && !ts; j++) {
- ts = af.Timestamp (tbsFilename);
- // wait (unless it's the last try) and retry
- if (!ts && (j < timestampRetry - 1)) {
- Console.WriteLine ("Couldn't timestamp file '{0}', will retry in {1} ms", tbsFilename, timestampDelay);
- Thread.Sleep (timestampDelay);
- }
- }
- if (!ts) {
- Console.WriteLine ("Couldn't timestamp file '{0}' after {1} retries.", tbsFilename, timestampRetry);
- return 1;
- }
- } else {
- Help ();
- return 1;
- }
-
+ af.Certificates.AddRange (certs); + + if (!af.Sign (tbsFilename)) { + Console.WriteLine ("Couldn't sign file '{0}'.", tbsFilename); + return 1; + } + } else if (af.TimestampUrl != null) { + bool ts = false; + // only timestamp an already signed file + for (int j = 0; j < timestampRetry && !ts; j++) { + ts = af.Timestamp (tbsFilename); + // wait (unless it's the last try) and retry + if (!ts && (j < timestampRetry - 1)) { + Console.WriteLine ("Couldn't timestamp file '{0}', will retry in {1} ms", tbsFilename, timestampDelay); + Thread.Sleep (timestampDelay); + } + } + if (!ts) { + Console.WriteLine ("Couldn't timestamp file '{0}' after {1} retries.", tbsFilename, timestampRetry); + return 1; + } + } else { + Help (); + return 1; + } + Console.WriteLine ("Success"); return 0; } diff --git a/mcs/tools/sqlsharp/gui/gtk-sharp/.gitattributes b/mcs/tools/sqlsharp/gui/gtk-sharp/.gitattributes index 2a18cafef75..b8292be1eef 100644 --- a/mcs/tools/sqlsharp/gui/gtk-sharp/.gitattributes +++ b/mcs/tools/sqlsharp/gui/gtk-sharp/.gitattributes @@ -1,2 +1 @@ /Makefile -crlf -/sqlsharpgtk.cs -crlf diff --git a/mcs/tools/sqlsharp/gui/gtk-sharp/sqlsharpgtk.cs b/mcs/tools/sqlsharp/gui/gtk-sharp/sqlsharpgtk.cs index bb5fd6505b9..adf7b0743ce 100644 --- a/mcs/tools/sqlsharp/gui/gtk-sharp/sqlsharpgtk.cs +++ b/mcs/tools/sqlsharp/gui/gtk-sharp/sqlsharpgtk.cs @@ -156,8 +156,8 @@ namespace Mono.Data.SqlSharp.Gui.GtkSharp editor = new SqlEditorSharp (); editor.UseSyntaxHiLighting = true; editor.View.Show (); - editor.View.KeyPressEvent +=
- new GtkSharp.KeyPressEventHandler(OnKeyPressEventKey);
+ editor.View.KeyPressEvent += + new GtkSharp.KeyPressEventHandler(OnKeyPressEventKey); lastUnknownFile ++; string unknownFile = "Unknown" + @@ -231,20 +231,20 @@ namespace Mono.Data.SqlSharp.Gui.GtkSharp return sw; } - void OnKeyPressEventKey(object o, GtkSharp.KeyPressEventArgs args)
- {
- if (o is TextView) {
- TextView tv = (TextView) o;
- //Gdk.EventKey k = args.Event;
-
- // if the F5 key was pressed
- if (args.Event.keyval == 0xFFC2) {
- if (tv.Editable == true) {
- // execute SQL
- ExecuteSQL (ExecuteOutputType.Normal, "");
- }
- }
- }
+ void OnKeyPressEventKey(object o, GtkSharp.KeyPressEventArgs args) + { + if (o is TextView) { + TextView tv = (TextView) o; + //Gdk.EventKey k = args.Event; + + // if the F5 key was pressed + if (args.Event.keyval == 0xFFC2) { + if (tv.Editable == true) { + // execute SQL + ExecuteSQL (ExecuteOutputType.Normal, ""); + } + } + } } Toolbar CreateToolbar () diff --git a/mono/benchmark/life.cs b/mono/benchmark/life.cs index a0c8d5b0be8..a154fb1c694 100644 --- a/mono/benchmark/life.cs +++ b/mono/benchmark/life.cs @@ -1,15 +1,15 @@ -// created on 03/03/2002 at 15:12 -using System; - -class App { - static String s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15; - static int[] offsets = {-16, -15, -14, -1, 1, 14, 15, 16}; - public static int Main(String[] args) { - int i2 = 500; - int i0; - double n2; - DateTime start, end; - start = DateTime.Now; +// created on 03/03/2002 at 15:12
+using System;
+
+class App {
+ static String s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
+ static int[] offsets = {-16, -15, -14, -1, 1, 14, 15, 16};
+ public static int Main(String[] args) {
+ int i2 = 500;
+ int i0;
+ double n2;
+ DateTime start, end;
+ start = DateTime.Now;
s0 = " ";
s1 = " ";
s2 = " ";
@@ -28,7 +28,7 @@ class App { s15 ="";
s15 = s0+s1+s2+s3+s4+s5+s6+s7+s8+s9+s10+s11+s12+s13+s14;
dump();
- i0 =0;
+ i0 =0;
while (i0++ < i2) {
generate();
dump();
@@ -38,7 +38,7 @@ class App { Console.WriteLine("{0} generations in {1} milliseconds, {2} gen/sec.",
i2, (int)n2, (int)(i2/(n2/1000)));
return 0;
-}
+}
static void generate() {
int i0, i1, i2, i3;
i0 = s15.Length;
@@ -50,7 +50,7 @@ static void generate() { i3 = (offset + i0 + i1) % i0;
if (s15.Substring(i3, 1) == "*")
i2++;
- }
+ }
if (s15.Substring(i1, 1) == "*") {
if (i2 < 2 || i2 > 3) {
s1 += " ";
@@ -71,4 +71,4 @@ static void dump() { ;
}
}
- +
diff --git a/mono/tests/.gitattributes b/mono/tests/.gitattributes index f253eb7e05a..771ad6a586e 100644 --- a/mono/tests/.gitattributes +++ b/mono/tests/.gitattributes @@ -1,6 +1,4 @@ -/appdomain-unload-callback.cs -crlf /bug-335131.2.cs -crlf -/bug-459094.cs -crlf /bug-472600.2.cs -crlf /bug-515884.il -crlf /checked.cs -crlf diff --git a/mono/tests/appdomain-unload-callback.cs b/mono/tests/appdomain-unload-callback.cs index 69db5203193..de44c923bf2 100644 --- a/mono/tests/appdomain-unload-callback.cs +++ b/mono/tests/appdomain-unload-callback.cs @@ -1,4 +1,4 @@ -using System;
+using System; using System.Threading; /* diff --git a/mono/tests/bug-459094.cs b/mono/tests/bug-459094.cs index 5d0362c5b96..28b8d6b5300 100644 --- a/mono/tests/bug-459094.cs +++ b/mono/tests/bug-459094.cs @@ -1,5 +1,5 @@ -using System;
-using System.IO;
+using System; +using System.IO; class Driver { diff --git a/mono/tests/metadata-verifier/module.il b/mono/tests/metadata-verifier/module.il index 23ab4198a5f..025510debf1 100755 --- a/mono/tests/metadata-verifier/module.il +++ b/mono/tests/metadata-verifier/module.il @@ -67,4 +67,4 @@ } // end of class Module.Exported
- +
diff --git a/web/.gitattributes b/web/.gitattributes index 902bce41566..95afab0190a 100644 --- a/web/.gitattributes +++ b/web/.gitattributes @@ -1,11 +1,3 @@ -/ado-net -crlf -/download -crlf /gtk-sharp -crlf /mbas -crlf /mono-beginning-windows.xml -crlf -/mysql -crlf -/odbc -crlf -/pending-classes.in -crlf -/postgresql -crlf -/sqlclient -crlf -/sqlite -crlf diff --git a/web/ado-net b/web/ado-net index 0095d79ef79..abaf7594eae 100644 --- a/web/ado-net +++ b/web/ado-net @@ -75,22 +75,22 @@ <ul> <li>XML Schema Definition tool</li> <ul> - <li><b>XDR to XSD</b> - used to generate an XML schema from an XDR (XML Data Reduced schema) file.
- XDR was used by Microsoft prior to XSD becoming a W3C recommendation. So, this needs
- to be supported for legacy reasons</li>
- <li><b>XML to XSD</b> - used to generate an XML schema from an XML file</li>
- <li><b>XSD to DataSet</b> - used to generate DataSet classes from an XSD schema file. The
- DataSet classes created can then be used with XML data</li>
- <li><b>XSD to Classes</b> - used to generate classes from an XSD schema file. The
- classes created can be used with System.XML.Serialization.XMLSerializer
- to read and write XML code that follows the schema</li>
- <li><b>Classes to XSD</b> - used to generate an XML schema
- from type(s) in a assembly file. The
- XML schema created by the tool defines the XML format used
- by System.XML.Serialization.XMLSerializer</li>
- </ul>
- </li>
- </ul>
+ <li><b>XDR to XSD</b> - used to generate an XML schema from an XDR (XML Data Reduced schema) file. + XDR was used by Microsoft prior to XSD becoming a W3C recommendation. So, this needs + to be supported for legacy reasons</li> + <li><b>XML to XSD</b> - used to generate an XML schema from an XML file</li> + <li><b>XSD to DataSet</b> - used to generate DataSet classes from an XSD schema file. The + DataSet classes created can then be used with XML data</li> + <li><b>XSD to Classes</b> - used to generate classes from an XSD schema file. The + classes created can be used with System.XML.Serialization.XMLSerializer + to read and write XML code that follows the schema</li> + <li><b>Classes to XSD</b> - used to generate an XML schema + from type(s) in a assembly file. The + XML schema created by the tool defines the XML format used + by System.XML.Serialization.XMLSerializer</li> + </ul> + </li> + </ul> </li> </ul> diff --git a/web/download b/web/download index 3992312f61f..6280d1bbe09 100644 --- a/web/download +++ b/web/download @@ -1820,18 +1820,18 @@ </td> </tr> <tr> - <td bgcolor="#999999">
- <b>Windows Setup Wizard (NT/2000/XP)</b>
- <ul>
- <li><a href="archive/mono-0.17-stable.exe">Mono-Setup</a>
- </ul>
- </td>
- <td bgcolor="#999999">
- <b>Debian packages</b>
- <ul>
+ <td bgcolor="#999999"> + <b>Windows Setup Wizard (NT/2000/XP)</b> + <ul> + <li><a href="archive/mono-0.17-stable.exe">Mono-Setup</a> + </ul> + </td> + <td bgcolor="#999999"> + <b>Debian packages</b> + <ul> <li><a href="http://www.atoker.com/mono/">Alp's web site</a> - </ul>
- </td>
+ </ul> + </td> </tr> </table> </td> @@ -1934,24 +1934,24 @@ <tr> <td></td> </tr> -
- <tr bgcolor="#999999">
- <td>
- <b>Windows (win95 friendly)</b>
- <ul>
- <li><a href="archive/mono-w32-Aug_28_2002.zip">Mono-w32</a>
- </ul>
- </td>
- <td bgcolor="#999999">
- <b>Red Hat null-8.0/x86</b>
- <ul>
- <li><a href="archive/redhat-null-i386/libgc-6.1alpha5-1.i386.rpm">libgc-6.1alpha5-1.i386.rpm</a>
- <li><a href="archive/redhat-null-i386/libgc-devel-6.1alpha5-1.i386.rpm">libgc-devel-6.1alpha5-1.i386.rpm</a>
- <li><a href="archive/redhat-null-i386/mono-0.15-1.i386.rpm">mono-0.15-1.i386.rpm</a>
- <li><a href="archive/redhat-null-i386/mono-devel-0.15-1.i386.rpm">mono-devel-0.15-1.i386.rpm</a>
- </ul>
- </td>
- </tr>
+ + <tr bgcolor="#999999"> + <td> + <b>Windows (win95 friendly)</b> + <ul> + <li><a href="archive/mono-w32-Aug_28_2002.zip">Mono-w32</a> + </ul> + </td> + <td bgcolor="#999999"> + <b>Red Hat null-8.0/x86</b> + <ul> + <li><a href="archive/redhat-null-i386/libgc-6.1alpha5-1.i386.rpm">libgc-6.1alpha5-1.i386.rpm</a> + <li><a href="archive/redhat-null-i386/libgc-devel-6.1alpha5-1.i386.rpm">libgc-devel-6.1alpha5-1.i386.rpm</a> + <li><a href="archive/redhat-null-i386/mono-0.15-1.i386.rpm">mono-0.15-1.i386.rpm</a> + <li><a href="archive/redhat-null-i386/mono-devel-0.15-1.i386.rpm">mono-devel-0.15-1.i386.rpm</a> + </ul> + </td> + </tr> </table> </td> </tr> @@ -1,6 +1,6 @@ * mbas: Mono's VisualBasic.NET Compiler.
- MonoBASIC (mbas) is a CIL compiler for the VisualBasic.NET language, + MonoBASIC (mbas) is a CIL compiler for the VisualBasic.NET language,
an extended version of Visual Basic. It's based on the MCS compiler
and still in heavy development, though many language features are
already supported. See mcs/mbas/
@@ -40,7 +40,7 @@ A lot of this stuff is implemented rebuilding proper expressions and
statements on top of the classes based on those of mcs (look at the grammar -
- mb-parser.jay - and compare it with cs-parser.jay, if interested), but some + mb-parser.jay - and compare it with cs-parser.jay, if interested), but some
are getting deeply changed, to better conform to VB.NET semantics.
** TODO-list
@@ -50,8 +50,8 @@ We'd like to implement the missing statements, exception handling,
structures and actual event support (not necessarily in this order). Once we
have all this stuff set up and reasonably bug-free, more work could be done
- on helper functions and Object-vars handling. - - Also work on the supporting library (we don't currently depend on it as much - as MS vbc-compiled programs, but especially for late-binding scenarios we will) + on helper functions and Object-vars handling.
+
+ Also work on the supporting library (we don't currently depend on it as much
+ as MS vbc-compiled programs, but especially for late-binding scenarios we will)
is surely needed: it's in mcs/class/Microsoft.VisualBasic/
diff --git a/web/mysql b/web/mysql index 2449bc1f4e7..45d03c679d8 100755 --- a/web/mysql +++ b/web/mysql @@ -41,21 +41,21 @@ <li>ByteFX.Data.MySqlClient <ul> <li>Build and Runs on Microsoft .NET and Mono</li> - <li>Works with SQL# (command-line and GTK# GUI versions)</li>
- <li>MySQLCommandBuilder now implemented</li>
- <li>Transaction support now implemented (not all table types support this)</li>
- <li>GetSchemaTable fixed to not use xsd (for Mono)</li>
- <li>Driver is now Mono-compatible</li>
- <li>TIME data type now supported</li>
- <li>More work to improve Timestamp data type handling</li>
- <li>Changed signatures of all classes to match corresponding SqlClient classes</li>
- <li>Protocol compression using <a href="http://www.icsharpcode.net/OpenSource/SharpZipLib/default.asp">SharpZipLib</a></li>
- <li>Named pipes on Windows now working properly</li>
- <li>Work done to improve Timestamp data type handling</li>
- <li>Implemented IEnumerable on DataReader so DataGrid would work</li>
- <li>Speed increased dramatically by removing bugging network sync code</li>
- <li>Driver no longer buffers rows of data (more ADO.Net compliant)</li>
- <li>Conversion bugs related to TIMESTAMP and DATETIME fields fixed</li>
+ <li>Works with SQL# (command-line and GTK# GUI versions)</li> + <li>MySQLCommandBuilder now implemented</li> + <li>Transaction support now implemented (not all table types support this)</li> + <li>GetSchemaTable fixed to not use xsd (for Mono)</li> + <li>Driver is now Mono-compatible</li> + <li>TIME data type now supported</li> + <li>More work to improve Timestamp data type handling</li> + <li>Changed signatures of all classes to match corresponding SqlClient classes</li> + <li>Protocol compression using <a href="http://www.icsharpcode.net/OpenSource/SharpZipLib/default.asp">SharpZipLib</a></li> + <li>Named pipes on Windows now working properly</li> + <li>Work done to improve Timestamp data type handling</li> + <li>Implemented IEnumerable on DataReader so DataGrid would work</li> + <li>Speed increased dramatically by removing bugging network sync code</li> + <li>Driver no longer buffers rows of data (more ADO.Net compliant)</li> + <li>Conversion bugs related to TIMESTAMP and DATETIME fields fixed</li> </ul> </li> @@ -134,10 +134,10 @@ <li>Here is a ConnectionString format if you do not have a DSN (have not gotten this to work though): <pre> -"DRIVER={MySQL ODBC 3.51 Driver};" +
-"SERVER=localhost;DATABASE=test;" +
-"UID=myuserid;PASSWORD=mypassword;" +
-"OPTION=3";
+"DRIVER={MySQL ODBC 3.51 Driver};" + +"SERVER=localhost;DATABASE=test;" + +"UID=myuserid;PASSWORD=mypassword;" + +"OPTION=3"; </pre> </li> diff --git a/web/pending-classes.in b/web/pending-classes.in index 1cdb5a4cb36..94da9df3247 100644 --- a/web/pending-classes.in +++ b/web/pending-classes.in @@ -243,4 +243,4 @@ System.Security.Principal.WindowsIdentity System.Security.Principal.WindowsImpersonationContext System.Security.Principal.WindowsPrincipal System.Threading.CompressedStack -
+ diff --git a/web/postgresql b/web/postgresql index 90c3f4f6009..44101316d2a 100644 --- a/web/postgresql +++ b/web/postgresql @@ -62,24 +62,24 @@ <ul> <li>Builds and Runs on both Microsoft .NET and Mono.</li> <li>Works using SQL# (command-line and GTK# versions)</li> - <li>You can send insert, update, delete queries
- through NpgsqlCommand.ExecuteNonQuery() method.</li>
- <li>You can send queries like, select count(*) from table, select version()
- with NpgsqlCommand.ExecuteScalar() method.</li>
- <li>There is logging support. (Thanks Dave Page)
- To use it, place code like that in your program:</li>
-
-<pre>
- // Enable logging.
- NpgsqlEventLog.Level = LogLevel.Debug; // LogLevel.
- NpgsqlEventLog.LogName = "NpgsqlTests.LogFile"; // LogFile.
-</pre>
-
- <li>You can use Npgsql with Mono (Thanks Kristis Makris). It is not working perfectly.</li>
- <li>There is a winforms test suite (Thanks Dave Page).</li>
- <li>Clearer code in NpgsqlConnection removing *magic* numbers and constants. (Thanks Kristis Makris)</li>
- <li>Better support of ODBC-like ConnectionString in NpgsqlConnection (Thanks Dave Page)</li>
- <li>Thanks Ulrich Sprick for all discussion and ideas.</li>
+ <li>You can send insert, update, delete queries + through NpgsqlCommand.ExecuteNonQuery() method.</li> + <li>You can send queries like, select count(*) from table, select version() + with NpgsqlCommand.ExecuteScalar() method.</li> + <li>There is logging support. (Thanks Dave Page) + To use it, place code like that in your program:</li> + +<pre> + // Enable logging. + NpgsqlEventLog.Level = LogLevel.Debug; // LogLevel. + NpgsqlEventLog.LogName = "NpgsqlTests.LogFile"; // LogFile. +</pre> + + <li>You can use Npgsql with Mono (Thanks Kristis Makris). It is not working perfectly.</li> + <li>There is a winforms test suite (Thanks Dave Page).</li> + <li>Clearer code in NpgsqlConnection removing *magic* numbers and constants. (Thanks Kristis Makris)</li> + <li>Better support of ODBC-like ConnectionString in NpgsqlConnection (Thanks Dave Page)</li> + <li>Thanks Ulrich Sprick for all discussion and ideas.</li> </ul> </li> diff --git a/web/sqlclient b/web/sqlclient index eca4906cbe3..d28169bcdbd 100755 --- a/web/sqlclient +++ b/web/sqlclient @@ -92,25 +92,25 @@ MSDE 2000, make sure you have the special Service Pack 3 for MSDE 2000. You can get it from <a href="http://www.microsoft.com/sql/downloads/2000/sp3.asp">here</a></li> - <li>For those that only have MSDE installed. You can change the authentication mode
- from Windows Only Authentication to SQL Server and Windows Authentications (also knows as Mixed-mode authentication)
- via the <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q322336&sd=tech#4">registry</a></li>. It is
- the LoginMode you need to change. By default,
- MSDE is installed with Windows Only Authentication. If you want SqlClient to work with MSDE via SQL Server authentication, you will
- need to change the setting. Otherwise, you wil have to use NT Authentication.</a>
-
- <li>If using MSDE, you might need to create a new user with password. Give
- this user access to various databases in this MSDE instance. Also, for each
- database, give this new user at least SELECT access to the various tables you want
- to retrieve data from.</li>
-
- <li>If you have Enterprise Manager, you can easily change the authentication mode
- for both MSDE and Microsoft SQL Server. To change the authentication mode in
- Enterprise Mananger, select the instance, right-click on it, and select properites.
- The SQL Server properties dialog for that instance will pop up. Choose the Security
- tab. Change the Authentication from Windows Only to SQL Server and Windows. If
- the instance of your database does not show up in Enterprise Manager, Register first
- by selecting the Action menu and choosing New SQL Server Registration.</li>
+ <li>For those that only have MSDE installed. You can change the authentication mode + from Windows Only Authentication to SQL Server and Windows Authentications (also knows as Mixed-mode authentication) + via the <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q322336&sd=tech#4">registry</a></li>. It is + the LoginMode you need to change. By default, + MSDE is installed with Windows Only Authentication. If you want SqlClient to work with MSDE via SQL Server authentication, you will + need to change the setting. Otherwise, you wil have to use NT Authentication.</a> + + <li>If using MSDE, you might need to create a new user with password. Give + this user access to various databases in this MSDE instance. Also, for each + database, give this new user at least SELECT access to the various tables you want + to retrieve data from.</li> + + <li>If you have Enterprise Manager, you can easily change the authentication mode + for both MSDE and Microsoft SQL Server. To change the authentication mode in + Enterprise Mananger, select the instance, right-click on it, and select properites. + The SQL Server properties dialog for that instance will pop up. Choose the Security + tab. Change the Authentication from Windows Only to SQL Server and Windows. If + the instance of your database does not show up in Enterprise Manager, Register first + by selecting the Action menu and choosing New SQL Server Registration.</li> <li>Located at mcs/class/System.Data/Test is a test for System.Data.SqlClient named SqlTest.cs and you could use this as a basis for your test.</li> diff --git a/web/sqlite b/web/sqlite index 8c866571c4e..88a2f99d60b 100755 --- a/web/sqlite +++ b/web/sqlite @@ -5,15 +5,15 @@ the <a href"http://www.hwaci.com/sw/sqlite/">SQL Lite</a> which is an embeddable SQL database engine</li> - <li>From the SQL Lite web page: SQLite is a C library that
- implements an embeddable SQL database engine. Programs that link with
- the SQLite library can have SQL database access without
- running a separate RDBMS process. The distribution
- comes with a standalone command-line access program (sqlite) that
- can be used to administer an SQLite database and which serves
- as an example of how to use the SQLite library. SQLite is not a client library
- used to connect to a big database server. SQLite is the server. The SQLite
- library reads and writes directly to and from the database files on disk.</li>
+ <li>From the SQL Lite web page: SQLite is a C library that + implements an embeddable SQL database engine. Programs that link with + the SQLite library can have SQL database access without + running a separate RDBMS process. The distribution + comes with a standalone command-line access program (sqlite) that + can be used to administer an SQLite database and which serves + as an example of how to use the SQLite library. SQLite is not a client library + used to connect to a big database server. SQLite is the server. The SQLite + library reads and writes directly to and from the database files on disk.</li> <li>SQL Lite can be downloaded from <a href="http://www.hwaci.com/sw/sqlite/download.html">here</a>. |