Changeset 1829

Timestamp:

2/12/2010 6:24:18 AM (3 years ago)

Author:

lowjoel

Message:

When we load a task list from the stream the stream may not be valid. If so, throw an InvalidDataException? instead. This prevents exceptions which are specific to the implementation of the Executor class from letting its exceptions bubble up the stack.

Location:

trunk/eraser6

Files:

• Eraser.Manager/DirectExecutor.cs (modified) (1 diff)
• Eraser.Manager/Executor.cs (modified) (1 diff)
• Eraser/MainForm.cs (modified) (1 diff)
• Eraser/Program.cs (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (1 diff)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -958 +958 @@
                     StreamingContextStates.All, Owner);
                 BinaryFormatter formatter = new BinaryFormatter(null, context);
-                List<Task> deserialised = (List<Task>)formatter.Deserialize(stream);
-                list.AddRange(deserialised);
-
-                foreach (Task task in deserialised)
-                {
-                    Owner.OnTaskAdded(new TaskEventArgs(task));
-                    if (task.Schedule is RecurringSchedule)
-                        Owner.ScheduleTask(task);
+
+                try
+                {
+                    List<Task> deserialised = (List<Task>)formatter.Deserialize(stream);
+                    list.AddRange(deserialised);
+
+                    foreach (Task task in deserialised)
+                    {
+                        Owner.OnTaskAdded(new TaskEventArgs(task));
+                        if (task.Schedule is RecurringSchedule)
+                            Owner.ScheduleTask(task);
+                    }
+                }
+                catch (FileLoadException e)
+                {
+                    throw new InvalidDataException(e.Message, e);
+                }
+                catch (SerializationException e)
+                {
+                    throw new InvalidDataException(e.Message, e);
                 }
             }

trunk/eraser6/Eraser.Manager/Executor.cs

@@ -177 +177 @@
         /// tasks instead of overwriting it.</remarks>
         /// <param name="stream">The stream to save to.</param>
+        /// <exception cref="InvalidDataException">Thrown when the data in the stream is
+        /// invalid or unrecognised.</exception>
         public abstract void LoadFromStream(Stream stream);
 

trunk/eraser6/Eraser/MainForm.cs

@@ -266 +266 @@
                             Program.eraserClient.Tasks.LoadFromStream(stream);
                         }
-                        catch (FileLoadException ex)
-                        {
-                            MessageBox.Show(S._("The task list could not be imported. The error " +
-                                "returned was: {0}", ex.Message), S._("Eraser"),
-                                MessageBoxButtons.OK, MessageBoxIcon.Error,
-                                MessageBoxDefaultButton.Button1,
-                                Localisation.IsRightToLeft(this) ?
-                                    MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
-                        }
-                        catch (SerializationException ex)
+                        catch (InvalidDataException ex)
                         {
                             MessageBox.Show(S._("The task list could not be imported. The error " +

trunk/eraser6/Eraser/Program.cs

@@ -519 +519 @@
                 }
             }
-            catch (SerializationException ex)
+            catch (InvalidDataException ex)
             {
                 File.Delete(TaskListPath);

trunk/eraser6/Eraser/SchedulerPanel.cs

@@ -436 +436 @@
                                 Program.eraserClient.Tasks.LoadFromStream(stream);
                             }
-                            catch (SerializationException ex)
+                            catch (InvalidDataException ex)
                             {
                                 MessageBox.Show(S._("Could not import task list from {0}. The " +