Adjust to split of template path into module and name and to refactored XML parser class

4 files changed, 41 insertions, 22 deletions

diff --git a/configmgr/source/treemgr/configset.cxx b/configmgr/source/treemgr/configset.cxx
index 67e302b429b8..46a15ae3ecf8 100644
--- a/configmgr/source/treemgr/configset.cxx
+++ b/configmgr/source/treemgr/configset.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: configset.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jb $ $Date: 2000-12-04 12:40:41 $
+ *  last change: $Author: jb $ $Date: 2001-03-12 15:04:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -232,7 +232,7 @@ Name SetElementInfo::getTemplateName() const
 
 Name SetElementInfo::getTemplatePackage() const
 {
-    return m_aTemplate->getPackage();
+    return m_aTemplate->getModule();
 }
 //-----------------------------------------------------------------------------
 
diff --git a/configmgr/source/treemgr/nodefactory.cxx b/configmgr/source/treemgr/nodefactory.cxx
index 85c529fc1dee..7adc384fc69d 100644
--- a/configmgr/source/treemgr/nodefactory.cxx
+++ b/configmgr/source/treemgr/nodefactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: nodefactory.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dg $ $Date: 2000-11-13 11:54:51 $
+ *  last change: $Author: jb $ $Date: 2001-03-12 15:04:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,7 @@ namespace
         OSL_ENSURE(pTemplate,"ERROR: Trying to instantiate a set without a template");
         if (!pTemplate) throw Exception("ERROR: Trying to instantiate a set without a template");
 
