[f-spot: 12/16] Removed duplication in exception handling code
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot: 12/16] Removed duplication in exception handling code
- Date: Tue, 25 May 2010 12:49:11 +0000 (UTC)
commit 657b294b5757315d0b7d8eacd9be1a40fe7d9436
Author: Anton Keks <anton azib net>
Date: Mon Aug 3 20:10:32 2009 +0300
Removed duplication in exception handling code
src/PhotoVersionCommands.cs | 73 +++++++++++-------------------------------
1 files changed, 19 insertions(+), 54 deletions(-)
---
diff --git a/src/PhotoVersionCommands.cs b/src/PhotoVersionCommands.cs
index eccb9bf..322e507 100644
--- a/src/PhotoVersionCommands.cs
+++ b/src/PhotoVersionCommands.cs
@@ -106,21 +106,11 @@ public class PhotoVersionCommands
try {
photo.DefaultVersionId = photo.CreateVersion (name, photo.DefaultVersionId, true);
store.Commit (photo);
+ return true;
} catch (Exception e) {
- string msg = Catalog.GetString ("Could not create a new version");
- string desc = String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to create version \"{1}\""),
- e.Message, name);
-
- HigMessageDialog md = new HigMessageDialog (parent_window, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, ButtonsType.Ok,
- msg,
- desc);
- md.Run ();
- md.Destroy ();
- return false;
+ HandleException ("Could not create a new version", e, parent_window);
+ return false;
}
-
- return true;
}
}
@@ -141,17 +131,8 @@ public class PhotoVersionCommands
return true;
}
} catch (Exception e) {
- Log.DebugException (e);
- msg = Catalog.GetString ("Could not delete a version");
- desc = String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to delete version \"{1}\""),
- e.Message, photo.Name);
-
- HigMessageDialog md = new HigMessageDialog (parent_window, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, ButtonsType.Ok, msg, desc);
- md.Run ();
- md.Destroy ();
+ HandleException ("Could not delete a version", e, parent_window);
}
-
return false;
}
}
@@ -173,21 +154,11 @@ public class PhotoVersionCommands
try {
photo.RenameVersion (photo.DefaultVersionId, new_name);
store.Commit (photo);
+ return true;
} catch (Exception e) {
- string msg = Catalog.GetString ("Could not rename a version");
- string desc = String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to rename version to \"{1}\""),
- e.Message, new_name);
-
- HigMessageDialog md = new HigMessageDialog (parent_window, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, ButtonsType.Ok,
- msg,
- desc);
- md.Run ();
- md.Destroy ();
- return false;
+ HandleException ("Could not rename a version", e, parent_window);
+ return false;
}
-
- return true;
}
}
@@ -210,16 +181,8 @@ public class PhotoVersionCommands
return true;
}
} catch (Exception e) {
- Log.DebugException (e);
- msg = Catalog.GetString ("Could not detach a version");
- desc = String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to detach version \"{1}\""),
- e.Message, photo.Name);
- HigMessageDialog md = new HigMessageDialog (parent_window, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, ButtonsType.Ok, msg, desc);
- md.Run ();
- md.Destroy ();
+ HandleException ("Could not detach a version", e, parent_window);
}
-
return false;
}
}
@@ -264,17 +227,19 @@ public class PhotoVersionCommands
}
}
catch (Exception e) {
- Log.DebugException (e);
- msg = Catalog.GetString ("Could not reparent photos");
- desc = String.Format (Catalog.GetString ("Received exception \"{0}\" while reparenting."),
- e.Message, new_parent.Name);
- HigMessageDialog md = new HigMessageDialog (parent_window, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, ButtonsType.Ok, msg, desc);
- md.Run ();
- md.Destroy ();
+ HandleException ("Could not reparent photos", e, parent_window);
}
-
return false;
}
}
+
+ private static void HandleException (string msg, Exception e, Gtk.Window parent_window) {
+ Log.DebugException (e);
+ msg = Catalog.GetString (msg);
+ string desc = String.Format (Catalog.GetString ("Received exception \"{0}\"."), e.Message);
+ HigMessageDialog md = new HigMessageDialog (parent_window, DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error, ButtonsType.Ok, msg, desc);
+ md.Run ();
+ md.Destroy ();
+ }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]