[Bedework-commit] dumprestore r156 - trunk/src/org/bedework/dumprestore/restore

[svnadmin at bedework.org]

Author: douglm
Date: 2007-09-10 14:36:05 -0400 (Mon, 10 Sep 2007)
New Revision: 156

Modified:
   trunk/src/org/bedework/dumprestore/restore/HibRestore.java
Log:
Move system parameters processing out of CalIntf. 

Needed this to get around some problems introduced with the last round of changes. Ity's also appropriate.

Modified: trunk/src/org/bedework/dumprestore/restore/HibRestore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2007-09-04 02:00:10 UTC (rev 155)
+++ trunk/src/org/bedework/dumprestore/restore/HibRestore.java	2007-09-10 18:36:05 UTC (rev 156)
@@ -87,6 +87,7 @@
 import org.bedework.calfacade.svc.BwView;
 import org.bedework.calfacade.svc.EventInfo;
 import org.bedework.calfacade.svc.prefs.BwPreferences;
+import org.bedework.calfacade.util.AccessUtilI;
 import org.bedework.dumprestore.BwDbLastmod;
 
 import java.sql.Connection;
@@ -160,8 +161,7 @@
     }
 
     access = new AccessUtil();
-    access.init(globals.config.getDebug());
-    access.setSyspars(globals.syspars);
+    access.init(new AccessUtilCb(), globals.config.getDebug());
     access.setAuthUser(user);
     access.setSuperUser(true);
 
@@ -172,6 +172,15 @@
     return events;
   }
 
+  private class AccessUtilCb extends AccessUtilI.CallBack {
+    /* (non-Javadoc)
+     * @see org.bedework.calfacade.util.AccessUtilI.CallBack#getUserCalendarRoot()
+     */
+    public String getUserCalendarRoot() throws CalFacadeException {
+      return globals.syspars.getUserCalendarRoot();
+    }
+  }
+
   private static class HibSessionFetcher implements CalintfHelperHib.HibSessionFetcher {
     private HibRestore intf;