support XContainer - so that other instances may listen for insertions/removals of data sources

dbaccess/source/core/dataaccess/databasecontext.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: databasecontext.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: fs $ $Date: 2000-11-10 17:28:17 $
+ *  last change: $Author: fs $ $Date: 2000-12-10 16:14:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,6 +161,7 @@ Reference< XInterface >
 ODatabaseContext::ODatabaseContext(const Reference< XMultiServiceFactory >  & xServiceManager)
                        :DatabaseAccessContext_Base(m_aMutex)
                        ,m_xServiceManager(xServiceManager)
+                       ,m_aContainerListeners(m_aMutex)
 {
     DBG_CTOR(ODatabaseContext,NULL);
 
@@ -250,6 +251,11 @@ sal_Int64 SAL_CALL ODatabaseContext::getSomething(const Sequence<sal_Int8>& _rId
 //------------------------------------------------------------------------------
 void ODatabaseContext::disposing()
 {
+    // notify our listener
+    EventObject aDisposeEvent(static_cast< XContainer* >(this));
+    m_aContainerListeners.disposeAndClear(aDisposeEvent);
+
+    // dispose the data sources
     for (   ObjectCache::iterator   aIter = m_aDatabaseObjects.begin();
             aIter != m_aDatabaseObjects.end();
             ++aIter
@@ -398,6 +404,11 @@ void ODatabaseContext::registerObject(const rtl::OUString& _rName, const Referen
     else
         DBG_ERROR("ODatabaseContext::registerObject: missing the XComponent interface!");
 
+    // notify our container listeners
+    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rName), makeAny(_rxObject), Any());
+    OInterfaceIteratorHelper aListenerLoop(m_aContainerListeners);
+    while (aListenerLoop.hasMoreElements())
+        static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent);
 }
 
 //------------------------------------------------------------------------------
@@ -457,6 +468,18 @@ void SAL_CALL ODatabaseContext::disposing( const EventObject& _rSource ) throw(R
     }
 }
 
+//------------------------------------------------------------------------------
+void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
+{
+    m_aContainerListeners.addInterface(_rxListener);
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
+{
+    m_aContainerListeners.removeInterface(_rxListener);
+}
+
 //------------------------------------------------------------------------------
 void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exception, RuntimeException )
 {
@@ -468,10 +491,12 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
     if (!aObjectNode.isValid())
         throw NoSuchElementException();
 
+    Reference< XInterface > xExistent;
+
     ObjectCacheIterator aExistent = m_aDatabaseObjects.find(_rName);
     if (aExistent != m_aDatabaseObjects.end())
     {
-        Reference< XInterface > xExistent = aExistent->second.get();
+        xExistent = aExistent->second.get();
         if (xExistent.is())
         {
             Reference< XComponent > xComponent(xExistent, UNO_QUERY);
@@ -499,6 +524,13 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
     }
     else
         DBG_ERROR("ODatabaseContext::revokeObject: inconsistent state!");
+
+    // notify our container listeners
+    ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rName), Any(), makeAny(xExistent));
+        // note that xExistent may be empty, in case somebody removed the data source while it is not alive at this moment
+    OInterfaceIteratorHelper aListenerLoop(m_aContainerListeners);
+    while (aListenerLoop.hasMoreElements())
+        static_cast<XContainerListener*>(aListenerLoop.next())->elementRemoved(aEvent);
 }
 
 // ::com::sun::star::container::XElementAccess

dbaccess/source/core/dataaccess/databasecontext.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: databasecontext.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2000-11-08 16:02:50 $
+ *  last change: $Author: fs $ $Date: 2000-12-10 16:14:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,15 +80,21 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #endif
+#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_
+#include <com/sun/star/container/XContainer.hpp>
+#endif
 #ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #endif
-#ifndef _CPPUHELPER_COMPBASE6_HXX_
-#include <cppuhelper/compbase6.hxx>
+#ifndef _CPPUHELPER_COMPBASE7_HXX_
+#include <cppuhelper/compbase7.hxx>
 #endif
 #ifndef _COMPHELPER_STLTYPES_HXX_
 #include <comphelper/stl_types.hxx>
 #endif
+#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_
+#include <cppuhelper/interfacecontainer.hxx>
+#endif
 #ifndef _COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HPP_
 #include <com/sun/star/container/ElementExistException.hpp>
 #endif
@@ -122,12 +128,14 @@ namespace dbaccess
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
     ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
 
-typedef ::cppu::WeakComponentImplHelper6    <   ::com::sun::star::lang::XServiceInfo
+typedef ::cppu::WeakComponentImplHelper7    <   ::com::sun::star::lang::XServiceInfo
                                             ,   ::com::sun::star::container::XEnumerationAccess
                                             ,   ::com::sun::star::container::XNameAccess
                                             ,   ::com::sun::star::uno::XNamingService
                                             ,   ::com::sun::star::lang::XEventListener
-                                            ,   ::com::sun::star::lang::XUnoTunnel > DatabaseAccessContext_Base;
+                                            ,   ::com::sun::star::lang::XUnoTunnel
+                                            ,   ::com::sun::star::container::XContainer
+                                            >   DatabaseAccessContext_Base;
 
 class ODatabaseContext
             :public DatabaseAccessContext_Base
@@ -149,6 +157,8 @@ protected:
         // recreated afterwards. So it's our (the context's) responsibility to store the session-persistent
         // properties.
 
+    ::cppu::OInterfaceContainerHelper       m_aContainerListeners;
+
 public:
     ODatabaseContext(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
     virtual ~ODatabaseContext();
@@ -192,6 +202,10 @@ public:
 // ::com::sun::star::lang::XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
 
+// ::com::sun::star::container::XContainer
+    virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+
 private:
     /// get the node a data source is based on
     OConfigurationNode getObjectNode(const ::rtl::OUString& _rTitle, sal_Bool _bCreate) throw();