'PropertyMgr -> PropertyHolder, for compatibility with new Gaudi.' (AraTool-00-02-12)

	* Tagging AraTool-00-02-12.
	* PropertyMgr -> PropertyHolder, for compatibility with new
	Gaudi.

2016-07-12  scott snyder  <snyder@bnl.gov>

	* Tagging AraTool-00-02-11.
	* Comply with ATLAS naming conventions.  Do not use protected data
	members.


Former-commit-id: 848e59ee

PhysicsAnalysis/AraTool/AraTool/AraAlgToolWrapper.icc

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/PropertyMgr.h"
+#include "AraTool/AraToolBase.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,7 +13,8 @@ AraAlgToolWrapper< T >::AraAlgToolWrapper( const std::string& type, const std::s
     m_log( msgSvc(), name ),
     m_factor(0)
 {
-  m_ptool=new T(getPropertyMgr());
+  AlgTool* a = this;
+  m_ptool=new T(a);
 }
 
 //___________________________________________________________________________

PhysicsAnalysis/AraTool/AraTool/AraToolBase.h

@@ -6,18 +6,27 @@
 #define ARATOOLBASE_H
 
 #include "GaudiKernel/Property.h"
-#include "GaudiKernel/PropertyMgr.h"
+#include "GaudiKernel/PropertyHolder.h"
 #include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/IDataHandleHolder.h"
+#include "GaudiKernel/CommonMessaging.h"
 #include <string>
 
 
 class AraToolBase
 {
- protected:
+public:
+  typedef PropertyHolder<CommonMessaging<implements<IAlgTool, IDataHandleHolder, IProperty, IStateful> > > PropertyMgr;
+
+protected:
+  bool runningARA() const { return m_runningARA; }
+
+private:
   PropertyMgr *m_propertyMgr;
-  bool RunningARA;
+  bool m_runningARA;
 
- public:
+
+public:
 
 
   AraToolBase(PropertyMgr * pmgr=0);
@@ -45,7 +54,7 @@ AraToolBase::declareProperty
   const std::string& doc )
 {
 
-  if(RunningARA) {
+  if(m_runningARA) {
   } else {
     return m_propertyMgr->declareProperty(name, value, doc);
   }

PhysicsAnalysis/AraTool/src/AraToolBase.cxx

@@ -5,10 +5,10 @@
 #include "AraTool/AraToolBase.h"
 
 AraToolBase::AraToolBase(PropertyMgr *pmgr)
-  :m_propertyMgr(pmgr),RunningARA(false)
+  :m_propertyMgr(pmgr),m_runningARA(false)
 {
   if(!m_propertyMgr) {
-    RunningARA=true;
+    m_runningARA=true;
   }
 }