#80460# Adjust to renamed tree interfaces, revised options handling

2 files changed, 12 insertions, 11 deletions

diff --git a/configmgr/source/api2/committer.cxx b/configmgr/source/api2/committer.cxx
index e0e5947a59ea..a5ae5145b10c 100644
--- a/configmgr/source/api2/committer.cxx
+++ b/configmgr/source/api2/committer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: committer.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dg $ $Date: 2000-11-30 08:38:33 $
+ *  last change: $Author: jb $ $Date: 2000-12-04 09:18:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,7 +106,7 @@ Committer::Committer(ApiRootTreeImpl& rTree)
 {}
 //-----------------------------------------------------------------------------
 
-ITreeProvider2* Committer::getUpdateProvider()
+ITreeManager* Committer::getUpdateProvider()
 {
     return &m_rTree.getApiTree().getProvider().getProviderImpl();
 }
@@ -121,20 +121,21 @@ void Committer::commit()
     Tree aTree(rApiTree.getTree());
     if (!aTree.hasChanges()) return;
 
-    TreeChangeList  aChangeList(aTree.getContextPath().toString(),
+    OSL_ENSURE(m_rTree.getOptions().isValid(),"INTERNAL ERROR: Invalid Options used.");
+    TreeChangeList  aChangeList(m_rTree.getOptions(),
+                                aTree.getContextPath().toString(),
                                 aTree.getRootNode().getName().toString(),
                                 rtl::OUString(),
                                 aTree.getRootNode().getAttributes());
 
-    ITreeProvider2* pUpdateProvider = getUpdateProvider();
+    ITreeManager* pUpdateProvider = getUpdateProvider();
     OSL_ASSERT(pUpdateProvider);
 
     CommitHelper    aHelper(aTree);
     if (aHelper.prepareCommit(aChangeList))
     try
     {
-        OSL_ENSURE(m_rTree.getOptions().isValid(),"INTERNAL ERROR: Invalid Options used.");
-        pUpdateProvider->updateTree(aChangeList, m_rTree.getOptions());
+        pUpdateProvider->updateTree(aChangeList);
         aHelper.finishCommit(aChangeList);
 
         aLocalGuard.clear();        // done locally
diff --git a/configmgr/source/api2/committer.hxx b/configmgr/source/api2/committer.hxx
index 8be5d1b71298..1285f2335b18 100644
--- a/configmgr/source/api2/committer.hxx
+++ b/configmgr/source/api2/committer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: committer.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jb $ $Date: 2000-11-10 17:29:04 $
+ *  last change: $Author: jb $ $Date: 2000-12-04 09:18:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,7 @@
 
 namespace configmgr
 {
-    class ITreeProvider2;
+    class ITreeManager;
 //-----------------------------------------------------------------------------
     namespace configapi
     {
@@ -82,7 +82,7 @@ namespace configmgr
 
             void commit();
         private:
-            ITreeProvider2* getUpdateProvider();
+            ITreeManager* getUpdateProvider();
         };
 //-----------------------------------------------------------------------------
     }