r270 - in branches/work_303: . core doc scan

jls17 at arinside.org jls17 at arinside.org
Sun May 6 16:53:19 CDT 2012


Author: jls17
Date: Sun May  6 16:53:18 2012
New Revision: 270
URL: http://arinside.org/changeset/270

Log:
- added CDocOverlayHelper class and consolidated overlay code there

Modified:
   branches/work_303/ARInside.cpp
   branches/work_303/ARInside.h
   branches/work_303/ARInside.vcproj
   branches/work_303/CMakeLists.txt
   branches/work_303/core/ARServerObject.cpp
   branches/work_303/core/ARServerObject.h
   branches/work_303/doc/DocAlDetails.cpp
   branches/work_303/doc/DocAlGuideDetails.cpp
   branches/work_303/doc/DocApplicationDetails.cpp
   branches/work_303/doc/DocBase.cpp
   branches/work_303/doc/DocCharMenuDetails.cpp
   branches/work_303/doc/DocCustomWorkflow.cpp
   branches/work_303/doc/DocEscalationDetails.cpp
   branches/work_303/doc/DocFieldDetails.cpp
   branches/work_303/doc/DocFilterDetails.cpp
   branches/work_303/doc/DocFilterGuideDetails.cpp
   branches/work_303/doc/DocImageDetails.cpp
   branches/work_303/doc/DocPacklistDetails.cpp
   branches/work_303/doc/DocSchemaDetails.cpp
   branches/work_303/doc/DocVuiDetails.cpp
   branches/work_303/doc/DocWebserviceDetails.cpp
   branches/work_303/scan/ScanActiveLinks.cpp
   branches/work_303/scan/ScanContainers.cpp
   branches/work_303/scan/ScanEscalations.cpp
   branches/work_303/scan/ScanFilters.cpp
   branches/work_303/scan/ScanImages.cpp
   branches/work_303/scan/ScanMenus.cpp
   branches/work_303/scan/ScanSchema.cpp
   branches/work_303/stdafx.h

Modified: branches/work_303/ARInside.cpp
==============================================================================
--- branches/work_303/ARInside.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/ARInside.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -2530,19 +2530,3 @@
 	}
 #endif
 }
-
-string CARInside::PlaceOverlaidNotice(const CARServerObject& obj, int rootLevel)
-{
-	stringstream tmp;
-
-	tmp << "<div id=\"ovlNote\">" << endl;
-	tmp << "This object is currently not executed/used because it is overlaid by ";
-	if (obj.Exists())
-		tmp << obj.GetURL(rootLevel, false);
-	else
-		tmp << "<span class=\"fieldNotFound\">" << "object missing" << "</span>";
-	
-	tmp << "</div>";
-
-	return tmp.str();
-}

Modified: branches/work_303/ARInside.h
==============================================================================
--- branches/work_303/ARInside.h	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/ARInside.h	Sun May  6 16:53:18 2012	(r270)
@@ -166,7 +166,6 @@
 	string DataObjectHistory(CARDataObject *obj, int rootLevel);
 	bool ValidateGroup(const string& appRefName, int permissionId);
 	int CompareServerVersion(int major, int minor = -1, int revision = -1);
-	string PlaceOverlaidNotice(const CARServerObject& obj, int rootLevel);
 
 	float nDurationLoad;
 	float nDurationDocumentation;

Modified: branches/work_303/ARInside.vcproj
==============================================================================
--- branches/work_303/ARInside.vcproj	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/ARInside.vcproj	Sun May  6 16:53:18 2012	(r270)
@@ -1000,6 +1000,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\doc\DocOverlayHelper.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\doc\DocOverlayHelper.h"
+				>
+			</File>
+			<File
 				RelativePath=".\Doc\DocPacklistDetails.cpp"
 				>
 			</File>

