Changeset 655 in dev for trunk/ab5.0/abdev/abdev/FileTree.cpp

Timestamp:

Jun 18, 2008, 11:03:59 PM (16 years ago)

Author:

dai_9181

Message:

FileManager周りをリファクタリング

File:

• trunk/ab5.0/abdev/abdev/FileTree.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/abdev/FileTree.cpp

@@ -22 +22 @@
                 hTreeItem = pobj_FileTree->GetSelectedItem();
 
-                std::string tempPath = projectInfo.pobj_DBFileInfo->GetPath(hTreeItem);
+                std::string tempPath = projectInfo.fileSystem.root.FindFile( hTreeItem ).GetRelationalPath();
 
                 //絶対パス、相対パスを表示
@@ -107 +107 @@
                         hTreeItem=TreeView_GetSelection(hwnd);
 
-                        std::string tempPath = projectInfo.pobj_DBFileInfo->GetPath(hTreeItem);
+                        std::string tempPath = projectInfo.fileSystem.root.FindFile( hTreeItem ).GetRelationalPath();
 
                         lstrcpy( temporary, tempPath.c_str() );
@@ -194 +194 @@
 }
 
-void FileListTreeViewCtrl::Reset( CDBFileInfo *pFileInfos )
-{
+void FileListTreeViewCtrl::Reset( HTREEITEM hParent, ActiveBasic::PM::FM::Folder &folder )
+{
+    char temporary[MAX_PATH],temp2[MAX_PATH];
+
+    lstrcpy( temporary, folder.GetName().c_str() );
+
     TV_INSERTSTRUCT tv;
-
-    this->DeleteAllItems();
-
     tv.hInsertAfter=TVI_SORT;
     tv.item.mask=TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
-
-    tv.hParent=TVI_ROOT;
+    tv.hParent = hParent;
     tv.item.iImage=0;
     tv.item.iSelectedImage=0;
-    tv.item.pszText="Source Files";
-    tv.hParent = this->InsertItem( &tv );
-
-    int i;
-    char temporary[MAX_PATH],temp2[MAX_PATH];
-    for(i=0;i<pFileInfos->iNum;i++){
-        _splitpath(pFileInfos->ppobj_FileInfo[i]->GetPath().c_str(),0,0,temporary,temp2);
+    tv.item.pszText = temporary;
+    HTREEITEM hFolder = this->InsertItem( &tv );
+
+    BOOST_FOREACH( ActiveBasic::PM::FM::Folder &childFolder, folder.folders )
+    {
+        this->Reset( hFolder, childFolder );
+    }
+
+    BOOST_FOREACH( ActiveBasic::PM::FM::File &file, folder.files )
+    {
+        _splitpath(file.GetRelationalPath().c_str(),0,0,temporary,temp2);
         lstrcat(temporary,temp2);
+
+        TV_INSERTSTRUCT tv;
+        tv.hInsertAfter=TVI_SORT;
+        tv.item.mask=TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
+        tv.hParent = hFolder;
         tv.item.iImage=2;
         tv.item.iSelectedImage=2;
         tv.item.pszText=temporary;
-        pFileInfos->ppobj_FileInfo[i]->m_hTreeItem = this->InsertItem( &tv );
-    }
-}
+        file.SetTreeViewHandle( this->InsertItem( &tv ) );
+    }
+}
+void FileListTreeViewCtrl::Reset( ActiveBasic::PM::FM::FileSystem &fileSystem )
+{
+    this->DeleteAllItems();
+
+    this->Reset( TVI_ROOT, fileSystem.root );
+}