while (namesIt.hasNext())
      {
         String id = (String)namesIt.next();
<<<<<<< HEAD
         Fqn fqn = makeItemFqn(id);
         if (changes.containsKey(fqn))
            continue;
         ItemData data = (ItemData)cache.get(fqn, ITEM_DATA);
         if (data == null)
            continue;
         updateTreePath(prevRootPath, newRootPath, data);
      }
   }

   private void updateTreePath(QPath prevRootPath, QPath newRootPath, ItemData data)
   {
      // check is this descendant of prevRootPath
      QPath nodeQPath = data.getQPath();
      if (nodeQPath != null && nodeQPath.isDescendantOf(prevRootPath))
      {
         //make relative path
         QPathEntry[] relativePath = null;
         try
=======
         ItemData data = (ItemData)cache.get(makeItemFqn(id), ITEM_DATA);
         if (data == null)
         {
            continue;
         }
         // check is this descendant of prevRootPath
         QPath nodeQPath = data.getQPath();
         if (nodeQPath != null && nodeQPath.isDescendantOf(prevRootPath))
>>>>>>> 71c3bc9178a87ca76329b20358069d6730707bad
         {
            relativePath = nodeQPath.getRelPath(nodeQPath.getDepth() - prevRootPath.getDepth());
         }

      while (namesIt.hasNext())
      {
         String id = (String)namesIt.next();
         Fqn fqn = makeItemFqn(id);
         if (changes.containsKey(fqn))
            continue;
         ItemData data = (ItemData)cache.get(fqn, ITEM_DATA);
         if (data == null)
            continue;
         updateTreePath(prevRootPath, newRootPath, data);
      }
   }

   private void updateTreePath(QPath prevRootPath, QPath newRootPath, ItemData data)
   {
      // check is this descendant of prevRootPath
      QPath nodeQPath = data.getQPath();
      if (nodeQPath != null && nodeQPath.isDescendantOf(prevRootPath))
      {
         //make relative path
         QPathEntry[] relativePath = null;
         try
         {
            relativePath = nodeQPath.getRelPath(nodeQPath.getDepth() - prevRootPath.getDepth());
         }