Modified: branches/work_303/CMakeLists.txt
==============================================================================
--- branches/work_303/CMakeLists.txt	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/CMakeLists.txt	Sun May  6 16:53:18 2012	(r270)
@@ -112,7 +112,7 @@
  doc/DocSchemaDetails.cpp doc/DocValidator.cpp doc/DocFilterDetails.cpp doc/DocImageDetails.cpp
  doc/DocActionOpenWindowHelper.cpp doc/DocPacklistDetails.cpp doc/DocApplicationDetails.cpp
  doc/DocGroupDetails.cpp doc/MessageItem.cpp doc/DocEscalationDetails.cpp doc/DocSummaryInfo.cpp
- doc/DocAlGuideDetails.cpp doc/DocCustomWorkflow.cpp
+ doc/DocAlGuideDetails.cpp doc/DocCustomWorkflow.cpp doc/DocOverlayHelper.cpp
  lists/ARActiveLinkList.cpp lists/ARContainerList.cpp lists/AREscalationList.cpp lists/ARFieldList.cpp
  lists/ARFilterList.cpp lists/ARGroupList.cpp lists/ARImageList.cpp lists/ARMenuList.cpp lists/ARRoleList.cpp
  lists/ARSchemaList.cpp lists/ARUserList.cpp lists/ARVUIList.cpp lists/BlackList.cpp lists/ARListHelpers.cpp

Modified: branches/work_303/core/ARServerObject.cpp
==============================================================================
--- branches/work_303/core/ARServerObject.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/core/ARServerObject.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -96,3 +96,20 @@
 #endif
 	return true;
 }
+
+bool IsOverlayOrCustom(const CARServerObject& obj)
+{
+#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
+	// TODO: 
+	// We check directly for overlay or custom, but overlayType is a bitmask, and with more
+	// overlay layers in mind, the overlayType of an object could be:
+	//   AR_CUSTOM_OBJECT | AR_OVERLAID_OBJECT
+	// ARInside has to be able to deal with such situations, but currently it isn't.
+	int overlayType = obj.GetOverlayType();
+	if ((overlayType & AR_CUSTOM_OBJECT) || (overlayType & AR_OVERLAY_OBJECT))
+	{
+		return true;
+	}
+#endif
+	return false;
+}

Modified: branches/work_303/core/ARServerObject.h
==============================================================================
--- branches/work_303/core/ARServerObject.h	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/core/ARServerObject.h	Sun May  6 16:53:18 2012	(r270)
@@ -48,3 +48,4 @@
 };
 
 bool IsVisibleObject(const CARServerObject& obj); // checks if the object is visible; by default overlaid objects are hidden
+bool IsOverlayOrCustom(const CARServerObject& obj); // returns true if the object's overlay type is AR_CUSTOM_OBJECT or AR_OVERLAY_OBJECT

Modified: branches/work_303/doc/DocAlDetails.cpp
==============================================================================
--- branches/work_303/doc/DocAlDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocAlDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocAlDetails.h"
+#include "DocOverlayHelper.h"
 #include "../output/IFileStructure.h"
 
 CDocAlDetails::CDocAlDetails(int alInsideId)
