[commit] r2345 - trunk/GME/GMEActiveBrowser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Sep 12 15:21:59 2013
New Revision: 2345

Log:
Remove dup code

Modified:
   trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp
   trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h

Modified: trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp	Tue Sep 10 15:06:46 2013	(r2344)
+++ trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp	Thu Sep 12 15:21:59 2013	(r2345)
@@ -35,116 +35,38 @@
 
 }
 
-HTREEITEM CAggregateTreeCtrl::InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
+HTREEITEM CAggregateTreeCtrl::InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType, bool update)
 {
-	MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::InsertItem "+strObjectName+"\r\n");
-
-	if(m_MgaMap.bIsInMap(pUnknown)) // Should not happen
+	if (update)
 	{
-		TRACE(" Duplicate element found inserting a new element into the aggregation tree map.\n");
-#ifdef _DEBUG
-		m_MgaMap.Dump(afxDump);
-#endif
-		ASSERT(FALSE);
-		
-
-		return NULL;
-	}
-
+		MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::InsertItemUpdate "+strObjectName+"\r\n");
 
-	TVINSERTSTRUCT tvInsert;
-	tvInsert.hParent = hParent;
-	tvInsert.hInsertAfter = NULL; // FIXME: does this mean we're doing insertion sort?
-	tvInsert.item.pszText = strObjectName.GetBuffer(0);
-
-	tvInsert.item.state=0;
-	tvInsert.item.stateMask=0;
-	tvInsert.item.lParam=NULL;
-
-	CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
-
-	int sourceControlImageOffset = 0;
-	int sourceControlLatentState = 0;
-
-	if(pParent->m_Options.m_bIsDynamicLoading)
-	{
-		tvInsert.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE|TVIF_CHILDREN;
-		if(otObjectType==OBJTYPE_FOLDER || otObjectType==OBJTYPE_MODEL)
-		{
-			CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
-			tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
-			//sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject, &sourceControlLatentState);
-		}
-		else
+		HTREEITEM hTreeItem;
+		if(m_MgaMap.LookupTreeItem(pUnknown,hTreeItem))
 		{
-			tvInsert.item.cChildren=0;
+			return hTreeItem;
 		}
-		sourceControlImageOffset = pParent->GetSourceControlStateOffset(CComQIPtr<IMgaObject>( pUnknown), &sourceControlLatentState);
 	}
 	else
 	{
-		tvInsert.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
-	}
-
-	if(hParent==NULL)	// Root folder
-	{
-
-		tvInsert.item.iImage=0+sourceControlImageOffset;
-		tvInsert.item.iSelectedImage=0+sourceControlImageOffset;
-	}
-	else
-	{
-		tvInsert.item.iImage=(int)otObjectType+sourceControlImageOffset;
-		tvInsert.item.iSelectedImage=(int)otObjectType+sourceControlImageOffset;
-	}
+		MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::InsertItem "+strObjectName+"\r\n");
 
-	if(otObjectType==OBJTYPE_FOLDER)
-	{
-		bool has_dep;
-		if(IsLibrary(pUnknown, &has_dep))
+		if (m_MgaMap.bIsInMap(pUnknown)) // Should not happen
 		{
-			tvInsert.item.iImage=10;
-			tvInsert.item.iSelectedImage=10;
-			if( has_dep)
-			{
-				tvInsert.item.iImage=54;
-				tvInsert.item.iSelectedImage=54;
-			}
-		}
-	}
-	CComPtr<IMgaObject> ccpObject;
-	QueryInterface(pUnknown, &ccpObject);
-	GetCustomTreeIcon(ccpObject, tvInsert.item);
-
-	// Inserting item into the tree control
-	HTREEITEM hItem = CTreeCtrl::InsertItem(&tvInsert);
-	strObjectName.ReleaseBuffer();
-
-	SetItemData(hItem,(DWORD)hItem);
-	
-	CAggregateMgaObjectProxy ObjectProxy(pUnknown, otObjectType);
-	CAggregateMgaObjectProxy& insertedProxy = m_MgaMap.AddEntry(hItem, ObjectProxy);
-
-	SetItemProperties(hItem, sourceControlLatentState, &insertedProxy);
-	
-	return hItem;
-}
-
-
-HTREEITEM CAggregateTreeCtrl::InsertItemUpdate(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
-{
-	MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::InsertItemUpdate "+strObjectName+"\r\n");
+			TRACE(" Duplicate element found inserting a new element into the aggregation tree map.\n");
+#ifdef _DEBUG
+			m_MgaMap.Dump(afxDump);
+			ASSERT(FALSE);
+#endif
 
-	HTREEITEM hTreeItem;
-	if(m_MgaMap.LookupTreeItem(pUnknown,hTreeItem))
-	{
-		return hTreeItem;
+			return NULL;
+		}
 	}
 
 
 	TVINSERTSTRUCT tvInsert;
 	tvInsert.hParent = hParent;
-	tvInsert.hInsertAfter = NULL;
+	tvInsert.hInsertAfter = NULL; // FIXME: does this mean we're doing insertion sort?
 	tvInsert.item.pszText = strObjectName.GetBuffer(0);
 
 	tvInsert.item.state=0;
@@ -210,13 +132,13 @@
 	GetCustomTreeIcon(ccpObject, tvInsert.item);
 
 	// Inserting item into the tree control
-	HTREEITEM hItem=CTreeCtrl::InsertItem(&tvInsert);
+	HTREEITEM hItem = CTreeCtrl::InsertItem(&tvInsert);
 	strObjectName.ReleaseBuffer();
 
-	tvInsert.item.iImage = 0;
+	// tvInsert.item.iImage = 0;
 	SetItemData(hItem,(DWORD)hItem);
 	
-	CAggregateMgaObjectProxy ObjectProxy(pUnknown,otObjectType);
+	CAggregateMgaObjectProxy ObjectProxy(pUnknown, otObjectType);
 	CAggregateMgaObjectProxy& insertedProxy = m_MgaMap.AddEntry(hItem, ObjectProxy);
 
 	SetItemProperties(hItem, sourceControlLatentState, &insertedProxy);
@@ -226,6 +148,12 @@
 }
 
 
+HTREEITEM CAggregateTreeCtrl::InsertItemUpdate(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
+{
+	return InsertItem(hParent, strObjectName, pUnknown, otObjectType, true);
+}
+
+
 void CAggregateTreeCtrl::MaintainRegistry()
 {
 	BYTE nMaxStored=4;

Modified: trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h
==============================================================================
--- trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h	Tue Sep 10 15:06:46 2013	(r2344)
+++ trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h	Thu Sep 12 15:21:59 2013	(r2345)
@@ -51,7 +51,7 @@
 	void SaveTreeStateToRegistry(CString&);
 	void LoadTreeStateFromRegistry(CString&);
 	void LoadItemStateFromRegistry(CString& strProjectName, HTREEITEM hItem);
-	HTREEITEM InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType);
+	HTREEITEM InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType, bool update=false);
 	HTREEITEM InsertItemUpdate(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType);
 
 	CAggregateTreeCtrl();