From: Leon W. <moo...@us...> - 2004-11-30 19:36:55
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11504 Modified Files: AnyEdit.rc ClassTree.cpp ClassTree.h resource.h Log Message: Added manual updating of the ClassView. Index: ClassTree.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ClassTree.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ClassTree.cpp 30 Nov 2004 19:22:13 -0000 1.14 --- ClassTree.cpp 30 Nov 2004 19:36:46 -0000 1.15 *************** *** 16,19 **** --- 16,20 ---- #include "AnyEditDoc.h" #include "WorkspaceManager.h" + #include "CreateTagThread.h" #ifdef _DEBUG *************** *** 55,58 **** --- 56,61 ---- ON_COMMAND(ID_CLASSVIEW_GROUP_TYPE, OnGroupByType) ON_UPDATE_COMMAND_UI(ID_CLASSVIEW_GROUP_TYPE, OnUpdateGroupByType) + ON_COMMAND(ID_CLASSVIEW_UPDATE, OnClassviewUpdate) + ON_UPDATE_COMMAND_UI(ID_CLASSVIEW_UPDATE, OnUpdateClassviewUpdate) //}}AFX_MSG_MAP END_MESSAGE_MAP() *************** *** 1029,1030 **** --- 1032,1086 ---- GetCurrentView()->PostMessage(WM_CONTEXTMENU, (WPARAM)pWnd->GetSafeHwnd(), MAKELPARAM(point.x, point.y)); } + + void CClassTree::OnClassviewUpdate() + { + CCreateTagThread* pCreateTags; + pCreateTags = theApp.GetTagThread(); + if( NULL == pCreateTags ) return; + + // Parse the current workspace and all its projects, if we have a workspace. + AEWorkspaceManager* pWS = theApp.GetWorkspace(); + if( NULL != pWS ) + { + STRSET setFiles; + AETagMap* pTagMap = theApp.GetTags(); + const PROJECTLIST& lProjects = pWS->operator const PROJECTLIST&(); + for( PROJECTLIST::const_iterator iProject = lProjects.begin(); iProject != lProjects.end(); ++ iProject ) + { + (*iProject)->GetFileSet( setFiles ); + for( STRSET::const_iterator j = setFiles.begin(); j != setFiles.end(); ++ j ) + { + pCreateTags->AddFile( (*iProject)->GetProjectFile( *j ), pTagMap ); + } + } + } + + // Check all open files + POSITION pos = theApp.GetFirstDocTemplatePosition();//m_pDocTemplate->GetFirstDocPosition(); + while (pos != NULL) + { + POSITION posDoc; + CMultiDocTemplate* pTemplate = DYNAMIC_DOWNCAST(CMultiDocTemplate, theApp.GetNextDocTemplate(pos) ); + if( NULL == pTemplate ) continue; + posDoc = pTemplate->GetFirstDocPosition(); + while( NULL != posDoc ) + { + CAnyEditDoc* pDoc = DYNAMIC_DOWNCAST(CAnyEditDoc, pTemplate->GetNextDoc(posDoc)); + if( NULL != pDoc ) + { + // Only parse the files that where not in the project and the + // files that are modified, because these modifications weren't + // parsed in the previous run. + if( NULL == pDoc->GetProjectFile()->GetProject() || pDoc->IsModified() ) + { + theApp.AddToParseList( pDoc ); + } + } + } + } + } + + void CClassTree::OnUpdateClassviewUpdate(CCmdUI* pCmdUI) + { + pCmdUI->Enable(theApp.GetConfigFile()->GetClassView() ? FALSE : TRUE ); + } Index: ClassTree.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ClassTree.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ClassTree.h 20 Sep 2004 20:45:01 -0000 1.7 --- ClassTree.h 30 Nov 2004 19:36:47 -0000 1.8 *************** *** 94,107 **** afx_msg void OnContextMenu(CWnd* pWnd, CPoint point); afx_msg void OnSortByType(); - afx_msg void OnGroupByType(); - afx_msg void OnSortByAccess(); - afx_msg void OnJumpToDeclaration(); - afx_msg void OnJumpToImplementation(); afx_msg void OnUpdateSortByType(CCmdUI* pCmdUI); afx_msg void OnUpdateGroupByType(CCmdUI* pCmdUI); afx_msg void OnUpdateSortByAccess(CCmdUI* pCmdUI); afx_msg void OnUpdateJumpToDeclaration(CCmdUI* pCmdUI); afx_msg void OnUpdateJumpToImplementation(CCmdUI* pCmdUI); ! //}}AFX_MSG // Handlers for tree updating messages --- 94,109 ---- afx_msg void OnContextMenu(CWnd* pWnd, CPoint point); afx_msg void OnSortByType(); afx_msg void OnUpdateSortByType(CCmdUI* pCmdUI); + afx_msg void OnGroupByType(); afx_msg void OnUpdateGroupByType(CCmdUI* pCmdUI); + afx_msg void OnSortByAccess(); afx_msg void OnUpdateSortByAccess(CCmdUI* pCmdUI); + afx_msg void OnJumpToDeclaration(); afx_msg void OnUpdateJumpToDeclaration(CCmdUI* pCmdUI); + afx_msg void OnJumpToImplementation(); afx_msg void OnUpdateJumpToImplementation(CCmdUI* pCmdUI); ! afx_msg void OnClassviewUpdate(); ! afx_msg void OnUpdateClassviewUpdate(CCmdUI* pCmdUI); ! //}}AFX_MSG // Handlers for tree updating messages Index: resource.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** resource.h 27 Sep 2004 10:12:15 -0000 1.69 --- resource.h 30 Nov 2004 19:36:47 -0000 1.70 *************** *** 639,642 **** --- 639,643 ---- #define ID_SEARCH_INCREMENTAL_REVERSE 33040 #define ID_EXTRAS_OPEN_FILE 33041 + #define ID_CLASSVIEW_UPDATE 33042 #define ID_EDIT_LAST 59999 *************** *** 647,651 **** #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 110 ! #define _APS_NEXT_COMMAND_VALUE 33042 #define _APS_NEXT_CONTROL_VALUE 1253 #define _APS_NEXT_SYMED_VALUE 1341 --- 648,652 ---- #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 110 ! #define _APS_NEXT_COMMAND_VALUE 33043 #define _APS_NEXT_CONTROL_VALUE 1253 #define _APS_NEXT_SYMED_VALUE 1341 Index: AnyEdit.rc =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** AnyEdit.rc 8 Nov 2004 07:23:35 -0000 1.106 --- AnyEdit.rc 30 Nov 2004 19:36:45 -0000 1.107 *************** *** 939,942 **** --- 939,944 ---- MENUITEM SEPARATOR MENUITEM "Sort by &Access", ID_CLASSVIEW_SORT_ACCESS + MENUITEM SEPARATOR + MENUITEM "&Update ClassView", ID_CLASSVIEW_UPDATE END END *************** *** 953,956 **** --- 955,960 ---- MENUITEM SEPARATOR MENUITEM "Sort by &Access", ID_CLASSVIEW_SORT_ACCESS + MENUITEM SEPARATOR + MENUITEM "&Update ClassView", ID_CLASSVIEW_UPDATE END END *************** *** 960,964 **** POPUP "<POPUP>" BEGIN ! MENUITEM "Show", ID_CLASSVIEW_JUMPTO MENUITEM SEPARATOR MENUITEM "Sort by &Type", ID_CLASSVIEW_SORT_TYPE --- 964,968 ---- POPUP "<POPUP>" BEGIN ! MENUITEM "S&how", ID_CLASSVIEW_JUMPTO MENUITEM SEPARATOR MENUITEM "Sort by &Type", ID_CLASSVIEW_SORT_TYPE *************** *** 966,969 **** --- 970,975 ---- MENUITEM SEPARATOR MENUITEM "Sort by &Access", ID_CLASSVIEW_SORT_ACCESS + MENUITEM SEPARATOR + MENUITEM "&Update ClassView", ID_CLASSVIEW_UPDATE END END *************** *** 2723,2726 **** --- 2729,2733 ---- "Incremental find backward\nFind Incremental Previous" ID_EXTRAS_OPEN_FILE "Open document at current cursor position\nOpen Document" + ID_CLASSVIEW_UPDATE "Update the Classview\nUpdate the Classview" END |