@@ -40,6 +41,7 @@
 		{
 			stringstream pgStream;
 			CWebPage webPage(file->GetFileName(), this->al.GetName(), this->rootLevel, this->pInside->appConfig);
+			CDocOverlayHelper overlayHelper(al, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
@@ -51,37 +53,12 @@
 
 			// generate location info ("your are here")
 			strmHead << CWebUtil::LinkToActiveLinkIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->al.GetName()) << CAREnum::GetOverlayTypeString(overlayType);
- 
-			CARActiveLink overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->al.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->al.GetOverlayBaseName();
-					break;
-				}
-
-				CARActiveLink correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
 
 			if(!this->al.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->al.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//ActiveLink Properties
 			stringstream strmTmp;

Modified: branches/work_303/doc/DocAlGuideDetails.cpp
==============================================================================
--- branches/work_303/doc/DocAlGuideDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocAlGuideDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocAlGuideDetails.h"
+#include "DocOverlayHelper.h"
 
 CDocAlGuideDetails::CDocAlGuideDetails(CARContainer &container)
 : alGuide(container)
@@ -39,6 +40,7 @@
 		if(winUtil.CreateSubDirectory(dir)>=0)
 		{
 			CWebPage webPage(file->GetFileName(), alGuide.GetName(), this->rootLevel, pInside->appConfig);
+			CDocOverlayHelper overlayHelper(alGuide, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
@@ -47,36 +49,11 @@
 
 			strmHead << CWebUtil::LinkToActiveLinkGuideIndex(file->GetRootLevel()) << MenuSeparator << CWebUtil::ObjName(this->alGuide.GetName()) << CAREnum::GetOverlayTypeString(overlayType);
 
-			CARContainer overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->alGuide.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->alGuide.GetOverlayBaseName();
-					break;
-				}
-
-				CARContainer correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!this->alGuide.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->alGuide.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Container Base Informations
 			CDocContainerHelper *contHelper = new CDocContainerHelper(this->alGuide, this->rootLevel);

Modified: branches/work_303/doc/DocApplicationDetails.cpp
==============================================================================
--- branches/work_303/doc/DocApplicationDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocApplicationDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocApplicationDetails.h"
+#include "DocOverlayHelper.h"
 
 CDocApplicationDetails::CDocApplicationDetails(CARContainer &application)
 : pApp(application)
@@ -38,39 +39,15 @@
 		if(winUtil.CreateSubDirectory(dir)>=0)
 		{
 			CWebPage webPage(file->GetFileName(), this->pApp.GetName(), rootLevel, pInside->appConfig);
+			CDocOverlayHelper overlayHelper(pApp, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
 			int overlayType = this->pApp.GetOverlayType();
 			strmHead << CWebUtil::LinkToApplicationIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->pApp.GetName())  << CAREnum::GetOverlayTypeString(overlayType);
 
-			CARContainer overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->pApp.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->pApp.GetOverlayBaseName();
-					break;
-				}
-
-				CARContainer correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Container Base Informations
 			CDocContainerHelper *contHelper = new CDocContainerHelper(this->pApp, this->rootLevel);

Modified: branches/work_303/doc/DocBase.cpp
==============================================================================
--- branches/work_303/doc/DocBase.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocBase.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -59,4 +59,4 @@
 	default:
 		return "";
 	}
-}
\ No newline at end of file
+}

Modified: branches/work_303/doc/DocCharMenuDetails.cpp
==============================================================================
--- branches/work_303/doc/DocCharMenuDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocCharMenuDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -17,6 +17,7 @@
 #include "stdafx.h"
 #include "DocCharMenuDetails.h"
 #include "../output/ContainerTable.h"
+#include "DocOverlayHelper.h"
 
 const char* MenuDefinitionText = "Menu Definition";
 
@@ -43,6 +44,7 @@
 		if(winUtil.CreateSubDirectory(this->path)>=0)
 		{
 			CWebPage webPage(file->GetFileName(), this->menu.GetName(), this->rootLevel, this->pInside->appConfig);
+			CDocOverlayHelper overlayHelper(menu, rootLevel);
 
 			const ARCharMenuStruct& menuDef = menu.GetDefinition();
 			//ContentHead informations
@@ -53,36 +55,11 @@
 			strmHead << CWebUtil::LinkToMenuIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->menu.GetName()) 
 				<< " (" << CAREnum::MenuType(menuDef.menuType) << ")" << CAREnum::GetOverlayTypeString(overlayType);
 
-			CARCharMenu overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->menu.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->menu.GetOverlayBaseName();
-					break;
-				}
-
-				CARCharMenu correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!this->menu.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->menu.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//ActiveLink Properties
 			stringstream strmTmp;

