Author: spouliot
Date: 2006-11-01 09:20:11 -0500 (Wed, 01 Nov 2006)
New Revision: 67219
Modified:
trunk/mcs/class/System/System.IO/ChangeLog
trunk/mcs/class/System/System.IO/ErrorEventHandler.cs
trunk/mcs/class/System/System.IO/FileSystemEventHandler.cs
trunk/mcs/class/System/System.IO/FileSystemWatcher.cs
trunk/mcs/class/System/System.IO/InvalidDataException.cs
trunk/mcs/class/System/System.IO/NotifyFilters.cs
trunk/mcs/class/System/System.IO/RenamedEventHandler.cs
trunk/mcs/class/System/System.IO/WatcherChangeTypes.cs
Log:
2006-11-01 Sebastien Pouliot <[EMAIL PROTECTED]>
* ErrorEventHandler.cs: Remove [Serializable] in NET_2_0.
* FileSystemEventHandler.cs: Remove [Serializable] in NET_2_0.
* FileSystemWatcher.cs: Add missing attributes for NET_2_0.
* InvalidDataException.cs: Seal class and remove serialization ctor.
* NotifyFilters.cs: Remove [Serializable] in NET_2_0.
* RenamedEventHandler.cs: Remove [Serializable] in NET_2_0.
* WatcherChangeTypes.cs: Remove [Serializable] in NET_2_0.
Modified: trunk/mcs/class/System/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.IO/ChangeLog 2006-11-01 14:03:44 UTC (rev
67218)
+++ trunk/mcs/class/System/System.IO/ChangeLog 2006-11-01 14:20:11 UTC (rev
67219)
@@ -1,3 +1,13 @@
+2006-11-01 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * ErrorEventHandler.cs: Remove [Serializable] in NET_2_0.
+ * FileSystemEventHandler.cs: Remove [Serializable] in NET_2_0.
+ * FileSystemWatcher.cs: Add missing attributes for NET_2_0.
+ * InvalidDataException.cs: Seal class and remove serialization ctor.
+ * NotifyFilters.cs: Remove [Serializable] in NET_2_0.
+ * RenamedEventHandler.cs: Remove [Serializable] in NET_2_0.
+ * WatcherChangeTypes.cs: Remove [Serializable] in NET_2_0.
+
2006-10-04 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* InotifyWatcher.cs: workaround for a weird case. Someone is watching
Modified: trunk/mcs/class/System/System.IO/ErrorEventHandler.cs
===================================================================
--- trunk/mcs/class/System/System.IO/ErrorEventHandler.cs 2006-11-01
14:03:44 UTC (rev 67218)
+++ trunk/mcs/class/System/System.IO/ErrorEventHandler.cs 2006-11-01
14:20:11 UTC (rev 67219)
@@ -5,8 +5,7 @@
// Tim Coleman ([EMAIL PROTECTED])
//
// Copyright (C) Tim Coleman, 2002
-//
-
+// Copyright (C) 2006 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
@@ -28,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+namespace System.IO {
-namespace System.IO {
- [Serializable]
+#if ONLY_1_1
+ [Serializable]
+#endif
public delegate void ErrorEventHandler (object sender, ErrorEventArgs
e);
}
Modified: trunk/mcs/class/System/System.IO/FileSystemEventHandler.cs
===================================================================
--- trunk/mcs/class/System/System.IO/FileSystemEventHandler.cs 2006-11-01
14:03:44 UTC (rev 67218)
+++ trunk/mcs/class/System/System.IO/FileSystemEventHandler.cs 2006-11-01
14:20:11 UTC (rev 67219)
@@ -5,8 +5,7 @@
// Tim Coleman ([EMAIL PROTECTED])
//
// Copyright (C) Tim Coleman, 2002
-//
-
+// Copyright (C) 2006 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
@@ -28,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace System.IO {
- [Serializable]
+
+#if ONLY_1_1
+ [Serializable]
+#endif
public delegate void FileSystemEventHandler (object sender,
FileSystemEventArgs e);
}
Modified: trunk/mcs/class/System/System.IO/FileSystemWatcher.cs
===================================================================
--- trunk/mcs/class/System/System.IO/FileSystemWatcher.cs 2006-11-01
14:03:44 UTC (rev 67218)
+++ trunk/mcs/class/System/System.IO/FileSystemWatcher.cs 2006-11-01
14:20:11 UTC (rev 67219)
@@ -7,7 +7,7 @@
//
// Copyright (C) Tim Coleman, 2002
// (c) 2003 Ximian, Inc. (http://www.ximian.com)
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
//
//
@@ -39,6 +39,9 @@
namespace System.IO {
[DefaultEvent("Changed")]
+#if NET_2_0
+ [IODescription ("")]
+#endif
public class FileSystemWatcher : Component, ISupportInitialize {
#region Fields
@@ -317,6 +320,9 @@
[DefaultValue(null)]
[IODescription("The object used to marshal the event handler
calls resulting from a directory change")]
+#if NET_2_0
+ [Browsable (false)]
+#endif
public ISynchronizeInvoke SynchronizingObject {
get { return synchronizingObject; }
set { synchronizingObject = value; }
Modified: trunk/mcs/class/System/System.IO/InvalidDataException.cs
===================================================================
--- trunk/mcs/class/System/System.IO/InvalidDataException.cs 2006-11-01
14:03:44 UTC (rev 67218)
+++ trunk/mcs/class/System/System.IO/InvalidDataException.cs 2006-11-01
14:20:11 UTC (rev 67219)
@@ -5,7 +5,7 @@
// Christopher James Lahey <[EMAIL PROTECTED]>
// Andreas Nahr ([EMAIL PROTECTED])
//
-// (C) 2004 Novell, Inc. http://www.novell.com
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
//
#if NET_2_0
@@ -16,7 +16,7 @@
namespace System.IO
{
[Serializable]
- public class InvalidDataException : SystemException
+ public sealed class InvalidDataException : SystemException
{
const int Result = unchecked ((int)0x80131503);
@@ -38,11 +38,6 @@
{
HResult = Result;
}
-
- protected InvalidDataException (SerializationInfo info,
StreamingContext context)
- : base (info, context)
- {
- }
}
}
Modified: trunk/mcs/class/System/System.IO/NotifyFilters.cs
===================================================================
--- trunk/mcs/class/System/System.IO/NotifyFilters.cs 2006-11-01 14:03:44 UTC
(rev 67218)
+++ trunk/mcs/class/System/System.IO/NotifyFilters.cs 2006-11-01 14:20:11 UTC
(rev 67219)
@@ -5,8 +5,7 @@
// Tim Coleman ([EMAIL PROTECTED])
//
// Copyright (C) Tim Coleman, 2002
-//
-
+// Copyright (C) 2006 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
@@ -28,11 +27,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+namespace System.IO {
-namespace System.IO {
[Flags]
- [Serializable]
+#if ONLY_1_1
+ [Serializable]
+#endif
public enum NotifyFilters {
Attributes = 4,
CreationTime = 64,
Modified: trunk/mcs/class/System/System.IO/RenamedEventHandler.cs
===================================================================
--- trunk/mcs/class/System/System.IO/RenamedEventHandler.cs 2006-11-01
14:03:44 UTC (rev 67218)
+++ trunk/mcs/class/System/System.IO/RenamedEventHandler.cs 2006-11-01
14:20:11 UTC (rev 67219)
@@ -5,8 +5,7 @@
// Tim Coleman ([EMAIL PROTECTED])
//
// Copyright (C) Tim Coleman, 2002
-//
-
+// Copyright (C) 2006 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
@@ -28,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace System.IO {
- [Serializable]
+
+#if ONLY_1_1
+ [Serializable]
+#endif
public delegate void RenamedEventHandler (object sender,
RenamedEventArgs e);
}
Modified: trunk/mcs/class/System/System.IO/WatcherChangeTypes.cs
===================================================================
--- trunk/mcs/class/System/System.IO/WatcherChangeTypes.cs 2006-11-01
14:03:44 UTC (rev 67218)
+++ trunk/mcs/class/System/System.IO/WatcherChangeTypes.cs 2006-11-01
14:20:11 UTC (rev 67219)
@@ -5,8 +5,7 @@
// Tim Coleman ([EMAIL PROTECTED])
//
// Copyright (C) Tim Coleman, 2002
-//
-
+// Copyright (C) 2006 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
@@ -28,11 +27,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace System.IO {
+
[Flags]
- [Serializable]
+#if ONLY_1_1
+ [Serializable]
+#endif
public enum WatcherChangeTypes {
All = 0xF,
Changed = 4,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches