diff options
| -rw-r--r-- | mcs/class/System/System.IO/ChangeLog | 10 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/ErrorEventHandler.cs | 10 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/FileSystemEventHandler.cs | 10 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/FileSystemWatcher.cs | 8 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/InvalidDataException.cs | 9 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/NotifyFilters.cs | 10 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/RenamedEventHandler.cs | 10 | ||||
| -rw-r--r-- | mcs/class/System/System.IO/WatcherChangeTypes.cs | 10 |
8 files changed, 44 insertions, 33 deletions
diff --git a/mcs/class/System/System.IO/ChangeLog b/mcs/class/System/System.IO/ChangeLog index 5a386a85d2b..a6aff6fdca3 100644 --- a/mcs/class/System/System.IO/ChangeLog +++ b/mcs/class/System/System.IO/ChangeLog @@ -1,3 +1,13 @@ +2006-11-01 Sebastien Pouliot <sebastien@ximian.com> + + * 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 <gonzalo@ximian.com> * InotifyWatcher.cs: workaround for a weird case. Someone is watching diff --git a/mcs/class/System/System.IO/ErrorEventHandler.cs b/mcs/class/System/System.IO/ErrorEventHandler.cs index d027c15f693..8a63af40552 100644 --- a/mcs/class/System/System.IO/ErrorEventHandler.cs +++ b/mcs/class/System/System.IO/ErrorEventHandler.cs @@ -5,8 +5,7 @@ // Tim Coleman (tim@timcoleman.com)
//
// 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);
}
diff --git a/mcs/class/System/System.IO/FileSystemEventHandler.cs b/mcs/class/System/System.IO/FileSystemEventHandler.cs index f91b5d2a32a..9f453f325e5 100644 --- a/mcs/class/System/System.IO/FileSystemEventHandler.cs +++ b/mcs/class/System/System.IO/FileSystemEventHandler.cs @@ -5,8 +5,7 @@ // Tim Coleman (tim@timcoleman.com)
//
// 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);
}
diff --git a/mcs/class/System/System.IO/FileSystemWatcher.cs b/mcs/class/System/System.IO/FileSystemWatcher.cs index 2dba82cd9e6..047492ce32b 100644 --- a/mcs/class/System/System.IO/FileSystemWatcher.cs +++ b/mcs/class/System/System.IO/FileSystemWatcher.cs @@ -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 @@ using System.Threading; namespace System.IO { [DefaultEvent("Changed")] +#if NET_2_0 + [IODescription ("")] +#endif public class FileSystemWatcher : Component, ISupportInitialize { #region Fields @@ -317,6 +320,9 @@ namespace System.IO { [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; } diff --git a/mcs/class/System/System.IO/InvalidDataException.cs b/mcs/class/System/System.IO/InvalidDataException.cs index e64d90c3f95..2deb63bdd2b 100644 --- a/mcs/class/System/System.IO/InvalidDataException.cs +++ b/mcs/class/System/System.IO/InvalidDataException.cs @@ -5,7 +5,7 @@ // Christopher James Lahey <clahey@ximian.com> // Andreas Nahr (ClassDevelopment@A-SoftTech.com) // -// (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 @@ using System.Runtime.Serialization; namespace System.IO { [Serializable] - public class InvalidDataException : SystemException + public sealed class InvalidDataException : SystemException { const int Result = unchecked ((int)0x80131503); @@ -38,11 +38,6 @@ namespace System.IO { HResult = Result; } - - protected InvalidDataException (SerializationInfo info, StreamingContext context) - : base (info, context) - { - } } } diff --git a/mcs/class/System/System.IO/NotifyFilters.cs b/mcs/class/System/System.IO/NotifyFilters.cs index 441302dfbe4..003783c7657 100644 --- a/mcs/class/System/System.IO/NotifyFilters.cs +++ b/mcs/class/System/System.IO/NotifyFilters.cs @@ -5,8 +5,7 @@ // Tim Coleman (tim@timcoleman.com)
//
// 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,
diff --git a/mcs/class/System/System.IO/RenamedEventHandler.cs b/mcs/class/System/System.IO/RenamedEventHandler.cs index 33b49680274..975a8211371 100644 --- a/mcs/class/System/System.IO/RenamedEventHandler.cs +++ b/mcs/class/System/System.IO/RenamedEventHandler.cs @@ -5,8 +5,7 @@ // Tim Coleman (tim@timcoleman.com)
//
// 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);
}
diff --git a/mcs/class/System/System.IO/WatcherChangeTypes.cs b/mcs/class/System/System.IO/WatcherChangeTypes.cs index d3ac6624b4e..dc6d9fddded 100644 --- a/mcs/class/System/System.IO/WatcherChangeTypes.cs +++ b/mcs/class/System/System.IO/WatcherChangeTypes.cs @@ -5,8 +5,7 @@ // Tim Coleman (tim@timcoleman.com)
//
// 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,
|