Changeset 10139 for ossiedev/trunk/tools/wavedash/src/WavedashUtils.py

Timestamp:

07/14/10 15:03:51 (3 years ago)

Author:

Snyder.Jason

Message:

fixes so can be used without wx

Files:

• ossiedev/trunk/tools/wavedash/src/WavedashUtils.py (modified) (17 diffs)

ossiedev/trunk/tools/wavedash/src/WavedashUtils.py

@@ -203 +203 @@
         if self.obj is None:
             print "init_CORBA(): FATAL Error: Could not resolve initial references"
-            
             showMessage('Could not resolve initial references' , FATAL, self.enableGUI)
             return
@@ -211 +210 @@
             #print "init_CORBA(): FATAL Error: Failed to get naming context"
             #showMessage('Could not initialize CORBA. Failed to get naming context \n The application will now exit.', FATAL)
+            
             newNS = False
             while not newNS:
                 ts = "Failed to narrow the root naming context.\n"
                 ts += "Are the Naming Service and nodeBooter running on "+self.__namingservice+"?"
+               
                 showMessage(ts, NON_FATAL, self.enableGUI)
                 nsDialog = NamingserviceDialog(self)
@@ -220 +221 @@
                     newNS = True
                 elif nsDialog.GetReturnCode() == -2:
-                    sys.exit(-1)
+                        sys.exit(-1)
+                
             return
         
@@ -266 +268 @@
         except(CORBA.TRANSIENT), val:
             #print "In getApplications():",  str(val)
-            showMessage("Exception! " + str(val) + "\n Could not get applications from Domain Manager \n Exiting now!!!" , FATAL) 
+            showMessage("Exception! " + str(val) + "\n Could not get applications from Domain Manager \n Exiting now!!!" , FATAL, self.enableGUI) 
             sys.exit(-1)
         members = dom_context.list(100)
@@ -303 +305 @@
             devMgrSeq = self.domMgr._get_deviceManagers()
         except(CORBA.COMM_FAILURE, CORBA.TRANSIENT), val:
-            showMessage("Exception: " + str(val) + "\n - Could not get device managers!" , NON_FATAL)
+            showMessage("Exception: " + str(val) + "\n - Could not get device managers!" , NON_FATAL, self.enableGUI)
             return 
             
@@ -330 +332 @@
             if len(assigndeviceidNodeList) == 0:
                 ts = "Could not find \"assigndeviceid\" tag\nAborting install"
-                showMessage(ts, NON_FATAL)
+                showMessage(ts, NON_FATAL, self.enableGUI)
                 #errorMsg(self, ts)
                 return
@@ -341 +343 @@
                 ts = "Could not find the required device: " + str(assigndeviceid)
                 ts += "\nAborting install"
-                showMessage(ts, NON_FATAL)
+                showMessage(ts, NON_FATAL, self.enableGUI)
                 #errorMsg(self, ts)
                 return
@@ -357 +359 @@
     
         if app_factory_num == -1:
-            showMessage ("Application factory not found", NON_FATAL)
+            showMessage ("Application factory not found", NON_FATAL, self.enableGUI)
             
 
@@ -365 +367 @@
             app = _applicationFactories[app_factory_num].create(_applicationFactories[app_factory_num]._get_name(),_appFacProps,_devSeq)
         except:
-            showMessage("Unable to create application\nMake sure that all appropriate nodes are installed", NON_FATAL)
+            showMessage("Unable to create application\nMake sure that all appropriate nodes are installed", NON_FATAL, self.enableGUI)
             return(None)
         
@@ -382 +384 @@
             appRef = self.getAppRef(wformName)
             if appRef is None:
-                showMessage("Error: Failed to get application reference for " + wformName, NON_FATAL)
+                showMessage("Error: Failed to get application reference for " + wformName, NON_FATAL, self.enableGUI)
                 return False
             appRef.releaseObject()
         except(CORBA.COMM_FAILURE, CORBA.INV_OBJREF), val:
-            showMessage("Exception: " + str(val) + "\n - Could not uninstall " + wformName, NON_FATAL)
+            showMessage("Exception: " + str(val) + "\n - Could not uninstall " + wformName, NON_FATAL, self.enableGUI)
             return False
         return True
@@ -420 +422 @@
         try:
             if dom_context is None:
-                showMessage('Could not reference for DomainName1', NON_FATAL)
+                showMessage('Could not reference for DomainName1', NON_FATAL, self.enableGUI)
                 return
             appSeq = self.domMgr._get_applications()
@@ -461 +463 @@
             prpRsrcRef = self.rootContext.resolve(prp)
             if prpRsrcRef is None:
-                showMessage(("Unable to find rootContext for %s/%s" % (wformName,compName)), NON_FATAL)
+                showMessage(("Unable to find rootContext for %s/%s" % (wformName,compName)), NON_FATAL, self.enableGUI)
                 return None
         
@@ -468 +470 @@
         
             if prpSetHandle is None:
-                showMessage(("Unable to get PropertySet reference for %s/%s" % (wformName, compName)), NON_FATAL)
+                showMessage(("Unable to get PropertySet reference for %s/%s" % (wformName, compName)), NON_FATAL, self.enableGUI)
     
             if len(prpList) == 0:
@@ -475 +477 @@
         except:
             errorMsg = sys.exc_info()[1]
-            showMessage(str(errorMsg), NON_FATAL)
+            showMessage(str(errorMsg), NON_FATAL, self.enableGUI)
             return None
         
@@ -489 +491 @@
             prpRsrcRef = self.rootContext.resolve(prpRef)
             if prpRsrcRef is None:
-                showMessage(("Unable to find rootContext for %s/%s" % (wformName,compName)), NON_FATAL)
+                showMessage(("Unable to find rootContext for %s/%s" % (wformName,compName)), NON_FATAL, self.enableGUI)
                 return False
         
@@ -495 +497 @@
             prpSetHandle = prpRsrcRef._narrow(CF.PropertySet)
             if prpSetHandle is None:
-                showMessage(("Unable to get PropertySet reference for %s/%s" % (wformName, compName)), NON_FATAL)
+                showMessage(("Unable to get PropertySet reference for %s/%s" % (wformName, compName)), NON_FATAL, self.enableGUI)
                 return False
             prpSetHandle.configure(prpList)
@@ -502 +504 @@
         except:
             errorMsg = str(sys.exc_info()[1])
-            showMessage("Exception! " + errorMsg + "\n Connection to Domain Manager Failed", NON_FATAL)
+            showMessage("Exception! " + errorMsg + "\n Connection to Domain Manager Failed", NON_FATAL, self.enableGUI)
             return False