Changeset 6164

Timestamp:

01/17/08 13:59:03 (5 years ago)

Author:

balister

Message:

Update to work with Resource_impl and rename functions for consistency with similar components.

Location:

components/FileInput/trunk/FileInput

Files:

• FileInput.cpp (modified) (3 diffs)
• FileInput.h (modified) (5 diffs)

components/FileInput/trunk/FileInput/FileInput.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2006 2008 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE FileInput.
@@ -67 +67 @@
 
     // Create and start the thread that reads the file and send the data
-    processing_thread = new omni_thread(do_run_data_send, (void *) this);
+    processing_thread = new omni_thread(run, (void *) this);
     processing_thread->start();
 
@@ -149 +149 @@
 }
 
-void FileInput_i::run_data_send()
+void FileInput_i::query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties)
+{
+}
+
+void FileInput_i::runTest (CORBA::ULong _number, CF::Properties & _props) throw (CORBA::SystemException, CF::TestableObject::UnknownTest, CF::UnknownProperties)
+{
+}
+
+void FileInput_i::process_data()
 {
     DEBUG(3, FileInput, "FileInput process_data thread started")

components/FileInput/trunk/FileInput/FileInput.h

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2006, 2008 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE FileInput.
@@ -33 +33 @@
 
 #include "ossie/cf.h"
+#include "ossie/PortTypes.h"
+#include "ossie/Resource_impl.h"
 
-
-#include "ossie/PortTypes.h"
-
-#include "standardinterfaces/complexShort.h"
 #include "standardinterfaces/complexShort_u.h"
-
-
-#include "ossie/Resource_impl.h"
-class FileInput_i;
 
 class FileInput_i : public virtual Resource_impl
@@ -50 +44 @@
 
         void post_constructor(CF::Resource_ptr ref) { myObjectRef = ref; };
-        static void do_run_data_send(void *data) { ((FileInput_i *)data)->run_data_send(); };
+        static void run(void *data) { ((FileInput_i *)data)->process_data(); };
 
         void start() throw (CF::Resource::StartError, CORBA::SystemException);
@@ -61 +55 @@
         void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException);
         void configure(const CF::Properties&) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration);
+        void query (CF::Properties & configProperties) throw (CORBA::SystemException, CF::UnknownProperties);
+
+        void runTest (CORBA::ULong _number, CF::Properties & _props) throw (CORBA::SystemException, CF::TestableObject::UnknownTest, CF::UnknownProperties);
 
 
@@ -67 +64 @@
         FileInput_i(const FileInput_i&);
    
-        void run_data_send();
+        void process_data();
 
         CF::Resource_var myObjectRef;