Changeset 4488

Timestamp:

07/19/07 18:05:51 (6 years ago)

Author:

balister

Message:

Update application name behavior to meet SCA specs.

Location:

ossie/trunk/ossie

Files:

• framework/ApplicationFactory_impl.cpp (modified) (2 diffs)
• include/ossie/ApplicationFactory_impl.h (modified) (1 diff)

ossie/trunk/ossie/framework/ApplicationFactory_impl.cpp

@@ -85 +85 @@
     
     // establish naming context for this waveform
-    std::string baseName = name;
-    std::string waveformName;
+    std::string waveformName = name;
+
+    //Check if waveform name already exists
+    for (unsigned int i = 0; i < appseq->length(); ++i) {
+        if (waveformName == (*appseq)[i]->name()) {
+            DEBUG(5, ApplicationFactory, "Error: Waveform name already exists.");
+            throw CF::ApplicationFactory::CreateApplicationError(CF::CFEEXIST, "Application name already exists.");
+        }
+    }
 
     CosNaming::NamingContext_ptr waveformContext;
 
-    create_waveform_nc_from_name(baseName, waveformContext, waveformName);
+    create_waveform_nc_from_name(waveformName, waveformContext);
+    
     DEBUG(4, ApplicationFactory, "Creating waveform: " << waveformName);
 
@@ -751 +759 @@
 
 
-///\todo Review code.
-void ApplicationFactory_impl::create_waveform_nc_from_name(std::string &name, CosNaming::NamingContext_ptr &waveformContext, std::string &waveformName)
-{
-
-    CORBA::Object_var obj_DN = orb->get_object_from_name("DomainName1");
-    CosNaming::NamingContext_var DomainContext = CosNaming::NamingContext::_narrow(obj_DN);
- 
-    short waveformCount(0);
-    std::ostringstream waveformContextName;
-    
-    bool found_empty(false);
-    CosNaming::Name_var cosName;
-
-    do {
-        waveformCount++;
-        waveformContextName.clear()
-;
-        waveformContextName << "DomainName1/" << name << "_" << waveformCount;
-
-        cosName = orb->string_to_CosName(waveformContextName.str().c_str());
-        try {
-            orb->inc->resolve(cosName);
-        } catch (const CosNaming::NamingContext::NotFound &) {
-            DEBUG(5, ApplicationFactory, "Found empty waveform context.");
-            found_empty = true;
-
-            std::ostringstream wn;
-            wn << name << "_" << waveformCount;
-            waveformName = wn.str();
-        }
-    } while (!found_empty);
- 
-    DEBUG(5, ApplicationFactory, "Creating new waveform context: " << waveformContextName.str());
+void ApplicationFactory_impl::create_waveform_nc_from_name(std::string &waveformName, CosNaming::NamingContext_ptr &waveformContext)
+{
+
+    std::string tmpStr = "DomainName1/" + waveformName;
+    CosNaming::Name_var cosName = orb->string_to_CosName(tmpStr.c_str());
+
+    DEBUG(5, ApplicationFactory, "Creating new waveform context: " << waveformName);
 
     waveformContext = orb->inc->bind_new_context(cosName);

ossie/trunk/ossie/include/ossie/ApplicationFactory_impl.h

@@ -114 +114 @@
     void getRequiredComponents();
     CF::ExecutableDevice_ptr find_device_from_id(const char *);
-    void create_waveform_nc_from_name(std::string &name, CosNaming::NamingContext_ptr &waveformContext, std::string &waveformName);
+    void create_waveform_nc_from_name(std::string &waveformName, CosNaming::NamingContext_ptr &waveformContext);
     CORBA::Object_ptr GetComponentReferenceFromInstanceRefId( const char* );