-        OSL_ENSURE(pTemplate->getName() == Path::parse(rOriginal.getChildTemplateName()).back(),
+        OSL_ENSURE(pTemplate->getName().toString() == rOriginal.getElementTemplateName(),
                     "WARNING: Template name mismatch creating a set node");
 
         return ! pTemplate->isInstanceValue();
diff --git a/configmgr/source/treemgr/nodeimpl.cxx b/configmgr/source/treemgr/nodeimpl.cxx
index b4e0f929f4e1..901edce307b4 100644
--- a/configmgr/source/treemgr/nodeimpl.cxx
+++ b/configmgr/source/treemgr/nodeimpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: nodeimpl.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jb $ $Date: 2001-02-23 10:50:58 $
+ *  last change: $Author: jb $ $Date: 2001-03-12 15:04:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -510,7 +510,9 @@ std::auto_ptr<SubtreeChange> SetNodeImpl::doPreCommitChanges()
 void SetNodeImpl::doFinishCommit(SubtreeChange& rChange)
 {
     OSL_ENSURE(rChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChange.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChange.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
+                "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChange.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
                 "ERROR: Element template of change does not match the template of the set");
 
     OSL_ENSURE(!hasChanges(),"ERROR: Old-style commit not supported: changes are lost");
@@ -520,7 +522,9 @@ void SetNodeImpl::doFinishCommit(SubtreeChange& rChange)
 void SetNodeImpl::doRevertCommit(SubtreeChange& rChange)
 {
     OSL_ENSURE(rChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChange.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChange.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
+                "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChange.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
                 "ERROR: Element template of change does not match the template of the set");
 
     OSL_ENSURE(!hasChanges(),"ERROR: Old-style commit not supported: changes not restored");
@@ -530,7 +534,9 @@ void SetNodeImpl::doRevertCommit(SubtreeChange& rChange)
 void SetNodeImpl::doFailedCommit(SubtreeChange& rChange)
 {
     OSL_ENSURE(rChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChange.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChange.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
+                "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChange.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
                 "ERROR: Element template of change does not match the template of the set");
 
     OSL_ENSURE(!hasChanges(),"ERROR: Old-style commit not supported: changes not recovered");
diff --git a/configmgr/source/treemgr/nodeimplobj.cxx b/configmgr/source/treemgr/nodeimplobj.cxx
index 11c4f04d8f9f..33e01f4216e1 100644
--- a/configmgr/source/treemgr/nodeimplobj.cxx
+++ b/configmgr/source/treemgr/nodeimplobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: nodeimplobj.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: jb $ $Date: 2001-02-23 10:50:58 $
+ *  last change: $Author: jb $ $Date: 2001-03-12 15:04:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -627,7 +627,6 @@ std::auto_ptr<SubtreeChange> DeferredGroupNodeImpl::doPreCommitChanges()
     {
         // get the name of this node
         aRet.reset( new SubtreeChange(this->getOriginalNodeName(),
-                                      rtl::OUString(),
                                       this->getAttributes()) );
     }
     return aRet;
@@ -1204,7 +1203,8 @@ std::auto_ptr<SubtreeChange> DeferredTreeSetNodeImpl::doPreCommitChanges()
 
     // and make a SubtreeChange
     std::auto_ptr<SubtreeChange> pSetChange( new SubtreeChange(aName,
-                                                               getElementTemplate()->getPath().toString(),
+                                                               getElementTemplate()->getName().toString(),
+                                                               getElementTemplate()->getModule().toString(),
                                                                this->getAttributes()) );
 
     // commit preexisting nodes
@@ -1271,8 +1271,10 @@ std::auto_ptr<SubtreeChange> DeferredTreeSetNodeImpl::doPreCommitChanges()
 void DeferredTreeSetNodeImpl::doFinishCommit(SubtreeChange& rChanges)
 {
     OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChanges.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChanges.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
                 "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
+                "ERROR: Element template module of change does not match the template of the set");
 
 
     for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
@@ -1358,8 +1360,10 @@ void DeferredTreeSetNodeImpl::doFinishCommit(SubtreeChange& rChanges)
 void DeferredTreeSetNodeImpl::doRevertCommit(SubtreeChange& rChanges)
 {
     OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChanges.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChanges.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
                 "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
+                "ERROR: Element template module of change does not match the template of the set");
 
 
     for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
@@ -1428,8 +1432,10 @@ void DeferredTreeSetNodeImpl::doRevertCommit(SubtreeChange& rChanges)
 void DeferredTreeSetNodeImpl::doFailedCommit(SubtreeChange& rChanges)
 {
     OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChanges.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChanges.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
                 "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
+                "ERROR: Element template module of change does not match the template of the set");
 
 
     for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
@@ -1951,7 +1957,8 @@ std::auto_ptr<SubtreeChange> DeferredValueSetNodeImpl::doPreCommitChanges()
 {
     // and make a SubtreeChange
     std::auto_ptr<SubtreeChange> pSetChange( new SubtreeChange(this->getOriginalNodeName(),
-                                                                getElementTemplate()->getPath().toString(),
+                                                                getElementTemplate()->getName().toString(),
+                                                                getElementTemplate()->getModule().toString(),
                                                                 this->getAttributes()) );
 
     // commit preexisting nodes
@@ -2018,8 +2025,10 @@ std::auto_ptr<SubtreeChange> DeferredValueSetNodeImpl::doPreCommitChanges()
 void DeferredValueSetNodeImpl::doFinishCommit(SubtreeChange& rChanges)
 {
     OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChanges.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChanges.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
                 "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
+                "ERROR: Element template module of change does not match the template of the set");
 
 
     for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
@@ -2105,8 +2114,10 @@ void DeferredValueSetNodeImpl::doFinishCommit(SubtreeChange& rChanges)
 void DeferredValueSetNodeImpl::doRevertCommit(SubtreeChange& rChanges)
 {
     OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChanges.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChanges.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
                 "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
+                "ERROR: Element template module of change does not match the template of the set");
 
 
     for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
@@ -2175,8 +2186,10 @@ void DeferredValueSetNodeImpl::doRevertCommit(SubtreeChange& rChanges)
 void DeferredValueSetNodeImpl::doFailedCommit(SubtreeChange& rChanges)
 {
     OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE( rChanges.getChildTemplateName() ==  getElementTemplate()->getPath().toString(),
+    OSL_ENSURE( rChanges.getElementTemplateName() ==  getElementTemplate()->getName().toString(),
                 "ERROR: Element template of change does not match the template of the set");
+    OSL_ENSURE( rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule().toString(),
+                "ERROR: Element template module of change does not match the template of the set");
 
 
     for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();