[mapguide-commits] r1129 - in trunk/MgDev: Common/Foundation/System
Common/MdfModel Common/MdfParser Common/PlatformBase/Services
Common/Stylization Server/src/Core Server/src/Gws/GwsCommon/inc
Server/src/Gws/GwsQueryEngine/inc
Server/src/Services/Rendering Server/src/Services/Resource
UnitTest/Common/FoundationTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Feb 22 18:22:12 EST 2007
Author: waltweltonlair
Date: 2007-02-22 18:22:12 -0500 (Thu, 22 Feb 2007)
New Revision: 1129
Modified:
trunk/MgDev/Common/Foundation/System/Resources.h
trunk/MgDev/Common/Foundation/System/StreamReader.cpp
trunk/MgDev/Common/MdfModel/AttributeRelate.cpp
trunk/MgDev/Common/MdfModel/AttributeRelate.h
trunk/MgDev/Common/MdfModel/CalculatedProperty.cpp
trunk/MgDev/Common/MdfModel/Extension.cpp
trunk/MgDev/Common/MdfModel/RelateProperty.cpp
trunk/MgDev/Common/MdfModel/SupplementalSpatialContextInfo.cpp
trunk/MgDev/Common/MdfParser/IOAttributeRelate.cpp
trunk/MgDev/Common/MdfParser/IOAttributeRelate.h
trunk/MgDev/Common/PlatformBase/Services/LockFeatures.h
trunk/MgDev/Common/PlatformBase/Services/UnlockFeatures.h
trunk/MgDev/Common/Stylization/DWFRenderer.cpp
trunk/MgDev/Common/Stylization/DWFRenderer.h
trunk/MgDev/Common/Stylization/PointAdapter.cpp
trunk/MgDev/Common/Stylization/Renderer.h
trunk/MgDev/Server/src/Core/main.cpp
trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObjectImpl.h
trunk/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsBinaryFeatureWriter.h
trunk/MgDev/Server/src/Services/Rendering/FeatureInfoRenderer.h
trunk/MgDev/Server/src/Services/Resource/ServerResourceService.h
trunk/MgDev/UnitTest/Common/FoundationTest/stdafx.h
Log:
cleanup tabs
Modified: trunk/MgDev/Common/Foundation/System/Resources.h
===================================================================
--- trunk/MgDev/Common/Foundation/System/Resources.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/Foundation/System/Resources.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -147,7 +147,7 @@
///////////////////////////////////////////////////////////////////////////
/// \brief
- /// Gets a message that is retrieved from the specified resource ID and is
+ /// Gets a message that is retrieved from the specified resource ID and is
/// formatted with the specified arguments.
///
/// \param section
@@ -155,14 +155,14 @@
/// \param resourceId
/// Resource identifier in the section.
/// \param arguments
- /// Pointer to an MgStringCollection that contains the text to be placed
- /// into the formatted message. If arguments is NULL then that is treated
+ /// Pointer to an MgStringCollection that contains the text to be placed
+ /// into the formatted message. If arguments is NULL then that is treated
/// as having 0 arguments provided. A maximum of 9 arguments is allowed.
///
/// \return
/// The formatted message string.
///
- STRING GetMessage(CREFSTRING section, CREFSTRING resourceId,
+ STRING GetMessage(CREFSTRING section, CREFSTRING resourceId,
MgStringCollection* arguments);
/// Resource Components
@@ -191,7 +191,7 @@
static const STRING ServerStopped;
static const STRING ServerCmdDaemon;
static const STRING ServerCmdDaemonInfo;
- static const STRING ServerCmdDaemonDescription;
+ static const STRING ServerCmdDaemonDescription;
static const STRING ServerCmdHelp;
static const STRING ServerCmdHelpInfo1;
static const STRING ServerCmdHelpInfo2;
Modified: trunk/MgDev/Common/Foundation/System/StreamReader.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/System/StreamReader.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/Foundation/System/StreamReader.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -416,7 +416,7 @@
{
throw new MgFileNotFoundException(L"MgStreamReader.GetStream",
__LINE__, __WFILE__, &arguments, L"", NULL);
- }
+ }
else
{
throw new MgFileIoException(L"MgStreamReader.GetStream",
@@ -429,7 +429,6 @@
bytes = new MgByte(NULL, (INT32)bsap.m_Length);
}
-
UINT32 allocLen = 0;
UINT32 len = 0;
Modified: trunk/MgDev/Common/MdfModel/AttributeRelate.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/AttributeRelate.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfModel/AttributeRelate.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -17,14 +17,14 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// AttributeRelate Class Implementation.
+// AttributeRelate Class Implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
#include "AttributeRelate.h"
using namespace MDFMODEL_NAMESPACE;
-
+
//-------------------------------------------------------------------------
// PURPOSE: Construct and initialize an instance of the AttributeRelate
// class.
@@ -33,23 +33,23 @@
AttributeRelate::AttributeRelate()
{
//Default Values
- this->m_strName = L"";
- this->m_strResourceId = L"";
- this->m_strAttributeClass = L"";
- this->m_strAttributeNameDelimiter = L"";
- this->m_eRelateType = LeftOuter;
- this->m_bForceOneToOne = true;
+ this->m_strName = L"";
+ this->m_strResourceId = L"";
+ this->m_strAttributeClass = L"";
+ this->m_strAttributeNameDelimiter = L"";
+ this->m_eRelateType = LeftOuter;
+ this->m_bForceOneToOne = true;
}
AttributeRelate::AttributeRelate(const MdfString& joinName)
{
//Default Values
- this->m_strName = joinName;
- this->m_strResourceId = L"";
- this->m_strAttributeClass = L"";
- this->m_strAttributeNameDelimiter = L"";
- this->m_eRelateType = LeftOuter;
- this->m_bForceOneToOne = true;
+ this->m_strName = joinName;
+ this->m_strResourceId = L"";
+ this->m_strAttributeClass = L"";
+ this->m_strAttributeNameDelimiter = L"";
+ this->m_eRelateType = LeftOuter;
+ this->m_bForceOneToOne = true;
}
//-------------------------------------------------------------------------
@@ -74,19 +74,19 @@
//-------------------------------------------------------------------------
const MdfString& AttributeRelate::GetName()const
{
- return this->m_strName;
+ return this->m_strName;
}
//-------------------------------------------------------------------------
// PURPOSE: Accessor method to the Name property.
// PARAMETERS:
// Input:
-// name - new join name
+// name - new join name
//-------------------------------------------------------------------------
void AttributeRelate::SetName(const MdfString& joinName)
{
- this->m_strName = joinName;
+ this->m_strName = joinName;
}
//-------------------------------------------------------------------------
@@ -115,7 +115,7 @@
//-------------------------------------------------------------------------
const MdfString& AttributeRelate::GetAttributeClass()const
{
- return this->m_strAttributeClass;
+ return this->m_strAttributeClass;
}
//-------------------------------------------------------------------------
@@ -123,12 +123,12 @@
//-------------------------------------------------------------------------
void AttributeRelate::SetAttributeClass(const MdfString& attributeClass)
{
- this->m_strAttributeClass = attributeClass;
+ this->m_strAttributeClass = attributeClass;
}
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the AttributeNameDelimiter property.
-// RETURNS: A string representing the AttributeNameDelimiter. The
+// RETURNS: A string representing the AttributeNameDelimiter. The
// default delimiter is hard coded to "|"
//-------------------------------------------------------------------------
const MdfString& AttributeRelate::GetAttributeNameDelimiter() const
@@ -150,7 +150,7 @@
//-------------------------------------------------------------------------
AttributeRelate::RelateType AttributeRelate::GetRelateType() const
{
- return this->m_eRelateType;
+ return this->m_eRelateType;
}
//-------------------------------------------------------------------------
@@ -161,7 +161,7 @@
//-------------------------------------------------------------------------
void AttributeRelate::SetRelateType (AttributeRelate::RelateType type)
{
- m_eRelateType = type;
+ m_eRelateType = type;
}
//-------------------------------------------------------------------------
@@ -170,7 +170,7 @@
//-------------------------------------------------------------------------
bool AttributeRelate::GetForceOneToOne() const
{
- return m_bForceOneToOne;
+ return m_bForceOneToOne;
}
//-------------------------------------------------------------------------
@@ -181,7 +181,7 @@
//-------------------------------------------------------------------------
void AttributeRelate::SetForceOneToOne(bool bVal)
{
- m_bForceOneToOne = bVal;
+ m_bForceOneToOne = bVal;
}
//End of file.
Modified: trunk/MgDev/Common/MdfModel/AttributeRelate.h
===================================================================
--- trunk/MgDev/Common/MdfModel/AttributeRelate.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfModel/AttributeRelate.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef ATTRIBUTERELATE_H_
+#ifndef ATTRIBUTERELATE_H_
#define ATTRIBUTERELATE_H_
#include "MdfModel.h"
@@ -24,27 +24,26 @@
BEGIN_NAMESPACE_MDFMODEL
-//-------------------------------------------------------------------------
-// DESCRIPTION:
-// AttributeRelate class defines the attribute class in the target feature
-// source
-//-------------------------------------------------------------------------
-class MDFMODEL_API AttributeRelate : public MdfRootObject
+ //-------------------------------------------------------------------------
+ // DESCRIPTION:
+ // AttributeRelate class defines the attribute class in the target feature
+ // source
+ //-------------------------------------------------------------------------
+ class MDFMODEL_API AttributeRelate : public MdfRootObject
{
public:
+ // Defines the type of a join
+ enum RelateType
+ {
+ LeftOuter,
+ RightOuter, // is not supported yet
+ Inner,
+ Association // is not supported yet
+ };
- // Defines the type of a join
- enum RelateType
- {
- LeftOuter
- ,RightOuter // is not supported yet
- ,Inner
- ,Association // is not supported yet
- };
-
// Construction, destruction, initialization
AttributeRelate();
- AttributeRelate(const MdfString& joinName);
+ AttributeRelate(const MdfString& joinName);
virtual ~AttributeRelate();
@@ -52,7 +51,7 @@
// Property : RelateProperty
RelatePropertyCollection* GetRelateProperties();
- // Property : Name
+ // Property : Name
const MdfString& GetName()const;
void SetName(const MdfString& joinName);
@@ -68,13 +67,13 @@
const MdfString& GetAttributeNameDelimiter() const;
void SetAttributeNameDelimiter(const MdfString& delimiterStr);
- // Attribute : RelateType
- RelateType GetRelateType() const;
- void SetRelateType (RelateType type);
+ // Attribute : RelateType
+ RelateType GetRelateType() const;
+ void SetRelateType (RelateType type);
- // Attribute: ForceOneToOne
- bool GetForceOneToOne() const;
- void SetForceOneToOne(bool bVal);
+ // Attribute: ForceOneToOne
+ bool GetForceOneToOne() const;
+ void SetForceOneToOne(bool bVal);
private:
// Hidden copy constructor and assignment operator.
@@ -84,8 +83,8 @@
// RelatePropertyCollection
RelatePropertyCollection m_collRelateProperties;
- // Name
- MdfString m_strName;
+ // Name
+ MdfString m_strName;
// ResourceId
MdfString m_strResourceId;
@@ -95,19 +94,15 @@
MdfString m_strAttributeNameDelimiter;
- // Join type attribute
- RelateType m_eRelateType;
+ // Join type attribute
+ RelateType m_eRelateType;
- // Force 1 : 1 attribute
- bool m_bForceOneToOne;
-
+ // Force 1 : 1 attribute
+ bool m_bForceOneToOne;
};
typedef MdfOwnerCollection<AttributeRelate> AttributeRelateCollection;
- EXPIMP_TEMPLATE template
- class MDFMODEL_API MdfOwnerCollection<AttributeRelate>;
+ EXPIMP_TEMPLATE template class MDFMODEL_API MdfOwnerCollection<AttributeRelate>;
END_NAMESPACE_MDFMODEL
-
#endif // ATTRIBUTERELATE_H_
-// End of file.
Modified: trunk/MgDev/Common/MdfModel/CalculatedProperty.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/CalculatedProperty.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfModel/CalculatedProperty.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -17,14 +17,14 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// CalculatedProperty Class Implementation.
+// CalculatedProperty Class Implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
#include "CalculatedProperty.h"
using namespace MDFMODEL_NAMESPACE;
-
+
//-------------------------------------------------------------------------
// PURPOSE: Construct and initialize an instance of the CalculatedProperty
// class.
@@ -33,8 +33,8 @@
CalculatedProperty::CalculatedProperty()
{
//Default Values
- this->m_strName = L"";
- this->m_strExpression = L"";
+ this->m_strName = L"";
+ this->m_strExpression = L"";
}
CalculatedProperty::CalculatedProperty(const MdfString &name, const MdfString &expression)
@@ -76,7 +76,7 @@
//-------------------------------------------------------------------------
const MdfString& CalculatedProperty::GetExpression()const
{
- return this->m_strExpression;
+ return this->m_strExpression;
}
//-------------------------------------------------------------------------
@@ -84,7 +84,7 @@
//-------------------------------------------------------------------------
void CalculatedProperty::SetExpression(const MdfString& expression)
{
- this->m_strExpression = expression;
+ this->m_strExpression = expression;
}
//End of file.
Modified: trunk/MgDev/Common/MdfModel/Extension.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/Extension.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfModel/Extension.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -17,14 +17,14 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// Extension Class Implementation.
+// Extension Class Implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
#include "Extension.h"
using namespace MDFMODEL_NAMESPACE;
-
+
//-------------------------------------------------------------------------
// PURPOSE: Construct and initialize an instance of the Extension
// class.
@@ -33,8 +33,8 @@
Extension::Extension()
{
//Default Values
- this->m_strName = L"";
- this->m_strFeatureClass = L"";
+ this->m_strName = L"";
+ this->m_strFeatureClass = L"";
}
//-------------------------------------------------------------------------
@@ -91,7 +91,7 @@
//-------------------------------------------------------------------------
const MdfString& Extension::GetFeatureClass()const
{
- return this->m_strFeatureClass;
+ return this->m_strFeatureClass;
}
//-------------------------------------------------------------------------
@@ -99,7 +99,7 @@
//-------------------------------------------------------------------------
void Extension::SetFeatureClass(const MdfString& featureClass)
{
- this->m_strFeatureClass = featureClass;
+ this->m_strFeatureClass = featureClass;
}
//End of file.
Modified: trunk/MgDev/Common/MdfModel/RelateProperty.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/RelateProperty.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfModel/RelateProperty.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -17,7 +17,7 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// RelateProperty Class Implementation.
+// RelateProperty Class Implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
@@ -26,7 +26,7 @@
using namespace MDFMODEL_NAMESPACE;
static MdfString stChainDelimiterSymbol = L".";
-
+
//-------------------------------------------------------------------------
// PURPOSE: Construct and initialize an instance of the RelateProperty
// class.
@@ -35,9 +35,9 @@
RelateProperty::RelateProperty()
{
//Default Values
- this->m_strAttributeClassProperty = L"";
+ this->m_strAttributeClassProperty = L"";
this->m_strFeatureClassProperty = L"";
- this->m_strPrefixedFeatureClassProperty = L"";
+ this->m_strPrefixedFeatureClassProperty = L"";
this->m_strPrimaryAttributeRelate = L"";
}
@@ -70,9 +70,9 @@
// PURPOSE: Accessor method to the FeatureClassProperty property.
// PARAMETERS:
// Input:
-// primaryAttributeRelateName - name of the primary join (in the
+// primaryAttributeRelateName - name of the primary join (in the
// case of a chain) or empty string
-// propertyName - FeatureClassProperty
+// propertyName - FeatureClassProperty
//-------------------------------------------------------------------------
void RelateProperty::SetFeatureClassProperty(
const MdfString& propertyName,
@@ -107,7 +107,7 @@
//-------------------------------------------------------------------------
const MdfString& RelateProperty::GetAttributeClassProperty()const
{
- return this->m_strAttributeClassProperty;
+ return this->m_strAttributeClassProperty;
}
//-------------------------------------------------------------------------
@@ -115,7 +115,7 @@
//-------------------------------------------------------------------------
void RelateProperty::SetAttributeClassProperty(const MdfString& attributeClass)
{
- this->m_strAttributeClassProperty = attributeClass;
+ this->m_strAttributeClassProperty = attributeClass;
}
void RelateProperty::ParseDelimitedClassName (
Modified: trunk/MgDev/Common/MdfModel/SupplementalSpatialContextInfo.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/SupplementalSpatialContextInfo.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfModel/SupplementalSpatialContextInfo.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -27,7 +27,7 @@
using namespace MDFMODEL_NAMESPACE;
//-------------------------------------------------------------------------
-// PURPOSE: Construct and initialize an instance of the SupplementalSpatialContextInfo
+// PURPOSE: Construct and initialize an instance of the SupplementalSpatialContextInfo
// class.
// PARAMETERS:
// Input:
@@ -41,7 +41,7 @@
}
//-------------------------------------------------------------------------
-// PURPOSE: Construct and initialize an instance of the SupplementalSpatialContextInfo
+// PURPOSE: Construct and initialize an instance of the SupplementalSpatialContextInfo
// class.
// PARAMETERS:
// Input:
@@ -51,7 +51,7 @@
{
//Default Settings
this->m_strName = L"";
- this->m_strCoordinateSystem = L"";
+ this->m_strCoordinateSystem = L"";
}
//-------------------------------------------------------------------------
Modified: trunk/MgDev/Common/MdfParser/IOAttributeRelate.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOAttributeRelate.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfParser/IOAttributeRelate.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -19,7 +19,6 @@
#include "IOAttributeRelate.h"
#include "IORelateProperty.h"
-
using namespace XERCES_CPP_NAMESPACE;
using namespace MDFMODEL_NAMESPACE;
using namespace MDFPARSER_NAMESPACE;
@@ -87,9 +86,9 @@
(this->m_pAttributeRelate)->SetName(ch);
else if (m_currElemName == L"AttributeNameDelimiter") // NOXLATE
(this->m_pAttributeRelate)->SetAttributeNameDelimiter(ch);
- else if (m_currElemName == L"RelateType") // NOXLATE
+ else if (m_currElemName == L"RelateType") // NOXLATE
(this->m_pAttributeRelate)->SetRelateType(ReadType(ch));
- else if (m_currElemName == L"ForceOneToOne") // NOXLATE
+ else if (m_currElemName == L"ForceOneToOne") // NOXLATE
(this->m_pAttributeRelate)->SetForceOneToOne(wstrToBool(ch));
}
@@ -117,7 +116,7 @@
fd << tab() << "<AttributeClass>"; // NOXLATE
fd << EncodeString(pAttributeRelate->GetAttributeClass());
fd << "</AttributeClass>" << std::endl; // NOXLATE
-
+
// Property: ResourceId
fd << tab() << "<ResourceId>"; // NOXLATE
fd << EncodeString(pAttributeRelate->GetResourceId());
@@ -135,12 +134,12 @@
// Property: RelateType
fd << tab() << "<RelateType>"; // NOXLATE
- this->WriteType(fd, pAttributeRelate);
+ this->WriteType(fd, pAttributeRelate);
fd << "</RelateType>" << std::endl; // NOXLATE
// Property: ForceOneToOne
fd << tab() << "<ForceOneToOne>"; // NOXLATE
- fd << (BoolToStr(pAttributeRelate->GetForceOneToOne())) ? ("true") : ("false"); // NOXLATE
+ fd << (BoolToStr(pAttributeRelate->GetForceOneToOne())) ? ("true") : ("false"); // NOXLATE
fd << "</ForceOneToOne>" << std::endl; // NOXLATE
// Property: RelateProperties
@@ -153,7 +152,7 @@
// Write any previously found unknown XML
if (!pAttributeRelate->GetUnknownXml().empty())
{
- fd << toCString(pAttributeRelate->GetUnknownXml());
+ fd << toCString(pAttributeRelate->GetUnknownXml());
}
dectab();
@@ -162,40 +161,40 @@
void IOAttributeRelate::WriteType(MdfStream &fd, AttributeRelate *pAttributeRelate)
{
- switch (pAttributeRelate->GetRelateType())
- {
- case AttributeRelate::LeftOuter:
- fd << "LeftOuter"; //NOXLATE
- break;
+ switch (pAttributeRelate->GetRelateType())
+ {
+ case AttributeRelate::LeftOuter:
+ fd << "LeftOuter"; //NOXLATE
+ break;
- case AttributeRelate::RightOuter:
- fd << "RightOuter"; //NOXLATE
- break;
+ case AttributeRelate::RightOuter:
+ fd << "RightOuter"; //NOXLATE
+ break;
- case AttributeRelate::Inner:
- fd << "Inner"; //NOXLATE
- break;
+ case AttributeRelate::Inner:
+ fd << "Inner"; //NOXLATE
+ break;
- case AttributeRelate::Association:
- fd << "Association"; //NOXLATE
- break;
+ case AttributeRelate::Association:
+ fd << "Association"; //NOXLATE
+ break;
- default:;
- }
+ default:;
+ }
}
AttributeRelate::RelateType IOAttributeRelate::ReadType(const wchar_t *strType)
{
- AttributeRelate::RelateType type = AttributeRelate::LeftOuter;
+ AttributeRelate::RelateType type = AttributeRelate::LeftOuter;
if (::wcscmp(strType, L"LeftOuter") == 0) // NOXLATE
type = AttributeRelate::LeftOuter;
- else if (::wcscmp(strType, L"RightOuter") == 0) // NOXLATE
+ else if (::wcscmp(strType, L"RightOuter") == 0) // NOXLATE
type = AttributeRelate::RightOuter;
else if (::wcscmp(strType, L"Inner") == 0) // NOXLATE
type = AttributeRelate::Inner;
else if (::wcscmp(strType, L"Association") == 0) // NOXLATE
type = AttributeRelate::Association;
- return type;
+ return type;
}
Modified: trunk/MgDev/Common/MdfParser/IOAttributeRelate.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOAttributeRelate.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/MdfParser/IOAttributeRelate.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -34,8 +34,8 @@
AttributeRelate *m_pAttributeRelate;
Extension *m_pExtension;
- void WriteType(MdfStream &fd, AttributeRelate *pAttributeRelate);
- AttributeRelate::RelateType ReadType(const wchar_t *name);
+ void WriteType(MdfStream &fd, AttributeRelate *pAttributeRelate);
+ AttributeRelate::RelateType ReadType(const wchar_t *name);
public:
IOAttributeRelate();
@@ -47,5 +47,6 @@
virtual void ElementChars(const wchar_t *ch);
virtual void EndElement(const wchar_t *name, HandlerStack *handlerStack);
};
+
END_NAMESPACE_MDFPARSER
#endif
Modified: trunk/MgDev/Common/PlatformBase/Services/LockFeatures.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/LockFeatures.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/PlatformBase/Services/LockFeatures.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -25,7 +25,7 @@
/// \ingroup Feature_Service_classes
/// \{
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
/// \brief
/// Creates an insert feature data command. You must add this
/// command to an MgFeatureCommandCollection object and pass the
@@ -33,21 +33,18 @@
///
/// \remarks
///
-///
-///
-
class MG_PLATFORMBASE_API MgLockFeatures : public MgFeatureCommand
{
DECLARE_CREATE_OBJECT();
DECLARE_CLASSNAME(MgLockFeatures);
-
+
PUBLISHED_API:
- ////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Constructs a lock feature comand
MgLockFeatures(CREFSTRING className, CREFSTRING filterText);
-
- //////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the type of the command, that is,
/// MgFeatureCommandType::LockFeatures.
@@ -67,8 +64,8 @@
/// Returns MgFeatureCommandType::LockFeatures.
///
virtual INT32 GetCommandType() const; /// __get
-
- ////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the name of the feature class.
///
@@ -87,8 +84,8 @@
/// Returns the name of the feature class.
///
STRING GetFeatureClassName() const; /// __get
-
- ////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the filter text.
///
@@ -110,7 +107,7 @@
INTERNAL_API:
- //////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Serialize data to TCP/IP stream
///
@@ -119,7 +116,7 @@
///
virtual void Serialize(MgStream* stream);
- //////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Deserialize data from TCP/IP stream
///
@@ -131,7 +128,7 @@
protected:
MgLockFeatures();
- /////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Get the class Id
///
@@ -151,4 +148,4 @@
};
/// \}
-#endif//_MGLOCKFEATURES_H
+#endif
Modified: trunk/MgDev/Common/PlatformBase/Services/UnlockFeatures.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/UnlockFeatures.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/PlatformBase/Services/UnlockFeatures.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -18,7 +18,6 @@
#ifndef _MGUNLOCKFEATURES_H
#define _MGUNLOCKFEATURES_H
-
/// \defgroup MgUnlockFeatures MgUnlockFeatures
/// \ingroup Feature_Service_classes
/// \{
@@ -26,29 +25,26 @@
class MgUnlockFeatures;
template class MG_PLATFORMBASE_API Ptr<MgUnlockFeatures>;
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
/// \brief
-/// Creates a lock feature command. You must add this
+/// Creates an unlock feature command. You must add this
/// command to an MgFeatureCommandCollection object and pass the
/// latter in a call to MgFeatureService::UpdateFeatures.
///
/// \remarks
///
-///
-///
-
class MG_PLATFORMBASE_API MgUnlockFeatures : public MgFeatureCommand
{
DECLARE_CREATE_OBJECT();
DECLARE_CLASSNAME(MgUnlockFeatures);
-
+
PUBLISHED_API:
- ////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
- /// Constructs a unlock feature comand
+ /// Constructs an unlock feature comand
MgUnlockFeatures(CREFSTRING className, CREFSTRING filterText);
-
- //////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the type of the command, that is,
/// MgFeatureCommandType::UnlockFeatures.
@@ -68,8 +64,8 @@
/// Returns MgFeatureCommandType::UnlockFeatures.
///
virtual INT32 GetCommandType() const; /// __get
-
- ////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the name of the feature class.
///
@@ -88,8 +84,8 @@
/// Returns the name of the feature class.
///
STRING GetFeatureClassName() const; /// __get
-
- ////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Gets the filter text.
///
@@ -108,10 +104,10 @@
/// Returns the filter text.
///
STRING GetFilterText() const; /// __get
-
+
INTERNAL_API:
- //////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Serialize data to TCP/IP stream
///
@@ -119,10 +115,9 @@
/// Stream
///
///
-
void Serialize(MgStream* stream);
- //////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Deserialize data from TCP/IP stream
///
@@ -145,4 +140,4 @@
};
/// \}
-#endif//_MGUNLOCKFEATURES_H
+#endif
Modified: trunk/MgDev/Common/Stylization/DWFRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/DWFRenderer.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/Stylization/DWFRenderer.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -518,7 +518,7 @@
//----------------------------------------------------------------------------
void DWFRenderer::StartFeature(RS_FeatureReader* feature,
const RS_String* tooltip,
- const RS_String* url,
+ const RS_String* url,
const RS_String* /*theme*/)
{
//attributes and selection support
@@ -732,7 +732,7 @@
void DWFRenderer::ProcessMarker(LineBuffer* srclb,
RS_MarkerDef& mdef,
bool allowOverpost,
- RS_Bounds* bounds)
+ RS_Bounds* bounds)
{
for (int i=0; i<srclb->point_count(); i++)
{
@@ -783,14 +783,14 @@
//sized symbols -- the difference happens when we play the macro
//Device space macros are played with negative size
- //construct a scaling bounding box that will take care of
+ //construct a scaling bounding box that will take care of
//the desired aspect ratio -- not that overall scaling to the
- //correct size will be done using the macro attributes, but we
- //need to take aspect into account ourselves, since macro
+ //correct size will be done using the macro attributes, but we
+ //need to take aspect into account ourselves, since macro
//only has a single overall scale factor
double lastAspect = (m_lastSymbol.width() == 0.0) ? DBL_MAX : m_lastSymbol.height() / m_lastSymbol.width();
double aspect = (mdef.width() == 0.0) ? DBL_MAX : mdef.height() / mdef.width();
-
+
RS_Bounds dst;
if (aspect <= 1.0)
@@ -946,7 +946,7 @@
symbol.serialize(*file);
}
- //end macro definition
+ //end macro definition
EndMacro(file);
}
@@ -1059,14 +1059,14 @@
file->write("))");
}
- //set actual (unrotated) bounds with new insertion point if a pointer was passed in
- if (bounds)
- {
- bounds->minx = -refX * mdef.width();
- bounds->maxx = (1.0 - refX) * mdef.width();
- bounds->miny = -refY * mdef.height();
- bounds->maxy = (1.0 - refY) * mdef.height();
- }
+ //set actual (unrotated) bounds with new insertion point if a pointer was passed in
+ if (bounds)
+ {
+ bounds->minx = -refX * mdef.width();
+ bounds->maxx = (1.0 - refX) * mdef.width();
+ bounds->miny = -refY * mdef.height();
+ bounds->maxy = (1.0 - refY) * mdef.height();
+ }
if (m_obsMesh)
m_obsMesh->ProcessPoint(x, y);
Modified: trunk/MgDev/Common/Stylization/DWFRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/DWFRenderer.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/Stylization/DWFRenderer.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -63,7 +63,6 @@
///</summary>
class DWFRenderer : public Renderer
{
-
public:
STYLIZATION_API DWFRenderer();
STYLIZATION_API virtual ~DWFRenderer();
@@ -82,10 +81,9 @@
STYLIZATION_API virtual void EndLayer ();
-
STYLIZATION_API virtual void StartFeature (RS_FeatureReader* feature,
const RS_String* tooltip = NULL,
- const RS_String* url = NULL,
+ const RS_String* url = NULL,
const RS_String* theme = NULL);
STYLIZATION_API virtual void ProcessPolygon (LineBuffer* lb,
@@ -104,7 +102,7 @@
STYLIZATION_API virtual void ProcessMarker(LineBuffer* lb,
RS_MarkerDef& mdef,
bool allowOverpost,
- RS_Bounds* bounds = NULL);
+ RS_Bounds* bounds = NULL);
STYLIZATION_API virtual void ProcessLabel(double x, double y,
const RS_String& text, RS_TextDef& tdef);
@@ -149,7 +147,6 @@
STYLIZATION_API void EndLayout();
protected:
-
//list of layer w2d streams
WT_File* m_w2dFile;
DWFCore::DWFBufferOutputStream* m_w2dStream;
@@ -191,14 +188,12 @@
void Init(RS_Bounds& extents);
protected:
-
//transformation from mapping to W2D space
double _TX(double x);
double _TY(double y);
void _TransformPointsNoClamp(double* inpts, int numpts);
private:
-
//macro/overpost opcode output -- done manually by writing to file
void BeginMacro(WT_File* file, int id, int scale);
void EndMacro(WT_File* file);
Modified: trunk/MgDev/Common/Stylization/PointAdapter.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/PointAdapter.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/Stylization/PointAdapter.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -109,10 +109,10 @@
RS_Units mdefU = RS_Units_Device;
double mdefRot = 0.0;
- //the actual position used for the marker by the Renderer
- //may be returned in this structure to help place
- //labels better
- RS_Bounds bounds = RS_Bounds(1.,1.,0.,0.); // init invalid
+ //the actual position used for the marker by the Renderer
+ //may be returned in this structure to help place
+ //labels better
+ RS_Bounds bounds = RS_Bounds(1.,1.,0.,0.); // init invalid
if (psym && psym->GetSymbol())
{
@@ -182,10 +182,10 @@
//been evaluated
double op_pts[16];
-
+
// calculate a 2 pixel offset to allow for label ghosting
- double offset = 2.0 * (0.0254 / renderer->GetDpi()); //2 pixels in meters
-
+ double offset = 2.0 * (0.0254 / renderer->GetDpi()); //2 pixels in meters
+
//in case of mapping space we need to scale by map scale
if (mdefU != RS_Units_Device)
offset *= renderer->GetMapScale();
@@ -195,12 +195,12 @@
double w = 0.5 * mdefW;
double h = 0.5 * mdefH;
- double ch = 0; // vertical center point
- double cw = 0; // horizontal center point
+ double ch = 0; // vertical center point
+ double cw = 0; // horizontal center point
w += offset;
h += offset;
-
+
bool useBounds = bounds.IsValid();
if (useBounds)
{
@@ -235,10 +235,10 @@
hsn = h * sn; nhsn = -hsn;
hcs = h * cs; nhcs = -hcs;
}
-
- cwsn = cw * sn; chsn = ch * sn;
- cwcs = cw * cs; chcs = ch * cs;
+ cwsn = cw * sn; chsn = ch * sn;
+ cwcs = cw * cs; chcs = ch * cs;
+
// find the octant that the marker is rotated into, and shift the points accordingly.
// this way, the overpost points are still within 22.5 degrees of an axis-aligned box.
// (position 0 will always be the closest to Center-Right)
@@ -259,17 +259,17 @@
{
if (!useBounds)
{
- bounds.maxx = w; bounds.minx = -w;
- bounds.maxy = h; bounds.miny = -h;
+ bounds.maxx = w; bounds.minx = -w;
+ bounds.maxy = h; bounds.miny = -h;
}
- op_pts[0] = bounds.maxx; op_pts[1] = ch;
- op_pts[2] = bounds.maxx; op_pts[3] = bounds.maxy;
- op_pts[4] = cw; op_pts[5] = bounds.maxy;
- op_pts[6] = bounds.minx; op_pts[7] = bounds.maxy;
- op_pts[8] = bounds.minx; op_pts[9] = ch;
- op_pts[10] = bounds.minx; op_pts[11] = bounds.miny;
- op_pts[12] = cw; op_pts[13] = bounds.miny;
- op_pts[14] = bounds.maxx; op_pts[15] = bounds.miny;
+ op_pts[ 0] = bounds.maxx; op_pts[ 1] = ch;
+ op_pts[ 2] = bounds.maxx; op_pts[ 3] = bounds.maxy;
+ op_pts[ 4] = cw; op_pts[ 5] = bounds.maxy;
+ op_pts[ 6] = bounds.minx; op_pts[ 7] = bounds.maxy;
+ op_pts[ 8] = bounds.minx; op_pts[ 9] = ch;
+ op_pts[10] = bounds.minx; op_pts[11] = bounds.miny;
+ op_pts[12] = cw; op_pts[13] = bounds.miny;
+ op_pts[14] = bounds.maxx; op_pts[15] = bounds.miny;
}
RS_LabelInfo candidates[8];
Modified: trunk/MgDev/Common/Stylization/Renderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/Renderer.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Common/Stylization/Renderer.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -76,7 +76,7 @@
///</summary>
virtual void StartFeature (RS_FeatureReader* feature,
const RS_String* tooltip = NULL,
- const RS_String* url = NULL,
+ const RS_String* url = NULL,
const RS_String* theme = NULL) = 0;
///<summary>
@@ -118,7 +118,7 @@
virtual void ProcessMarker(LineBuffer* lb,
RS_MarkerDef& mdef,
bool allowOverpost,
- RS_Bounds* bounds = NULL
+ RS_Bounds* bounds = NULL
) = 0;
//TODO: DEPRECATED! Use PrcessLabelGroup() instead
Modified: trunk/MgDev/Server/src/Core/main.cpp
===================================================================
--- trunk/MgDev/Server/src/Core/main.cpp 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Server/src/Core/main.cpp 2007-02-22 23:22:12 UTC (rev 1129)
@@ -234,13 +234,13 @@
bRunServerService = false;
}
-#ifndef WIN32 // Linux only Daemon mode
- else if(ACE_OS::strcasecmp(parameter, MG_WCHAR_TO_TCHAR(MgResources::ServerCmdDaemon)) == 0)
+#ifndef WIN32 // Linux only Daemon mode
+ else if(ACE_OS::strcasecmp(parameter, MG_WCHAR_TO_TCHAR(MgResources::ServerCmdDaemon)) == 0)
{
- bRunServerService = true;
- ACE_OS::printf(MG_WCHAR_TO_CHAR(MgResources::ServerCmdDaemonInfo));
+ bRunServerService = true;
+ ACE_OS::printf(MG_WCHAR_TO_CHAR(MgResources::ServerCmdDaemonInfo));
}
-#endif
+#endif
else if((ACE_OS::strcasecmp(parameter, MG_WCHAR_TO_TCHAR(MgResources::ServerCmdRun)) == 0) ||
(ACE_OS::strcasecmp(parameter, MG_WCHAR_TO_TCHAR(MgResources::ServerCmdInteractive)) == 0))
{
@@ -312,40 +312,40 @@
message = NULL;
}
#else
- // Linux Daemon code
- if (ACE::daemonize(ACE_TEXT("")) == 0)
- {
- // Open Stdin
- int nOpen = ACE_OS::open("/dev/null",O_RDWR);
- // stdout and stderr go to the same device as stdin.
- ACE_OS::dup(nOpen);
- ACE_OS::dup(nOpen);
+ // Linux Daemon code
+ if (ACE::daemonize(ACE_TEXT("")) == 0)
+ {
+ // Open Stdin
+ int nOpen = ACE_OS::open("/dev/null",O_RDWR);
+ // stdout and stderr go to the same device as stdin.
+ ACE_OS::dup(nOpen);
+ ACE_OS::dup(nOpen);
- int nlock = ACE_OS::open("/var/lock/mgserver/mgserverd.lock",O_RDWR|O_CREAT);
- // If file cannot be opened exit.
- if (nlock < 0)
- exit(1);
+ int nlock = ACE_OS::open("/var/lock/mgserver/mgserverd.lock",O_RDWR|O_CREAT);
+ // If file cannot be opened exit.
+ if (nlock < 0)
+ exit(1);
- // If file is locked exit
- if (lockf(nlock,F_TLOCK,0) < 0)
- exit(0);
-
- ACE_TCHAR strPID[20];
-
- // convert pid to string
- ACE_OS::sprintf(strPID,"%d\n",ACE_OS::getpid());
-
- //record pid to lockfile
- ACE_OS::write(nlock,strPID,ACE_OS::strlen(strPID));
+ // If file is locked exit
+ if (lockf(nlock,F_TLOCK,0) < 0)
+ exit(0);
- INT32 nResult = SERVER::instance()->init(argc, argv);
+ ACE_TCHAR strPID[20];
- if (nResult == 0)
- {
- nResult = SERVER::instance()->open();
- SERVER::instance()->fini();
- }
- }
+ // convert pid to string
+ ACE_OS::sprintf(strPID,"%d\n",ACE_OS::getpid());
+
+ //record pid to lockfile
+ ACE_OS::write(nlock,strPID,ACE_OS::strlen(strPID));
+
+ INT32 nResult = SERVER::instance()->init(argc, argv);
+
+ if (nResult == 0)
+ {
+ nResult = SERVER::instance()->open();
+ SERVER::instance()->fini();
+ }
+ }
#endif
}
}
Modified: trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObjectImpl.h
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObjectImpl.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObjectImpl.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -18,7 +18,7 @@
#ifndef GWSOBJECTIMPL_H
#define GWSOBJECTIMPL_H
-#include "GwsCommon.h" // for class GWSStatus
+#include "GwsCommon.h" // for class GWSStatus
// forward definitions
class FdoXmlWriter;
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsBinaryFeatureWriter.h
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsBinaryFeatureWriter.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/inc/GwsBinaryFeatureWriter.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -23,26 +23,26 @@
public:
GwsBinaryFeatureWriter() : m_wrtr(256) {}
~GwsBinaryFeatureWriter() {}
-
+
//get the buffer
unsigned char* ToBuffer(int& bufLen);
void Reset() { m_wrtr.Reset(); }
-
+
//write property value
- void WriteProperty(FdoPropertyDefinition* pd, FdoPropertyValue* pv,
+ void WriteProperty(FdoPropertyDefinition* pd, FdoPropertyValue* pv,
bool forAssociation = false );
void WriteProperty(FdoPropertyDefinition* pd, FdoIFeatureReader* reader);
//write associtation property value
- bool WriteAssociationProperty(FdoAssociationPropertyDefinition* apd,
+ bool WriteAssociationProperty(FdoAssociationPropertyDefinition* apd,
FdoPropertyValueCollection* pvc);
- void WriteAssociationProperty(FdoAssociationPropertyDefinition* apd,
+ void WriteAssociationProperty(FdoAssociationPropertyDefinition* apd,
FdoIFeatureReader* reader);
//write the feature
- void WriteFeature(FdoClassDefinition* fc, FdoString* fcName,
+ void WriteFeature(FdoClassDefinition* fc, FdoString* fcName,
FdoPropertyValueCollection* pvc);
void WriteFeature(FdoClassDefinition* fc, FdoString* fcName,
- FdoPropertyValueCollection* pvc,
+ FdoPropertyValueCollection* pvc,
FdoIFeatureReader* reader);
protected:
FdoDataPropertyDefinitionCollection* FindIDProps(FdoClassDefinition* fc);
Modified: trunk/MgDev/Server/src/Services/Rendering/FeatureInfoRenderer.h
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/FeatureInfoRenderer.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Server/src/Services/Rendering/FeatureInfoRenderer.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -32,7 +32,6 @@
//bedisplayed in the html viewer)
class MG_SERVER_RENDERING_API FeatureInfoRenderer : public Renderer
{
-
public:
FeatureInfoRenderer(MgSelection* selection,
int maxFeatures,
@@ -56,7 +55,6 @@
virtual void EndLayer();
-
virtual void ProcessPolygon(LineBuffer* lb,
RS_FillStyle& fill)
{}
@@ -75,10 +73,9 @@
virtual void ProcessMarker(LineBuffer* lb,
RS_MarkerDef& mdef,
bool allowOverpost,
- RS_Bounds* bounds = NULL)
+ RS_Bounds* bounds = NULL)
{}
-
virtual void ProcessLabel(double x, double y,
const RS_String& text, RS_TextDef& tdef)
{}
@@ -198,7 +195,6 @@
double m_mapScale;
private:
-
//specific to FeatureInfoRenderer
RS_String m_url;
RS_String m_tooltip;
Modified: trunk/MgDev/Server/src/Services/Resource/ServerResourceService.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ServerResourceService.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/Server/src/Services/Resource/ServerResourceService.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -66,8 +66,8 @@
MgResourceIdentifier* resource);
virtual void ApplyResourcePackage(MgByteReader* packageStream);
virtual void LoadResourcePackage(CREFSTRING packagePathname, bool logActivities);
- virtual void MakeResourcePackage(MgResourceIdentifier* resource,
- CREFSTRING packagePathname, CREFSTRING packageDescription,
+ virtual void MakeResourcePackage(MgResourceIdentifier* resource,
+ CREFSTRING packagePathname, CREFSTRING packageDescription,
bool logActivities);
// Resource Management APIs
@@ -144,7 +144,7 @@
MgStringCollection* EnumerateRoles(CREFSTRING user, CREFSTRING group);
- // Unmanaged Data APIs
+ // Unmanaged Data APIs
virtual MgByteReader* EnumerateUnmanagedData(CREFSTRING path, bool recursive, CREFSTRING select, CREFSTRING filter);
@@ -155,7 +155,7 @@
// Resource Permission related methods
MgPermissionCache* CreatePermissionCache();
- virtual bool HasPermission(MgResourceIdentifier* resource,
+ virtual bool HasPermission(MgResourceIdentifier* resource,
CREFSTRING permission);
// Other internal methods
Modified: trunk/MgDev/UnitTest/Common/FoundationTest/stdafx.h
===================================================================
--- trunk/MgDev/UnitTest/Common/FoundationTest/stdafx.h 2007-02-22 20:42:18 UTC (rev 1128)
+++ trunk/MgDev/UnitTest/Common/FoundationTest/stdafx.h 2007-02-22 23:22:12 UTC (rev 1129)
@@ -22,11 +22,8 @@
#pragma once
+// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <stdio.h>
#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
More information about the mapguide-commits
mailing list