Monotone-Parent: 0575b0625d349718d3a000c6d46cac95612e6cfb

Monotone-Revision: 5bcd57a0e5cbbcf8047ad1d76568d8c74ced2932

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-18T22:36:00
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2010-02-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* Tools/SOGoToolRestore.m (+initialize): removed method.
+	(-run): make use of the newly publicized SOGoProductLoader for
+	loading needed products.
+
 	* SoObjects/SOGo/SOGoProductLoader.m (-loadAllProducts): new name
 	for "loadProducts". Do not list product directories where no
 	products were loaded.

Tools/SOGoToolRestore.m

@@ -34,10 +34,11 @@
 #import <GDLContentStore/NSURL+GCS.h>
 
 #import <Appointments/iCalEntityObject+SOGo.h>
-#import <SOGo/SOGoUserManager.h>
 #import <SOGo/NSArray+Utilities.h>
+#import <SOGo/SOGoProductLoader.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
+#import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoUserProfile.h>
 #import <SOGo/SOGoUserSettings.h>
 
@@ -54,20 +55,6 @@
 
 @implementation SOGoToolRestore
 
-+ (void) initialize
-{
-  NGBundleManager *bm;
-
-  /* we need to load the SOGo bundles here because OGoContentStore make use of
-     certain categories found therein */
-  bm = [NGBundleManager defaultBundleManager];
-  [bm setBundleSearchPaths: [NSArray arrayWithObject: SOGO_LIBDIR]];
-  [[bm bundleWithName: @"Appointments" type: @"SOGo"] load];
-  [[bm bundleWithName: @"Contacts" type: @"SOGo"] load];
-
-  [iCalEntityObject initializeSOGoExtensions];
-}
-
 + (NSString *) command
 {
   return @"restore";
@@ -591,6 +578,12 @@
 
 - (BOOL) run
 {
+  [[SOGoProductLoader productLoader]
+    loadProducts: [NSArray arrayWithObjects: @"Contacts.SOGo",
+                           @"Appointments.SOGo",
+                           nil]];
+  [iCalEntityObject initializeSOGoExtensions];
+
   return ([self parseArguments] && [self proceed]);
 }