[brlcad-commits] SF.net SVN: brlcad:[33239]
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <dav...@us...> - 2008-11-20 17:45:09
|
Revision: 33239 http://brlcad.svn.sourceforge.net/brlcad/?rev=33239&view=rev Author: davidloman Date: 2008-11-20 17:44:43 +0000 (Thu, 20 Nov 2008) Log Message: ----------- Updated Architecture to reflect object References and Pointers instead of 'pass by value' where applicable. Generated new UML images. Modified Paths: -------------- rt^3/trunk/src/iBME/Deserializeable.h rt^3/trunk/src/iBME/GUI/AbstractGui.cpp rt^3/trunk/src/iBME/GUI/AbstractGui.h rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.cpp rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.h rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.cpp rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.h rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.cpp rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.h rt^3/trunk/src/iBME/GeometryEngine/CommandResult.cpp rt^3/trunk/src/iBME/GeometryEngine/CommandResult.h rt^3/trunk/src/iBME/GeometryEngine/GED.cpp rt^3/trunk/src/iBME/GeometryEngine/GED.h rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.cpp rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.h rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.cpp rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.h rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.cpp rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.h rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.cpp rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.h rt^3/trunk/src/iBME/GeometryEngine/NonGeo.cpp rt^3/trunk/src/iBME/GeometryEngine/NonGeo.h rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.cpp rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.h rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.cpp rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.h rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.cpp rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.h rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.cpp rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.h rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.cpp rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.h rt^3/trunk/src/iBME/GeometryService/AbstractPortal.cpp rt^3/trunk/src/iBME/GeometryService/AbstractPortal.h rt^3/trunk/src/iBME/GeometryService/AccessManager.cpp rt^3/trunk/src/iBME/GeometryService/AccessManager.h rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.cpp rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.h rt^3/trunk/src/iBME/GeometryService/GeometryService.cpp rt^3/trunk/src/iBME/GeometryService/GeometryService.h rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.cpp rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.h rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.h rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.h rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.h rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.h rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.h rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.h rt^3/trunk/src/iBME/GeometryService/Jobs/NetMsgActionJob.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/NetMsgActionJob.h rt^3/trunk/src/iBME/GeometryService/Jobs/NewSessionJob.cpp rt^3/trunk/src/iBME/GeometryService/Jobs/NewSessionJob.h rt^3/trunk/src/iBME/GeometryService/NetMsg.cpp rt^3/trunk/src/iBME/GeometryService/NetMsg.h rt^3/trunk/src/iBME/GeometryService/NetMsgActionDefinitions/AbstractNetMsgActionDef.cpp rt^3/trunk/src/iBME/GeometryService/NetMsgActionDefinitions/AbstractNetMsgActionDef.h rt^3/trunk/src/iBME/GeometryService/NetMsgActionDefinitions/NetMsgActionDefManager.cpp rt^3/trunk/src/iBME/GeometryService/NetMsgActionDefinitions/NetMsgActionDefManager.h rt^3/trunk/src/iBME/GeometryService/NetMsgActionDefinitions/NewSessionNMAD.cpp rt^3/trunk/src/iBME/GeometryService/NetMsgActionDefinitions/NewSessionNMAD.h rt^3/trunk/src/iBME/GeometryService/NetSockPortal.cpp rt^3/trunk/src/iBME/GeometryService/NetSockPortal.h rt^3/trunk/src/iBME/GeometryService/Session.cpp rt^3/trunk/src/iBME/GeometryService/Session.h rt^3/trunk/src/iBME/GeometryService/SessionManager.cpp rt^3/trunk/src/iBME/GeometryService/SessionManager.h rt^3/trunk/src/iBME/Serializeable.h rt^3/trunk/src/iBME/Utilities/Config.cpp rt^3/trunk/src/iBME/Utilities/Config.h rt^3/trunk/src/iBME/Utilities/ConfigLoader.cpp rt^3/trunk/src/iBME/Utilities/ConfigLoader.h rt^3/trunk/src/iBME/docs/BME.eap rt^3/trunk/src/iBME/iBME.cpp rt^3/trunk/src/iBME/iBME.h Added Paths: ----------- rt^3/trunk/src/iBME/docs/GeometryEngine_UML.png rt^3/trunk/src/iBME/docs/GeometryService_UML.png rt^3/trunk/src/iBME/docs/iBME_UML.png Removed Paths: ------------- rt^3/trunk/src/iBME/docs/GeometryEngine_14NOV08_1400.png rt^3/trunk/src/iBME/docs/GeometryService_14NOV08_1400.png rt^3/trunk/src/iBME/docs/iBME_14NOV08_0800.png Modified: rt^3/trunk/src/iBME/Deserializeable.h =================================================================== --- rt^3/trunk/src/iBME/Deserializeable.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/Deserializeable.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // Deserializeable.h // Implementation of the Interface Deserializeable -// Created on: 20-Nov-2008 8:00:11 AM +// Created on: 20-Nov-2008 12:36:13 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_0F798DF0_E85F_48ef_9970_25CB5E8FA82B__INCLUDED_) -#define EA_0F798DF0_E85F_48ef_9970_25CB5E8FA82B__INCLUDED_ +#if !defined(EA_C1C3674E_6A22_45c2_B945_673502BE4D7D__INCLUDED_) +#define EA_C1C3674E_6A22_45c2_B945_673502BE4D7D__INCLUDED_ class Deserializeable { @@ -24,4 +24,4 @@ virtual void Deserializeable(std::istream istr) =0; }; -#endif // !defined(EA_0F798DF0_E85F_48ef_9970_25CB5E8FA82B__INCLUDED_) +#endif // !defined(EA_C1C3674E_6A22_45c2_B945_673502BE4D7D__INCLUDED_) Modified: rt^3/trunk/src/iBME/GUI/AbstractGui.cpp =================================================================== --- rt^3/trunk/src/iBME/GUI/AbstractGui.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GUI/AbstractGui.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // AbstractGui.cpp // Implementation of the Class AbstractGui -// Created on: 20-Nov-2008 8:00:06 AM +// Created on: 20-Nov-2008 12:36:07 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GUI/AbstractGui.h =================================================================== --- rt^3/trunk/src/iBME/GUI/AbstractGui.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GUI/AbstractGui.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // AbstractGui.h // Implementation of the Class AbstractGui -// Created on: 20-Nov-2008 8:00:06 AM +// Created on: 20-Nov-2008 12:36:07 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_38B8C170_C43C_4be5_9BFE_B45711B3FFB0__INCLUDED_) -#define EA_38B8C170_C43C_4be5_9BFE_B45711B3FFB0__INCLUDED_ +#if !defined(EA_683867B8_D9F5_493e_9D88_1FAAF9E6BA7B__INCLUDED_) +#define EA_683867B8_D9F5_493e_9D88_1FAAF9E6BA7B__INCLUDED_ /** * Singleton Class. @@ -20,4 +20,4 @@ virtual ~AbstractGui(); }; -#endif // !defined(EA_38B8C170_C43C_4be5_9BFE_B45711B3FFB0__INCLUDED_) +#endif // !defined(EA_683867B8_D9F5_493e_9D88_1FAAF9E6BA7B__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // AbstractResource.cpp // Implementation of the Class AbstractResource -// Created on: 20-Nov-2008 8:00:08 AM +// Created on: 20-Nov-2008 12:36:09 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/AbstractResource.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // AbstractResource.h // Implementation of the Class AbstractResource -// Created on: 20-Nov-2008 8:00:08 AM +// Created on: 20-Nov-2008 12:36:08 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_20FF477B_33BE_4e59_8DE4_2B2B50165BF9__INCLUDED_) -#define EA_20FF477B_33BE_4e59_8DE4_2B2B50165BF9__INCLUDED_ +#if !defined(EA_9A7A2B01_318D_4090_9512_0AF27D7704A9__INCLUDED_) +#define EA_9A7A2B01_318D_4090_9512_0AF27D7704A9__INCLUDED_ class AbstractResource { @@ -32,4 +32,4 @@ BrlcadDbResrc db_file; }; -#endif // !defined(EA_20FF477B_33BE_4e59_8DE4_2B2B50165BF9__INCLUDED_) +#endif // !defined(EA_9A7A2B01_318D_4090_9512_0AF27D7704A9__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // AbstractResourceSource.cpp // Implementation of the Class AbstractResourceSource -// Created on: 20-Nov-2008 8:00:08 AM +// Created on: 20-Nov-2008 12:36:09 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -22,13 +22,13 @@ -AbstractResource AbstractResourceSource::getResourceByURL(URL url){ +AbstractResource& AbstractResourceSource::getResourceByURL(URL url){ return NULL; } -bool AbstractResourceSource::putResource(AbstractResource res){ +bool AbstractResourceSource::putResource(AbstractResource& res){ return false; } \ No newline at end of file Modified: rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/AbstractResourceSource.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,15 +1,13 @@ /////////////////////////////////////////////////////////// // AbstractResourceSource.h // Implementation of the Class AbstractResourceSource -// Created on: 20-Nov-2008 8:00:08 AM +// Created on: 20-Nov-2008 12:36:09 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_D1E248C9_D19C_4b63_9B7D_4417E890C8A4__INCLUDED_) -#define EA_D1E248C9_D19C_4b63_9B7D_4417E890C8A4__INCLUDED_ +#if !defined(EA_D181387C_3F7D_4a1f_A0F7_5208BFC161FC__INCLUDED_) +#define EA_D181387C_3F7D_4a1f_A0F7_5208BFC161FC__INCLUDED_ -#include "AbstractResource.h" - class AbstractResourceSource { @@ -17,8 +15,8 @@ AbstractResourceSource(); virtual ~AbstractResourceSource(); - virtual AbstractResource getResourceByURL(URL url); - bool putResource(AbstractResource res); + virtual AbstractResource& getResourceByURL(URL url); + bool putResource(AbstractResource& res); }; -#endif // !defined(EA_D1E248C9_D19C_4b63_9B7D_4417E890C8A4__INCLUDED_) +#endif // !defined(EA_D181387C_3F7D_4a1f_A0F7_5208BFC161FC__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // BrlcadDbResource.cpp // Implementation of the Class BrlcadDbResource -// Created on: 20-Nov-2008 8:00:09 AM +// Created on: 20-Nov-2008 12:36:10 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -22,13 +22,13 @@ -AbstractResource BrlcadDbResource::getGeometryByObjectName(std::string name){ +AbstractResource& BrlcadDbResource::getGeometryByObjectName(std::string name){ return NULL; } -AbstractResource BrlcadDbResource::getGeometryByUUName(UUName uuname){ +AbstractResource& BrlcadDbResource::getGeometryByUUID(UUID uuid){ return NULL; } \ No newline at end of file Modified: rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/BrlcadDbResource.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // BrlcadDbResource.h // Implementation of the Class BrlcadDbResource -// Created on: 20-Nov-2008 8:00:09 AM +// Created on: 20-Nov-2008 12:36:10 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_415FFE3D_2D17_4d6c_916B_A23DEE280A15__INCLUDED_) -#define EA_415FFE3D_2D17_4d6c_916B_A23DEE280A15__INCLUDED_ +#if !defined(EA_79F7C967_621A_490a_9CAE_07D646A138B8__INCLUDED_) +#define EA_79F7C967_621A_490a_9CAE_07D646A138B8__INCLUDED_ #include "AbstractResource.h" @@ -17,8 +17,8 @@ BrlcadDbResource(); virtual ~BrlcadDbResource(); - virtual AbstractResource getGeometryByObjectName(std::string name); - virtual AbstractResource getGeometryByUUName(UUName uuname); + virtual AbstractResource& getGeometryByObjectName(std::string name); + virtual AbstractResource& getGeometryByUUID(UUID uuid); private: /** @@ -32,7 +32,7 @@ /** * Directory of BRL-CAD object names and their offset into the BRL-CAD db */ - Map < std::string, AbstractGeometry> nameMap; + Map < std::string, AbstractGeometry& > nameMap; }; -#endif // !defined(EA_415FFE3D_2D17_4d6c_916B_A23DEE280A15__INCLUDED_) +#endif // !defined(EA_79F7C967_621A_490a_9CAE_07D646A138B8__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/CommandResult.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/CommandResult.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/CommandResult.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // CommandResult.cpp // Implementation of the Class CommandResult -// Created on: 20-Nov-2008 8:00:09 AM +// Created on: 20-Nov-2008 12:36:10 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/CommandResult.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/CommandResult.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/CommandResult.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // CommandResult.h // Implementation of the Class CommandResult -// Created on: 20-Nov-2008 8:00:09 AM +// Created on: 20-Nov-2008 12:36:10 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_98450CF2_B0D7_49a0_A71F_C652F6FEB3AB__INCLUDED_) -#define EA_98450CF2_B0D7_49a0_A71F_C652F6FEB3AB__INCLUDED_ +#if !defined(EA_46F3C252_C918_452b_9425_07C587C5B4A3__INCLUDED_) +#define EA_46F3C252_C918_452b_9425_07C587C5B4A3__INCLUDED_ class CommandResult { @@ -22,4 +22,4 @@ int ResultValue; }; -#endif // !defined(EA_98450CF2_B0D7_49a0_A71F_C652F6FEB3AB__INCLUDED_) +#endif // !defined(EA_46F3C252_C918_452b_9425_07C587C5B4A3__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/GED.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GED.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GED.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // GED.cpp // Implementation of the Class GED -// Created on: 20-Nov-2008 8:00:11 AM +// Created on: 20-Nov-2008 12:36:13 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/GED.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GED.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GED.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // GED.h // Implementation of the Class GED -// Created on: 20-Nov-2008 8:00:11 AM +// Created on: 20-Nov-2008 12:36:13 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_FCB0B7FC_1EE2_4fab_B7ED_E281D15CEA58__INCLUDED_) -#define EA_FCB0B7FC_1EE2_4fab_B7ED_E281D15CEA58__INCLUDED_ +#if !defined(EA_4729F038_7A9A_4157_AD2F_055AA67CD8DA__INCLUDED_) +#define EA_4729F038_7A9A_4157_AD2F_055AA67CD8DA__INCLUDED_ /** * Static Class, or Singleton Class. Explore the possibility of having multiple @@ -20,4 +20,4 @@ virtual ~GED(); }; -#endif // !defined(EA_FCB0B7FC_1EE2_4fab_B7ED_E281D15CEA58__INCLUDED_) +#endif // !defined(EA_4729F038_7A9A_4157_AD2F_055AA67CD8DA__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // GeoCollection.cpp // Implementation of the Class GeoCollection -// Created on: 20-Nov-2008 8:00:12 AM +// Created on: 20-Nov-2008 12:36:14 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeoCollection.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // GeoCollection.h // Implementation of the Class GeoCollection -// Created on: 20-Nov-2008 8:00:12 AM +// Created on: 20-Nov-2008 12:36:14 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_DF6577E5_4BDE_42a9_BB38_6D9C628C7E7C__INCLUDED_) -#define EA_DF6577E5_4BDE_42a9_BB38_6D9C628C7E7C__INCLUDED_ +#if !defined(EA_567443B3_59F6_4ca9_A514_34CB028E331A__INCLUDED_) +#define EA_567443B3_59F6_4ca9_A514_34CB028E331A__INCLUDED_ #include "AbstractResource.h" @@ -18,4 +18,4 @@ virtual ~GeoCollection(); }; -#endif // !defined(EA_DF6577E5_4BDE_42a9_BB38_6D9C628C7E7C__INCLUDED_) +#endif // !defined(EA_567443B3_59F6_4ca9_A514_34CB028E331A__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // GeoRegion.cpp // Implementation of the Class GeoRegion -// Created on: 20-Nov-2008 8:00:13 AM +// Created on: 20-Nov-2008 12:36:15 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeoRegion.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // GeoRegion.h // Implementation of the Class GeoRegion -// Created on: 20-Nov-2008 8:00:13 AM +// Created on: 20-Nov-2008 12:36:15 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_C4BC0D1A_2809_4aa5_8451_8575BD9A7015__INCLUDED_) -#define EA_C4BC0D1A_2809_4aa5_8451_8575BD9A7015__INCLUDED_ +#if !defined(EA_B390EF0D_AC10_4933_BAA9_8B2C193857C4__INCLUDED_) +#define EA_B390EF0D_AC10_4933_BAA9_8B2C193857C4__INCLUDED_ #include "GeoCollection.h" @@ -18,4 +18,4 @@ virtual ~GeoRegion(); }; -#endif // !defined(EA_C4BC0D1A_2809_4aa5_8451_8575BD9A7015__INCLUDED_) +#endif // !defined(EA_B390EF0D_AC10_4933_BAA9_8B2C193857C4__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // GeoSolid.cpp // Implementation of the Class GeoSolid -// Created on: 20-Nov-2008 8:00:13 AM +// Created on: 20-Nov-2008 12:36:15 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeoSolid.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // GeoSolid.h // Implementation of the Class GeoSolid -// Created on: 20-Nov-2008 8:00:13 AM +// Created on: 20-Nov-2008 12:36:15 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_1C2DE478_4BFD_4e86_8B48_0B326D152828__INCLUDED_) -#define EA_1C2DE478_4BFD_4e86_8B48_0B326D152828__INCLUDED_ +#if !defined(EA_E03E2F98_D6A5_4cb0_8CDC_0C7667F1B961__INCLUDED_) +#define EA_E03E2F98_D6A5_4cb0_8CDC_0C7667F1B961__INCLUDED_ #include "AbstractResource.h" @@ -18,4 +18,4 @@ virtual ~GeoSolid(); }; -#endif // !defined(EA_1C2DE478_4BFD_4e86_8B48_0B326D152828__INCLUDED_) +#endif // !defined(EA_E03E2F98_D6A5_4cb0_8CDC_0C7667F1B961__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // GeometryEngine.cpp // Implementation of the Class GeometryEngine -// Created on: 20-Nov-2008 8:00:12 AM +// Created on: 20-Nov-2008 12:36:14 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/GeometryEngine.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // GeometryEngine.h // Implementation of the Class GeometryEngine -// Created on: 20-Nov-2008 8:00:12 AM +// Created on: 20-Nov-2008 12:36:14 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_935BCA7F_1D0E_4c01_AADD_69D9DEAE1E8D__INCLUDED_) -#define EA_935BCA7F_1D0E_4c01_AADD_69D9DEAE1E8D__INCLUDED_ +#if !defined(EA_0435AF58_6F02_4c83_B821_C9A85CB6FF89__INCLUDED_) +#define EA_0435AF58_6F02_4c83_B821_C9A85CB6FF89__INCLUDED_ #include "GED.h" #include "ResourceManager.h" @@ -26,4 +26,4 @@ ResourceManager *m_ResourceManager; }; -#endif // !defined(EA_935BCA7F_1D0E_4c01_AADD_69D9DEAE1E8D__INCLUDED_) +#endif // !defined(EA_0435AF58_6F02_4c83_B821_C9A85CB6FF89__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/NonGeo.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/NonGeo.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/NonGeo.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // NonGeo.cpp // Implementation of the Class NonGeo -// Created on: 20-Nov-2008 8:00:17 AM +// Created on: 20-Nov-2008 12:36:20 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/NonGeo.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/NonGeo.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/NonGeo.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // NonGeo.h // Implementation of the Class NonGeo -// Created on: 20-Nov-2008 8:00:17 AM +// Created on: 20-Nov-2008 12:36:19 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_115602F6_51AB_4dca_AA03_D6807D379D11__INCLUDED_) -#define EA_115602F6_51AB_4dca_AA03_D6807D379D11__INCLUDED_ +#if !defined(EA_964AFE57_E32B_46fe_AD06_007964C3D8F5__INCLUDED_) +#define EA_964AFE57_E32B_46fe_AD06_007964C3D8F5__INCLUDED_ #include "AbstractResource.h" @@ -18,4 +18,4 @@ virtual ~NonGeo(); }; -#endif // !defined(EA_115602F6_51AB_4dca_AA03_D6807D379D11__INCLUDED_) +#endif // !defined(EA_964AFE57_E32B_46fe_AD06_007964C3D8F5__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // ResourceCache.cpp // Implementation of the Class ResourceCache -// Created on: 20-Nov-2008 8:00:18 AM +// Created on: 20-Nov-2008 12:36:20 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -22,19 +22,19 @@ -AbstractResource ResourceCache::getResourceByURL(URL url){ +AbstractResource& ResourceCache::getResourceByURL(URL url){ return NULL; } -bool ResourceCache::addResource(AbstractResource ar){ +bool ResourceCache::addResource(AbstractResource& ar){ return false; } -bool ResourceCache::putResource(AbstractResource res){ +bool ResourceCache::putResource(AbstractResource& res){ return false; } \ No newline at end of file Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceCache.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // ResourceCache.h // Implementation of the Class ResourceCache -// Created on: 20-Nov-2008 8:00:18 AM +// Created on: 20-Nov-2008 12:36:20 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_B6EDC994_8297_4093_841B_35133708BBAC__INCLUDED_) -#define EA_B6EDC994_8297_4093_841B_35133708BBAC__INCLUDED_ +#if !defined(EA_F50C50EA_ED65_432e_B579_983979FFFF2B__INCLUDED_) +#define EA_F50C50EA_ED65_432e_B579_983979FFFF2B__INCLUDED_ #include "AbstractResourceSource.h" #include "AbstractResource.h" @@ -19,13 +19,15 @@ virtual ~ResourceCache(); AbstractResource *m_AbstractResource; - virtual AbstractResource getResourceByURL(URL url); - bool addResource(AbstractResource ar); - bool putResource(AbstractResource res); + virtual AbstractResource& getResourceByURL(URL url); + bool addResource(AbstractResource& ar); + bool putResource(AbstractResource& res); private: - std::set <AbstractResource> ResourceCacheSet; - std::map <URL, AbstractResource> URLResourceMap; + std::set <AbstractResource&> ResourceCacheSet; + std::map <URL, AbstractResource&> URLResourceMap; + std::map <UUID, AbstractResource&> UUIDResourceMap; + std::map <AbstractResource&. AbstractResourceSource&> ResourceOriginMap; }; -#endif // !defined(EA_B6EDC994_8297_4093_841B_35133708BBAC__INCLUDED_) +#endif // !defined(EA_F50C50EA_ED65_432e_B579_983979FFFF2B__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // ResourceDiskLink.cpp // Implementation of the Class ResourceDiskLink -// Created on: 20-Nov-2008 8:00:18 AM +// Created on: 20-Nov-2008 12:36:20 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -22,13 +22,13 @@ -AbstractResource ResourceDiskLink::getResourceByURL(URL url){ +AbstractResource& ResourceDiskLink::getResourceByURL(URL url){ return NULL; } -bool ResourceDiskLink::putResource(AbstractResource res){ +bool ResourceDiskLink::putResource(AbstractResource& res){ return false; } \ No newline at end of file Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceDiskLink.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // ResourceDiskLink.h // Implementation of the Class ResourceDiskLink -// Created on: 20-Nov-2008 8:00:18 AM +// Created on: 20-Nov-2008 12:36:20 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_4B2A4CB8_C5C7_4170_8F5C_C027B2137287__INCLUDED_) -#define EA_4B2A4CB8_C5C7_4170_8F5C_C027B2137287__INCLUDED_ +#if !defined(EA_445C945E_EB00_4bfc_8252_D317E7E84456__INCLUDED_) +#define EA_445C945E_EB00_4bfc_8252_D317E7E84456__INCLUDED_ #include "AbstractResourceSource.h" @@ -17,8 +17,8 @@ ResourceDiskLink(); virtual ~ResourceDiskLink(); - virtual AbstractResource getResourceByURL(URL url); - bool putResource(AbstractResource res); + virtual AbstractResource& getResourceByURL(URL url); + bool putResource(AbstractResource& res); }; -#endif // !defined(EA_4B2A4CB8_C5C7_4170_8F5C_C027B2137287__INCLUDED_) +#endif // !defined(EA_445C945E_EB00_4bfc_8252_D317E7E84456__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // ResourceManager.cpp // Implementation of the Class ResourceManager -// Created on: 20-Nov-2008 8:00:19 AM +// Created on: 20-Nov-2008 12:36:21 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -16,4 +16,19 @@ ResourceManager::~ResourceManager(){ +} + + + + + +AbstractResource& ResourceManager::getResourceByURL(URL url){ + + return NULL; +} + + +AbstractResource& ResourceManager::getResourceByUUID(UUID uuid){ + + return NULL; } \ No newline at end of file Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceManager.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // ResourceManager.h // Implementation of the Class ResourceManager -// Created on: 20-Nov-2008 8:00:18 AM +// Created on: 20-Nov-2008 12:36:20 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_0A18A8C8_8F96_4f41_B602_63E24FD71031__INCLUDED_) -#define EA_0A18A8C8_8F96_4f41_B602_63E24FD71031__INCLUDED_ +#if !defined(EA_658D4563_2739_41a1_A144_82D5852AD35A__INCLUDED_) +#define EA_658D4563_2739_41a1_A144_82D5852AD35A__INCLUDED_ #include "AbstractResourceSource.h" @@ -18,8 +18,11 @@ virtual ~ResourceManager(); AbstractResourceSource *m_AbstractResourceSource; + AbstractResource& getResourceByURL(URL url); + AbstractResource& getResourceByUUID(UUID uuid); + private: - std::list <AbstractResourceSource> resSources; + std::list <AbstractResourceSource&> resSources; }; -#endif // !defined(EA_0A18A8C8_8F96_4f41_B602_63E24FD71031__INCLUDED_) +#endif // !defined(EA_658D4563_2739_41a1_A144_82D5852AD35A__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // ResourceManifest.cpp // Implementation of the Class ResourceManifest -// Created on: 20-Nov-2008 8:00:19 AM +// Created on: 20-Nov-2008 12:36:21 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceManifest.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // ResourceManifest.h // Implementation of the Class ResourceManifest -// Created on: 20-Nov-2008 8:00:19 AM +// Created on: 20-Nov-2008 12:36:21 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_161D05C9_42EF_4714_9221_6E5B9D8960F9__INCLUDED_) -#define EA_161D05C9_42EF_4714_9221_6E5B9D8960F9__INCLUDED_ +#if !defined(EA_D1CF56DA_ADE4_47bb_A75E_09930745EF0D__INCLUDED_) +#define EA_D1CF56DA_ADE4_47bb_A75E_09930745EF0D__INCLUDED_ class ResourceManifest { @@ -17,7 +17,7 @@ private: std::list<UUID> ResourceList; - std::map<UUID, AbstractResource> ResourceMap; + std::map<UUID, AbstractResource& > ResourceMap; }; -#endif // !defined(EA_161D05C9_42EF_4714_9221_6E5B9D8960F9__INCLUDED_) +#endif // !defined(EA_D1CF56DA_ADE4_47bb_A75E_09930745EF0D__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // ResourceSvnLink.cpp // Implementation of the Class ResourceSvnLink -// Created on: 20-Nov-2008 8:00:19 AM +// Created on: 20-Nov-2008 12:36:21 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -22,13 +22,13 @@ -AbstractResource ResourceSvnLink::getResourceByURL(URL url){ +AbstractResource& ResourceSvnLink::getResourceByURL(URL url){ return NULL; } -bool ResourceSvnLink::putResource(AbstractResource res){ +bool ResourceSvnLink::putResource(AbstractResource& res){ return false; } \ No newline at end of file Modified: rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.h =================================================================== --- rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryEngine/ResourceSvnLink.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,14 +1,13 @@ /////////////////////////////////////////////////////////// // ResourceSvnLink.h // Implementation of the Class ResourceSvnLink -// Created on: 20-Nov-2008 8:00:19 AM +// Created on: 20-Nov-2008 12:36:21 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_CFAE2FCC_88DE_4dc7_9D46_CD0ED6391472__INCLUDED_) -#define EA_CFAE2FCC_88DE_4dc7_9D46_CD0ED6391472__INCLUDED_ +#if !defined(EA_874F027B_30FB_4d9a_997A_F868A7683BEC__INCLUDED_) +#define EA_874F027B_30FB_4d9a_997A_F868A7683BEC__INCLUDED_ -#include "AbstractResource.h" #include "AbstractResourceSource.h" class ResourceSvnLink : public AbstractResourceSource @@ -18,8 +17,8 @@ ResourceSvnLink(); virtual ~ResourceSvnLink(); - virtual AbstractResource getResourceByURL(URL url); - bool putResource(AbstractResource res); + virtual AbstractResource& getResourceByURL(URL url); + bool putResource(AbstractResource& res); }; -#endif // !defined(EA_CFAE2FCC_88DE_4dc7_9D46_CD0ED6391472__INCLUDED_) +#endif // !defined(EA_874F027B_30FB_4d9a_997A_F868A7683BEC__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/AbstractPortal.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/AbstractPortal.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/AbstractPortal.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // AbstractPortal.cpp // Implementation of the Class AbstractPortal -// Created on: 20-Nov-2008 8:00:07 AM +// Created on: 20-Nov-2008 12:36:08 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/AbstractPortal.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/AbstractPortal.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/AbstractPortal.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // AbstractPortal.h // Implementation of the Class AbstractPortal -// Created on: 20-Nov-2008 8:00:07 AM +// Created on: 20-Nov-2008 12:36:08 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_E02FC3F7_1E66_4b69_BCCC_E77FFF45019E__INCLUDED_) -#define EA_E02FC3F7_1E66_4b69_BCCC_E77FFF45019E__INCLUDED_ +#if !defined(EA_E01DD748_B11D_4223_9B40_4533C2135B1E__INCLUDED_) +#define EA_E01DD748_B11D_4223_9B40_4533C2135B1E__INCLUDED_ class AbstractPortal { @@ -21,4 +21,4 @@ std::list <std::string> proxy_hosts; }; -#endif // !defined(EA_E02FC3F7_1E66_4b69_BCCC_E77FFF45019E__INCLUDED_) +#endif // !defined(EA_E01DD748_B11D_4223_9B40_4533C2135B1E__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/AccessManager.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/AccessManager.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/AccessManager.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // AccessManager.cpp // Implementation of the Class AccessManager -// Created on: 20-Nov-2008 8:00:09 AM +// Created on: 20-Nov-2008 12:36:09 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/AccessManager.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/AccessManager.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/AccessManager.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // AccessManager.h // Implementation of the Class AccessManager -// Created on: 20-Nov-2008 8:00:08 AM +// Created on: 20-Nov-2008 12:36:09 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_CA566261_3748_4b41_9425_30DF3EA49CD1__INCLUDED_) -#define EA_CA566261_3748_4b41_9425_30DF3EA49CD1__INCLUDED_ +#if !defined(EA_B02AA972_7846_4378_9AAF_E755529A4CD0__INCLUDED_) +#define EA_B02AA972_7846_4378_9AAF_E755529A4CD0__INCLUDED_ class AccessManager { @@ -16,4 +16,4 @@ virtual ~AccessManager(); }; -#endif // !defined(EA_CA566261_3748_4b41_9425_30DF3EA49CD1__INCLUDED_) +#endif // !defined(EA_B02AA972_7846_4378_9AAF_E755529A4CD0__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // CommunicationsManager.cpp // Implementation of the Class CommunicationsManager -// Created on: 20-Nov-2008 8:00:10 AM +// Created on: 20-Nov-2008 12:36:10 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/CommunicationsManager.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // CommunicationsManager.h // Implementation of the Class CommunicationsManager -// Created on: 20-Nov-2008 8:00:09 AM +// Created on: 20-Nov-2008 12:36:10 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_92AA3A5A_13E3_4189_824B_A233219A3C8D__INCLUDED_) -#define EA_92AA3A5A_13E3_4189_824B_A233219A3C8D__INCLUDED_ +#if !defined(EA_C3CB83B5_968B_4289_B37A_44626C6BD460__INCLUDED_) +#define EA_C3CB83B5_968B_4289_B37A_44626C6BD460__INCLUDED_ #include "AbstractPortal.h" @@ -22,15 +22,15 @@ AbstractPortal *m_AbstractPortal; private: - std::list <NetMsg> inbox; - std::list <NetMsg> outbox; + std::list <NetMsg&> inbox; + std::list <NetMsg&> outbox; /** * Maps hostnames to AbstractPortals * * This MAY not be necessary if all outgoing Traffic is handled by the individual * Session Objects */ - std::map <std::string, AbstractPortal> portals; + std::map <std::string, AbstractPortal&> portals; }; -#endif // !defined(EA_92AA3A5A_13E3_4189_824B_A233219A3C8D__INCLUDED_) +#endif // !defined(EA_C3CB83B5_968B_4289_B37A_44626C6BD460__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/GeometryService.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/GeometryService.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/GeometryService.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // GeometryService.cpp // Implementation of the Class GeometryService -// Created on: 20-Nov-2008 8:00:13 AM +// Created on: 20-Nov-2008 12:36:14 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/GeometryService.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/GeometryService.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/GeometryService.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,19 +1,17 @@ /////////////////////////////////////////////////////////// // GeometryService.h // Implementation of the Class GeometryService -// Created on: 20-Nov-2008 8:00:12 AM +// Created on: 20-Nov-2008 12:36:14 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_ABCBB439_21A8_4f2e_BF63_7A8CA9C1DC7F__INCLUDED_) -#define EA_ABCBB439_21A8_4f2e_BF63_7A8CA9C1DC7F__INCLUDED_ +#if !defined(EA_1497BD4C_DB75_46d3_9E8C_9EABD9F38CB9__INCLUDED_) +#define EA_1497BD4C_DB75_46d3_9E8C_9EABD9F38CB9__INCLUDED_ -#include "JobManager.h" -#include "SessionManager.h" +#include "GeometryEngine.h" #include "CommunicationsManager.h" -#include "NetMsgActionDefManager.h" +#include "SessionManager.h" #include "AccessManager.h" -#include "GeometryEngine.h" /** * Singleton Class. @@ -35,11 +33,11 @@ /** * Configure jobMan to be a singleton?? */ - JobManager jobMan; - SessionManager sessionMan; - CommunicationsManager comMan; - NetMsgActionDefManager nmadMan; - AccessManager accessMan; + JobManager& jobMan; + SessionManager& sessionMan; + CommunicationsManager& comMan; + NetMsgActionDefManager& nmadMan; + AccessManager& accessMan; }; -#endif // !defined(EA_ABCBB439_21A8_4f2e_BF63_7A8CA9C1DC7F__INCLUDED_) +#endif // !defined(EA_1497BD4C_DB75_46d3_9E8C_9EABD9F38CB9__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // IntraAppPortal.cpp // Implementation of the Class IntraAppPortal -// Created on: 20-Nov-2008 8:00:14 AM +// Created on: 20-Nov-2008 12:36:16 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/IntraAppPortal.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // IntraAppPortal.h // Implementation of the Class IntraAppPortal -// Created on: 20-Nov-2008 8:00:14 AM +// Created on: 20-Nov-2008 12:36:16 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_49D79447_21D6_41f0_9ED9_E2F9BBE3BFB1__INCLUDED_) -#define EA_49D79447_21D6_41f0_9ED9_E2F9BBE3BFB1__INCLUDED_ +#if !defined(EA_29193F7C_FF22_422e_AA4F_50EC5FDAD8FD__INCLUDED_) +#define EA_29193F7C_FF22_422e_AA4F_50EC5FDAD8FD__INCLUDED_ #include "AbstractPortal.h" @@ -18,4 +18,4 @@ virtual ~IntraAppPortal(); }; -#endif // !defined(EA_49D79447_21D6_41f0_9ED9_E2F9BBE3BFB1__INCLUDED_) +#endif // !defined(EA_29193F7C_FF22_422e_AA4F_50EC5FDAD8FD__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // AbstractJob.cpp // Implementation of the Class AbstractJob -// Created on: 20-Nov-2008 8:00:07 AM +// Created on: 20-Nov-2008 12:36:07 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// @@ -25,7 +25,7 @@ /** * Constructor */ -void AbstractJob::AbstractJob(JobManager jm){ +void AbstractJob::AbstractJob(JobManager& jm){ } Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/AbstractJob.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // AbstractJob.h // Implementation of the Class AbstractJob -// Created on: 20-Nov-2008 8:00:07 AM +// Created on: 20-Nov-2008 12:36:07 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_23281174_6F52_4fab_8A5E_E5B27A3EAE5E__INCLUDED_) -#define EA_23281174_6F52_4fab_8A5E_E5B27A3EAE5E__INCLUDED_ +#if !defined(EA_3014E829_A810_4c4a_A62A_D0F7ED422E81__INCLUDED_) +#define EA_3014E829_A810_4c4a_A62A_D0F7ED422E81__INCLUDED_ #include "JobManager.h" @@ -18,12 +18,12 @@ virtual ~AbstractJob(); JobManager *m_JobManager; - void AbstractJob(JobManager jm); + void AbstractJob(JobManager& jm); virtual bool doJob(); private: int jobID; - JobManager jobMan; + JobManager& jobMan; }; -#endif // !defined(EA_23281174_6F52_4fab_8A5E_E5B27A3EAE5E__INCLUDED_) +#endif // !defined(EA_3014E829_A810_4c4a_A62A_D0F7ED422E81__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // CopyCacheToDiskJob.cpp // Implementation of the Class CopyCacheToDiskJob -// Created on: 20-Nov-2008 8:00:11 AM +// Created on: 20-Nov-2008 12:36:12 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToDiskJob.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // CopyCacheToDiskJob.h // Implementation of the Class CopyCacheToDiskJob -// Created on: 20-Nov-2008 8:00:10 AM +// Created on: 20-Nov-2008 12:36:12 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_DA5100E0_51FB_4125_8C5E_313F70DAD449__INCLUDED_) -#define EA_DA5100E0_51FB_4125_8C5E_313F70DAD449__INCLUDED_ +#if !defined(EA_2165E136_E8BE_4a67_8D31_71C2998BB642__INCLUDED_) +#define EA_2165E136_E8BE_4a67_8D31_71C2998BB642__INCLUDED_ #include "AbstractJob.h" @@ -20,7 +20,7 @@ virtual bool doJob(); private: - AbstractResource resToCopy; + AbstractResource& resToCopy; }; -#endif // !defined(EA_DA5100E0_51FB_4125_8C5E_313F70DAD449__INCLUDED_) +#endif // !defined(EA_2165E136_E8BE_4a67_8D31_71C2998BB642__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // CopyCacheToSvnJob.cpp // Implementation of the Class CopyCacheToSvnJob -// Created on: 20-Nov-2008 8:00:11 AM +// Created on: 20-Nov-2008 12:36:13 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/CopyCacheToSvnJob.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // CopyCacheToSvnJob.h // Implementation of the Class CopyCacheToSvnJob -// Created on: 20-Nov-2008 8:00:11 AM +// Created on: 20-Nov-2008 12:36:13 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_C031906E_9965_4a09_8A10_3F9E14163718__INCLUDED_) -#define EA_C031906E_9965_4a09_8A10_3F9E14163718__INCLUDED_ +#if !defined(EA_47003FA6_4B8D_4b59_BD59_1015B982613E__INCLUDED_) +#define EA_47003FA6_4B8D_4b59_BD59_1015B982613E__INCLUDED_ #include "AbstractJob.h" @@ -20,7 +20,7 @@ virtual bool doJob(); private: - AbstractResource resToCopy; + AbstractResource& resToCopy; }; -#endif // !defined(EA_C031906E_9965_4a09_8A10_3F9E14163718__INCLUDED_) +#endif // !defined(EA_47003FA6_4B8D_4b59_BD59_1015B982613E__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // JobManager.cpp // Implementation of the Class JobManager -// Created on: 20-Nov-2008 8:00:14 AM +// Created on: 20-Nov-2008 12:36:16 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/JobManager.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // JobManager.h // Implementation of the Class JobManager -// Created on: 20-Nov-2008 8:00:14 AM +// Created on: 20-Nov-2008 12:36:16 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_254D317D_906D_4600_B293_3BED2BBDE078__INCLUDED_) -#define EA_254D317D_906D_4600_B293_3BED2BBDE078__INCLUDED_ +#if !defined(EA_5257E0FF_7478_470c_9222_6682395C661F__INCLUDED_) +#define EA_5257E0FF_7478_470c_9222_6682395C661F__INCLUDED_ #include "AbstractJob.h" #include "JobWorker.h" @@ -21,7 +21,7 @@ JobWorker *m_JobWorker; private: - std::list <AbstractJob> jobQueue; + std::list <AbstractJob&> jobQueue; }; -#endif // !defined(EA_254D317D_906D_4600_B293_3BED2BBDE078__INCLUDED_) +#endif // !defined(EA_5257E0FF_7478_470c_9222_6682395C661F__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // JobScheduler.cpp // Implementation of the Class JobScheduler -// Created on: 20-Nov-2008 8:00:15 AM +// Created on: 20-Nov-2008 12:36:17 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/JobScheduler.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////// // JobScheduler.h // Implementation of the Class JobScheduler -// Created on: 20-Nov-2008 8:00:14 AM +// Created on: 20-Nov-2008 12:36:17 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_EBD82BBA_7E68_41d2_8C4A_3B23DF0CA508__INCLUDED_) -#define EA_EBD82BBA_7E68_41d2_8C4A_3B23DF0CA508__INCLUDED_ +#if !defined(EA_DA5CA626_9D3F_4b46_A50A_7C550CBD8F4C__INCLUDED_) +#define EA_DA5CA626_9D3F_4b46_A50A_7C550CBD8F4C__INCLUDED_ class JobScheduler { @@ -16,4 +16,4 @@ virtual ~JobScheduler(); }; -#endif // !defined(EA_EBD82BBA_7E68_41d2_8C4A_3B23DF0CA508__INCLUDED_) +#endif // !defined(EA_DA5CA626_9D3F_4b46_A50A_7C550CBD8F4C__INCLUDED_) Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.cpp =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.cpp 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.cpp 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////// // JobWorker.cpp // Implementation of the Class JobWorker -// Created on: 20-Nov-2008 8:00:15 AM +// Created on: 20-Nov-2008 12:36:17 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// Modified: rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.h =================================================================== --- rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.h 2008-11-20 17:28:41 UTC (rev 33238) +++ rt^3/trunk/src/iBME/GeometryService/Jobs/JobWorker.h 2008-11-20 17:44:43 UTC (rev 33239) @@ -1,15 +1,15 @@ /////////////////////////////////////////////////////////// // JobWorker.h // Implementation of the Class JobWorker -// Created on: 20-Nov-2008 8:00:15 AM +// Created on: 20-Nov-2008 12:36:17 PM // Original author: david.h.loman /////////////////////////////////////////////////////////// -#if !defined(EA_D7262FD7_6707_4792_9036... [truncated message content] |