Modified: branches/work_303/doc/DocCustomWorkflow.cpp
==============================================================================
--- branches/work_303/doc/DocCustomWorkflow.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocCustomWorkflow.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -71,8 +71,8 @@
 				for (unsigned int fieldIndex = 0; fieldIndex < fieldCount; fieldIndex++)
 				{
 					CARField fld(schema.GetInsideId(), 0, fieldIndex);
-					int overlayType = fld.GetOverlayType();
-					if (overlayType == AR_CUSTOM_OBJECT || overlayType == AR_OVERLAY_OBJECT)
+					
+					if (IsOverlayOrCustom(fld))
 					{
 						AddTableRow(tblRef, fld);
 					}
@@ -82,8 +82,8 @@
 				for (unsigned int vuiIndex = 0; vuiIndex < vuiCount; vuiIndex++)
 				{
 					CARVui vui(schema.GetInsideId(), 0, vuiIndex);
-					int overlayType = vui.GetOverlayType();
-					if (overlayType == AR_CUSTOM_OBJECT || overlayType == AR_OVERLAY_OBJECT)
+					
+					if (IsOverlayOrCustom(vui))
 					{
 						AddTableRow(tblRef, vui);
 					}

Modified: branches/work_303/doc/DocEscalationDetails.cpp
==============================================================================
--- branches/work_303/doc/DocEscalationDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocEscalationDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocEscalationDetails.h"
+#include "DocOverlayHelper.h"
 
 CDocEscalationDetails::CDocEscalationDetails(unsigned int escalInsideId)
 : escalation(escalInsideId)
@@ -40,6 +41,7 @@
 			stringstream pgStream;
 			CWebPage webPage(file->GetFileName(), this->escalation.GetName(), this->rootLevel, this->pInside->appConfig);
 			CARProplistHelper props(&this->escalation.GetPropList());
+			CDocOverlayHelper overlayHelper(escalation, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
@@ -48,36 +50,11 @@
 
 			strmHead << CWebUtil::LinkToEscalationIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->escalation.GetName()) << CAREnum::GetOverlayTypeString(overlayType);
 
-			CAREscalation overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->escalation.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->escalation.GetOverlayBaseName();
-					break;
-				}
-
-				CAREscalation correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!this->escalation.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->escalation.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Escalation Properties
 			stringstream strmTmp;

Modified: branches/work_303/doc/DocFieldDetails.cpp
==============================================================================
--- branches/work_303/doc/DocFieldDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocFieldDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocFieldDetails.h"
+#include "DocOverlayHelper.h"
 #include "../util/RefItem.h"
 #include "../core/ARImage.h"
 #include "../core/ARGlobalField.h"
@@ -37,6 +38,7 @@
 		rootLevel = file->GetRootLevel();
 
 		CWebPage webPage(file->GetFileName(), this->field.GetName(), rootLevel, this->pInside->appConfig);
+		CDocOverlayHelper overlayHelper(field, rootLevel);
 
 		int overlayType = field.GetOverlayType();
 		int schemaOverlayType = this->schema.GetOverlayType();
@@ -52,34 +54,8 @@
 		contHeadStrm << MenuSeparator << CWebUtil::ObjName(this->field.GetName()) << endl;
 		contHeadStrm << " (Id: " << this->field.GetFieldId() << ")" << CAREnum::GetOverlayTypeString(overlayType) << endl;
 		
-		CARField overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-		if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-		{
-			string correspondingName;
-			switch (overlayType)
-			{
-			case AR_OVERLAID_OBJECT:
-				correspondingName = this->schema.GetOverlayName();
-				break;
-			case AR_OVERLAY_OBJECT:
-				correspondingName = this->schema.GetOverlayBaseName();
-				break;
-			}
-
-			CARSchema correspondingSchema(correspondingName);
-			CARField correspondingObject(correspondingSchema.GetInsideId(), field.GetFieldId());
-			overlayObj = correspondingObject;	
-		}
-#endif
-		
-		webPage.AddContentHead(contHeadStrm.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-		if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-			webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+		webPage.AddContentHead(contHeadStrm.str(), overlayHelper.PlaceOverlayLink());
+		webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 		//Field property table
 		CTable tblFieldprops("commonPropList", "TblObjectList");

Modified: branches/work_303/doc/DocFilterDetails.cpp
==============================================================================
--- branches/work_303/doc/DocFilterDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocFilterDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocFilterDetails.h"
+#include "DocOverlayHelper.h"
 
 CDocFilterDetails::CDocFilterDetails(unsigned int filterInsideId)
 : filter(filterInsideId)
@@ -39,6 +40,7 @@
 		{
 			stringstream pgStream;
 			CWebPage webPage(file->GetFileName(), filter.GetName(), this->rootLevel, this->pInside->appConfig);
+			CDocOverlayHelper overlayHelper(filter, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
@@ -47,36 +49,11 @@
 
 			strmHead << CWebUtil::LinkToFilterIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(filter.GetName()) << CAREnum::GetOverlayTypeString(overlayType);
 
-			CARFilter overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->filter.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->filter.GetOverlayBaseName();
-					break;
-				}
-
-				CARFilter correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!filter.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(filter.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Filter Properties
 			stringstream strmTmp;

Modified: branches/work_303/doc/DocFilterGuideDetails.cpp
==============================================================================
--- branches/work_303/doc/DocFilterGuideDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocFilterGuideDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocFilterGuideDetails.h"
+#include "DocOverlayHelper.h"
 
 CDocFilterGuideDetails::CDocFilterGuideDetails(CARContainer &fltGuide)
 : filterGuide(fltGuide)
@@ -39,6 +40,7 @@
 		if(winUtil.CreateSubDirectory(dir)>=0)
 		{
 			CWebPage webPage(file->GetFileName(), filterGuide.GetName(), rootLevel, this->pInside->appConfig);
+			CDocOverlayHelper overlayHelper(filterGuide, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
@@ -47,36 +49,11 @@
 
 			strmHead << CWebUtil::LinkToFilterGuideIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->filterGuide.GetName()) << CAREnum::GetOverlayTypeString(overlayType);
 
-			CARContainer overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = this->filterGuide.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = this->filterGuide.GetOverlayBaseName();
-					break;
-				}
-
-				CARContainer correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!this->filterGuide.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->filterGuide.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Container Base Informations
 			CDocContainerHelper *contHelper = new CDocContainerHelper(this->filterGuide, this->rootLevel);

Modified: branches/work_303/doc/DocImageDetails.cpp
==============================================================================
--- branches/work_303/doc/DocImageDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocImageDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -17,6 +17,7 @@
 #include "stdafx.h"
 #include "DocImageDetails.h"
 #include "../core/ARImage.h"
+#include "DocOverlayHelper.h"
 
 #if AR_CURRENT_API_VERSION >= AR_API_VERSION_750
 
@@ -46,39 +47,15 @@
 
 		// now create the page
 		CWebPage webPage(file->GetFileName(), image.GetName(), rootLevel, pInside->appConfig);
+		CDocOverlayHelper overlayHelper(image, rootLevel);
 
 		// contentHead informations
 		stringstream contHeadStrm;
 		int overlayType = image.GetOverlayType();
 		contHeadStrm << CWebUtil::LinkToImageIndex(rootLevel) << MenuSeparator << CWebUtil::ObjName(image.GetName()) << CAREnum::GetOverlayTypeString(overlayType) << endl;
 
-		CARImage overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-		if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-		{
-			string correspondingName;
-			switch (overlayType)
-			{
-			case AR_OVERLAID_OBJECT:
-				correspondingName = image.GetOverlayName();
-				break;
-			case AR_OVERLAY_OBJECT:
-				correspondingName = image.GetOverlayBaseName();
-				break;
-			}
-
-			CARImage correspondingObject(correspondingName);
-			overlayObj = correspondingObject;	
-		}
-#endif
-
-		webPage.AddContentHead(contHeadStrm.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-		if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-			webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+		webPage.AddContentHead(contHeadStrm.str(), overlayHelper.PlaceOverlayLink());
+		webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 		// image details
 		CTable tbl("imageDetails", "TblObjectList");

Modified: branches/work_303/doc/DocPacklistDetails.cpp
==============================================================================
--- branches/work_303/doc/DocPacklistDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocPacklistDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -17,6 +17,7 @@
 #include "stdafx.h"
 #include "DocPacklistDetails.h"
 #include "../core/ARImage.h"
+#include "DocOverlayHelper.h"
 
 CDocPacklistDetails::CDocPacklistDetails(CARContainer &packList)
 : pPackList(packList)
@@ -40,44 +41,20 @@
 		if(winUtil.CreateSubDirectory(dir)>=0)
 		{
 			CWebPage webPage(file->GetFileName(), this->pPackList.GetName(), this->rootLevel, this->pInside->appConfig);
-
+			CDocOverlayHelper overlayHelper(this->pPackList, rootLevel);
+			
 			//ContentHead informations
 			stringstream strmHead;
 			strmHead.str("");
 			int overlayType = pPackList.GetOverlayType();
 
-			CARContainer overlayObj;
-
 			strmHead << CWebUtil::LinkToPackingListIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->pPackList.GetName()) << CAREnum::GetOverlayTypeString(overlayType);
 
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = pPackList.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = pPackList.GetOverlayBaseName();
-					break;
-				}
-
-				CARContainer correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!this->pPackList.GetAppRefName().empty())
 				strmHead << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->pPackList.GetAppRefName(), this->rootLevel);
 
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Container Base Informations
 			CDocContainerHelper *contHelper = new CDocContainerHelper(this->pPackList, this->rootLevel);

Modified: branches/work_303/doc/DocSchemaDetails.cpp
==============================================================================
--- branches/work_303/doc/DocSchemaDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocSchemaDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -21,6 +21,7 @@
 #include "../core/ARDayStructHelper.h"
 #include "DocActionOpenWindowHelper.h"
 #include "../core/ARHandle.h"
+#include "DocOverlayHelper.h"
 
 CDocSchemaDetails::CDocSchemaDetails(unsigned int schemaInsideId, int rootLevel)
 : schema(schemaInsideId)
@@ -61,6 +62,7 @@
 		{
 			stringstream pgStrm;	
 			CWebPage webPage(file->GetFileName(), this->schema.GetName(), rootLevel, this->pInside->appConfig);
+			CDocOverlayHelper overlayHelper(schema, rootLevel);
 			
 			const ARCompoundSchema& compSchema = this->schema.GetCompound();
 			overlayType = schema.GetOverlayType();
@@ -72,36 +74,11 @@
 			contHeadStrm << MenuSeparator << CWebUtil::ObjName(this->schema.GetName());
 			contHeadStrm << CAREnum::GetOverlayTypeString(overlayType);
 
-			CARSchema overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = schema.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = schema.GetOverlayBaseName();
-					break;
-				}
-
-				CARSchema correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
 			if(!this->schema.GetAppRefName().empty())
 				contHeadStrm << MenuSeparator << " Application " << this->pInside->LinkToContainer(this->schema.GetAppRefName(), rootLevel);
 
-			webPage.AddContentHead(contHeadStrm.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				pgStrm << pInside->PlaceOverlaidNotice(overlayObj, rootLevel);
-#endif
+			webPage.AddContentHead(contHeadStrm.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Add schema navigation menu	
 			webPage.SetNavigation(this->SchemaNavigation());

Modified: branches/work_303/doc/DocVuiDetails.cpp
==============================================================================
--- branches/work_303/doc/DocVuiDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocVuiDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -18,6 +18,7 @@
 #include "DocVuiDetails.h"
 #include "../output/CsvPage.h"
 #include "../core/ARImage.h"
+#include "DocOverlayHelper.h"
 
 CDocVuiDetails::CDocVuiDetails(unsigned int SchemaInsideId, const CARVui& vuiObj, int rootLevel)
 : schema(SchemaInsideId), vui(vuiObj)
@@ -36,49 +37,20 @@
 		this->rootLevel = file->GetRootLevel();
 
 		CWebPage webPage(file->GetFileName(), this->vui.GetName(), this->rootLevel, this->pInside->appConfig);
-
-		int overlayType = this->vui.GetOverlayType();
-		int schemaOverlayType = this->schema.GetOverlayType();
+		CDocOverlayHelper overlayHelper(vui, rootLevel);
 
 		//ContentHead informations
 		stringstream contHeadStrm;
 		contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel) << endl;
 		contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(this->schema.GetCompound().schemaType, this->rootLevel) << endl;
 		contHeadStrm << MenuSeparator << CWebUtil::Link(this->schema.GetName(), CPageParams(PAGE_DETAILS, &this->schema), "", rootLevel);
-		if (overlayType == AR_ORIGINAL_OBJECT || overlayType == AR_CUSTOM_OBJECT)
-			contHeadStrm << CAREnum::GetOverlayTypeString(schemaOverlayType);
+		contHeadStrm << CAREnum::GetOverlayTypeString(schema.GetOverlayType());
 		contHeadStrm << MenuSeparator << CWebUtil::Link("View", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_VUI, &this->schema), "", rootLevel) << endl;
 		contHeadStrm << MenuSeparator << CWebUtil::ObjName(this->vui.GetName()) << endl;
-		contHeadStrm << " (Id: " << this->vui.GetInsideId() << ")" << CAREnum::GetOverlayTypeString(overlayType) << endl;
-		
-		CARVui overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-		if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-		{
-			string correspondingName;
-			switch (overlayType)
-			{
-			case AR_OVERLAID_OBJECT:
-				correspondingName = this->schema.GetOverlayName();
-				break;
-			case AR_OVERLAY_OBJECT:
-				correspondingName = this->schema.GetOverlayBaseName();
-				break;
-			}
-
-			CARSchema correspondingSchema(correspondingName);
-			CARVui correspondingObject(correspondingSchema.GetInsideId(), vui.GetInsideId());
-			overlayObj = correspondingObject;	
-		}
-#endif
+		contHeadStrm << " (Id: " << this->vui.GetInsideId() << ")" << CAREnum::GetOverlayTypeString(vui.GetOverlayType()) << endl;
 		
-		webPage.AddContentHead(contHeadStrm.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-		if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-			webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+		webPage.AddContentHead(contHeadStrm.str(), overlayHelper.PlaceOverlayLink());
+		webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 		//Properties
 		webPage.AddContent(CARProplistHelper::GetList(this->vui.GetDisplayProps(), this));

Modified: branches/work_303/doc/DocWebserviceDetails.cpp
==============================================================================
--- branches/work_303/doc/DocWebserviceDetails.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/doc/DocWebserviceDetails.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include "DocWebserviceDetails.h"
+#include "DocOverlayHelper.h"
 
 CDocWebserviceDetails::CDocWebserviceDetails(CARContainer &obj)
 : ws(obj)
@@ -39,39 +40,15 @@
 		if(winUtil.CreateSubDirectory(dir)>=0)	// TODO: depending on the file structure there might be more or less directories to create .. move this to an Init function in IFileStructure
 		{
 			CWebPage webPage(file->GetFileName(), ws.GetName(), rootLevel, pInside->appConfig);
-			int overlayType = ws.GetOverlayType();
+			CDocOverlayHelper overlayHelper(ws, rootLevel);
 
 			//ContentHead informations
 			stringstream strmHead;
 			strmHead << CWebUtil::LinkToWebServiceIndex(this->rootLevel) << MenuSeparator << CWebUtil::ObjName(this->ws.GetName());
+			strmHead << CAREnum::GetOverlayTypeString(ws.GetOverlayType());
 
-			CARContainer overlayObj;
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->appConfig.bOverlaySupport && overlayType > 0)
-			{
-				string correspondingName;
-				switch (overlayType)
-				{
-				case AR_OVERLAID_OBJECT:
-					correspondingName = ws.GetOverlayName();
-					break;
-				case AR_OVERLAY_OBJECT:
-					correspondingName = ws.GetOverlayBaseName();
-					break;
-				}
-
-				CARContainer correspondingObject(correspondingName);
-				overlayObj = correspondingObject;	
-			}
-#endif
-
-			webPage.AddContentHead(strmHead.str(), PlaceOverlayLink(overlayType, overlayObj));
-
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
-			if (pInside->overlayMode == 1 && overlayType == AR_OVERLAID_OBJECT)
-				webPage.AddContent(pInside->PlaceOverlaidNotice(overlayObj, rootLevel));
-#endif
+			webPage.AddContentHead(strmHead.str(), overlayHelper.PlaceOverlayLink());
+			webPage.AddContent(overlayHelper.PlaceOverlaidNotice());
 
 			//Container Base Informations
 			CDocContainerHelper *contHelper = new CDocContainerHelper(this->ws, this->rootLevel);

Modified: branches/work_303/scan/ScanActiveLinks.cpp
==============================================================================
--- branches/work_303/scan/ScanActiveLinks.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanActiveLinks.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -43,8 +43,7 @@
 		if (pInside->appConfig.bOverlaySupport && !IsVisibleObject(al))
 			continue;
 
-		int overlayType = al.GetOverlayType();
-		if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+		if (IsOverlayOrCustom(al))
 		{
 			pInside->alList.AddOverlayOrCustom(al.GetInsideId());
 		}

Modified: branches/work_303/scan/ScanContainers.cpp
==============================================================================
--- branches/work_303/scan/ScanContainers.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanContainers.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -39,8 +39,7 @@
 		if (pInside->appConfig.bOverlaySupport && !IsVisibleObject(cnt))
 			continue;
 
-		int overlayType = cnt.GetOverlayType();
-		if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+		if (IsOverlayOrCustom(cnt))
 		{
 			pInside->containerList.AddOverlayOrCustom(cnt.GetInsideId());
 		}

Modified: branches/work_303/scan/ScanEscalations.cpp
==============================================================================
--- branches/work_303/scan/ScanEscalations.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanEscalations.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -41,7 +41,7 @@
 			continue;
 
 		int overlayType = escal.GetOverlayType();
-		if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+		if (IsOverlayOrCustom(escal))
 		{
 			pInside->escalationList.AddOverlayOrCustom(escal.GetInsideId());
 		}

Modified: branches/work_303/scan/ScanFilters.cpp
==============================================================================
--- branches/work_303/scan/ScanFilters.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanFilters.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -44,8 +44,7 @@
 			if (pInside->appConfig.bOverlaySupport && !IsVisibleObject(filter))
 				continue;
 
-			int overlayType = filter.GetOverlayType();
-			if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+			if (IsOverlayOrCustom(filter))
 			{
 				pInside->filterList.AddOverlayOrCustom(filter.GetInsideId());
 			}

Modified: branches/work_303/scan/ScanImages.cpp
==============================================================================
--- branches/work_303/scan/ScanImages.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanImages.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -40,8 +40,7 @@
 		if (pInside->appConfig.bOverlaySupport && !IsVisibleObject(img))
 			continue;
 
-		int overlayType = img.GetOverlayType();
-		if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+		if (IsOverlayOrCustom(img))
 		{
 			pInside->imageList.AddOverlayOrCustom(img.GetInsideId());
 		}

Modified: branches/work_303/scan/ScanMenus.cpp
==============================================================================
--- branches/work_303/scan/ScanMenus.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanMenus.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -39,8 +39,7 @@
 		if (pInside->appConfig.bOverlaySupport && !IsVisibleObject(menu))
 			continue;
 
-		int overlayType = menu.GetOverlayType();
-		if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+		if (IsOverlayOrCustom(menu))
 		{
 			pInside->menuList.AddOverlayOrCustom(menu.GetInsideId());
 		}

Modified: branches/work_303/scan/ScanSchema.cpp
==============================================================================
--- branches/work_303/scan/ScanSchema.cpp	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/scan/ScanSchema.cpp	Sun May  6 16:53:18 2012	(r270)
@@ -43,7 +43,7 @@
 				continue;
 
 			int overlayType = schema.GetOverlayType();
-			if (overlayType == AR_OVERLAY_OBJECT || overlayType == AR_CUSTOM_OBJECT)
+			if (IsOverlayOrCustom(schema))
 			{
 				pInside->schemaList.AddOverlayOrCustom(schema.GetInsideId());
 			}

Modified: branches/work_303/stdafx.h
==============================================================================
--- branches/work_303/stdafx.h	Sat May  5 07:48:32 2012	(r269)
+++ branches/work_303/stdafx.h	Sun May  6 16:53:18 2012	(r270)
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <stdlib.h> // JLS17_LINUX
 #include <stdio.h>
+#include <memory>
 
 #include "util/Util.h"
 


More information about the arinside-src mailing list