Changeset 6151

Show
Ignore:
Timestamp:
01/16/08 14:59:51 (5 years ago)
Author:
balister
Message:

Remove empty methods from Resource_impl and replace with pure virtual methods. Not quite as fine grained as I would have liked.

Location:
ossie/trunk/ossie
Files:
11 modified

Legend:

Unmodified
Added
Removed

  • ossie/trunk/ossie/framework/Application_impl.cpp

    r4081 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2007 Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    4949CF::Resource_ptr _controller, 
    5050CF::DomainManager::ApplicationSequence *_appseq, 
    51 SADParser *sadParser, CosNaming::NamingContext_ptr wnc) : Resource_impl(_id) 
    52 { 
    53  
     51SADParser *sadParser, CosNaming::NamingContext_ptr wnc) 
     52{ 
     53    id = _id; 
    5454    appName = _name; 
    5555    sadProfile = _profile; 
    … …  
    140140    assemblyController->stop (); 
    141141} 
     142 
     143 
     144void Application_impl::configure (const CF::Properties & configProperties) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
     145{ 
     146} 
     147 
     148void Application_impl::query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties) 
     149{ 
     150} 
     151 
    142152 
    143153 
    … …  
    333343 
    334344 
     345char *Application_impl::identifier () 
     346throw (CORBA::SystemException) 
     347{ 
     348    return CORBA::string_dup(id.c_str()); 
     349} 
     350 
     351 
    335352char *Application_impl::profile () 
    336353throw (CORBA::SystemException) 

  • ossie/trunk/ossie/framework/DeviceManager_impl.cpp

    r3972 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2006, 2007 Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2006, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    272272} 
    273273 
     274 
     275void DeviceManager_impl::configure (const CF::Properties & configProperties) throw (CF::PropertySet::PartialConfiguration, CF::PropertySet::InvalidConfiguration, CORBA::SystemException) 
     276{ 
     277} 
     278 
     279void DeviceManager_impl::query (CF::Properties & configProperties) throw (CF::UnknownProperties, CORBA::SystemException) 
     280{ 
     281} 
     282 
     283CORBA::Object* DeviceManager_impl::getPort (const char *) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException) 
     284{ 
     285  return NULL; 
     286} 
    274287 
    275288CF::DeviceSequence * 

  • ossie/trunk/ossie/framework/Device_impl.cpp

    r4081 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2007 Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    3131#include "ossie/debug.h" 
    3232 
    33     Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl) : Resource_impl(_id) 
     33Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl) 
    3434{ 
    3535    _label = lbl; 
    … …  
    4343 
    4444 
    45 Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl, 
    46                           CF::Properties & capacities) : Resource_impl(_id) 
     45Device_impl::Device_impl (char *_id, char *lbl, char *sftwrPrfl, CF::Properties & capacities) 
    4746{ 
    4847    _label = lbl; 
    … …  
    622621    } 
    623622 
    624     PropertySet_impl::configure(capacities); 
     623    configure(capacities); 
    625624 
    626625} 

  • ossie/trunk/ossie/framework/DomainManager_impl.cpp

    r4099 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2007, Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    129129} 
    130130 
     131void DomainManager_impl::configure (const CF::Properties & configProperties) throw (CF::PropertySet::PartialConfiguration, CF::PropertySet::InvalidConfiguration, CORBA::SystemException) 
     132{ 
     133} 
     134 
     135void DomainManager_impl::query (CF::Properties & configProperties) throw (CF::UnknownProperties, CORBA::SystemException) 
     136{ 
     137} 
    131138 
    132139char * 

  • ossie/trunk/ossie/framework/Makefile.am

    r5875 r6151  
    11lib_LTLIBRARIES = libossiecf.la 
    2 libossiecf_la_SOURCES = ApplicationFactory_impl.cpp File_impl.cpp Application_impl.cpp FileManager_impl.cpp PortSupplier_impl.cpp Device_impl.cpp FileSystem_impl.cpp PropertySet_impl.cpp DeviceManager_impl.cpp LifeCycle_impl.cpp Resource_impl.cpp DomainManager_impl.cpp TestableObject_impl.cpp applicationSupport.cpp debug.cpp helperFunctions.cpp ossieComponent.cpp 
     2libossiecf_la_SOURCES = ApplicationFactory_impl.cpp File_impl.cpp Application_impl.cpp FileManager_impl.cpp Device_impl.cpp FileSystem_impl.cpp DeviceManager_impl.cpp Resource_impl.cpp DomainManager_impl.cpp applicationSupport.cpp debug.cpp helperFunctions.cpp ossieComponent.cpp 
    33 
    44EXTRA_DIST = dirent.h 

  • ossie/trunk/ossie/framework/Resource_impl.cpp

    r2539 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    2929 
    3030 
    31 void Resource_impl::start () throw (CORBA::SystemException, CF::Resource::StartError) 
    32 { 
    33 // set CF::Device::UsageType = ACTIVE; 
    34 //      generally, you'll overload this with some implementation that is dependent to your specific component 
    35 } 
    36  
    37  
    38 void Resource_impl::stop () throw (CORBA::SystemException, CF::Resource::StopError) 
    39 { 
    40 // set CF::Device::UsageType = IDLE; 
    41 //      generally, you'll overload this with some implementation that is dependent to your specific component 
    42 } 
    43  
    44  
    4531char *Resource_impl::identifier () throw (CORBA::SystemException) 
    4632{ 

  • ossie/trunk/ossie/include/ossie/Application_impl.h

    r4064 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2007 Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    3131#include "ossiecf.h" 
    3232#include "ossieSupport.h" 
    33 #include "Resource_impl.h" 
    3433#include "SADParser.h" 
    3534#include "SPDParser.h" 
    … …  
    4544PROC_ID_SEQ; 
    4645 
    47 class OSSIECF_API 
    48 Application_impl: 
    49 public 
    50     virtual 
    51     POA_CF::Application, 
    52 public 
    53     Resource_impl 
     46class OSSIECF_API Application_impl : public virtual POA_CF::Application 
    5447    { 
    5548        protected: 
    … …  
    9184            start () 
    9285            throw (CF::Resource::StartError, CORBA::SystemException); 
     86 
    9387        void 
    9488            stop () 
    9589            throw (CF::Resource::StopError, CORBA::SystemException); 
     90 
     91        char *identifier() throw (CORBA::SystemException); 
     92 
     93        void configure (const CF::Properties & configProperties) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration); 
     94 
     95        void query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties); 
     96 
    9697        void 
    9798            initialize () 
    9899            throw (CF::LifeCycle::InitializeError, CORBA::SystemException); 
     100 
    99101        void 
    100102            releaseObject () 
    … …  
    103105            getPort (const char *) 
    104106            throw (CORBA::SystemException, CF::PortSupplier::UnknownPort); 
     107 
    105108        void 
    106109            runTest (CORBA::ULong, CF::Properties&) 
    107110            throw (CORBA::SystemException, CF::UnknownProperties, CF::TestableObject::UnknownTest); 
     111 
    108112        char *profile () throw (CORBA::SystemException); 
    109113        char *name () throw (CORBA::SystemException); 
     114 
    110115        DEV_SEQ * 
    111116            componentDevices () 
    … …  
    126131         
    127132        SADParser *_sadParser; 
     133        std::string id; 
    128134        std::string sadProfile; 
    129135        std::string appName; 

  • ossie/trunk/ossie/include/ossie/DeviceManager_impl.h

    r3841 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2007 Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    2626#include "ossieSupport.h" 
    2727 
    28 #include "PropertySet_impl.h" 
    29 #include "PortSupplier_impl.h" 
    3028#include "FileManager_impl.h" 
    3129#include "automaticTest.h" 
    … …  
    3533#include "SPDImplementation.h" 
    3634 
    37 class OSSIECF_API DeviceManager_impl: public virtual POA_CF::DeviceManager,  
    38     public PropertySet_impl, public PortSupplier_impl 
     35class OSSIECF_API DeviceManager_impl: public virtual POA_CF::DeviceManager 
    3936{ 
    4037public: 
    … …  
    5653    char* label() 
    5754        throw (CORBA::SystemException); 
     55 
     56    void 
     57        configure (const CF::Properties & configProperties) 
     58        throw (CF::PropertySet::PartialConfiguration, 
     59        CF::PropertySet::InvalidConfiguration, CORBA::SystemException); 
     60 
     61    void 
     62        query (CF::Properties & configProperties) 
     63        throw (CF::UnknownProperties, CORBA::SystemException); 
     64 
     65    CORBA::Object* getPort (const char *) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException); 
    5866 
    5967    CF::DeviceSequence* registeredDevices() 

  • ossie/trunk/ossie/include/ossie/Device_impl.h

    r3957 r6151  
    11/**************************************************************************** 
    22  
    3 Copyright 2004, Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2008 Virginia Polytechnic Institute and State University 
    44  
    55This file is part of the OSSIE Core Framework. 
    … …  
    3232#include <string> 
    3333 
    34 #include "Resource_impl.h" 
    35 #include "automaticTest.h" 
    3634#include "cf.h" 
    37 class OSSIECF_API Device_impl:public virtual POA_CF::Device, public Resource_impl 
     35#include "ossiecf.h" 
     36 
     37class OSSIECF_API Device_impl:public virtual POA_CF::Device 
    3838{ 
    3939protected: 

  • ossie/trunk/ossie/include/ossie/DomainManager_impl.h

    r3992 r6151  
    11/**************************************************************************** 
    22 
    3 Copyright 2004, 2007, Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2007, 2008 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE Core Framework. 
    … …  
    3939#include "cf.h" 
    4040 
    41 #ifdef MS_dotNET 
    4241#include "ossiecf.h" 
    43 #endif 
    4442 
    4543#include "FileManager_impl.h" 
    … …  
    7876#endif 
    7977 
    80 class OSSIECF_API DomainManager_impl : public virtual POA_CF::DomainManager,  
    81     public PropertySet_impl 
     78class OSSIECF_API DomainManager_impl : public virtual POA_CF::DomainManager 
    8279{ 
    8380public: 
    … …  
    140137               CF::DomainManager::InvalidEventChannelName,  
    141138               CORBA::SystemException); 
     139 
     140    void 
     141        configure (const CF::Properties & configProperties) 
     142        throw (CF::PropertySet::PartialConfiguration, 
     143        CF::PropertySet::InvalidConfiguration, CORBA::SystemException); 
     144 
     145    void 
     146        query (CF::Properties & configProperties) 
     147        throw (CF::UnknownProperties, CORBA::SystemException); 
    142148 
    143149    CF::FileManager_ptr fileMgr(void) 

  • ossie/trunk/ossie/include/ossie/Resource_impl.h

    r2538 r6151  
    11/**************************************************************************** 
    22  
    3 Copyright 2004, Virginia Polytechnic Institute and State University 
     3Copyright 2004, 2008 Virginia Polytechnic Institute and State University 
    44  
    55This file is part of the OSSIE Core Framework. 
    … …  
    2626#include <string> 
    2727 
     28#include "cf.h" 
    2829#include "ossiecf.h" 
    29 #include "LifeCycle_impl.h" 
    30 #include "PortSupplier_impl.h" 
    31 #include "PropertySet_impl.h" 
    32 #include "TestableObject_impl.h" 
    3330 
    34 class OSSIECF_API Resource_impl:public virtual POA_CF::Resource, public PropertySet_impl, public PortSupplier_impl, public LifeCycle_impl, public TestableObject_impl 
     31class OSSIECF_API Resource_impl:public virtual POA_CF::Resource 
    3532 
    3633{ 
    … …  
    4037public: 
    4138    Resource_impl (const char *_uuid); 
    42     void start () throw (CF::Resource::StartError, CORBA::SystemException); 
    43     void stop () throw (CF::Resource::StopError, CORBA::SystemException); 
     39 
    4440    char *identifier () throw (CORBA::SystemException); 
    4541 
     42    void start () throw (CF::Resource::StartError, CORBA::SystemException) = 0; 
     43    void stop () throw (CF::Resource::StopError, CORBA::SystemException) = 0; 
     44 
     45    CORBA::Object_ptr getPort( const char* portName ) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException) = 0; 
     46     
     47    void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) = 0; 
     48    void releaseObject() throw (CF::LifeCycle::ReleaseError, CORBA::SystemException) = 0; 
     49         
     50    void configure(const CF::Properties&) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) = 0; 
     51    void query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties) = 0; 
     52     
     53    void runTest (CORBA::ULong _number, CF::Properties & _props) throw (CORBA::SystemException, CF::TestableObject::UnknownTest, CF::UnknownProperties) = 0; 
     54     
    4655 private: 
    4756    Resource_impl(); // No default constructor