*** empty log message ***

src/msg/co/src/co_time_msg.msg

@@ -14,3 +14,4 @@ type		<invalid type>						/error
 ivtime		<invalid time>						/error
 ivdtime		<invalid delta time>					/error
 negtime		<negative time>						/info
+clkchange	<clock has changed>					/info

src/msg/ge/src/ge_msg.msg

@@ -28,7 +28,7 @@ nosubgraph	<Subgraph not found>				/error
 javac		<Java compilation errors>			/error
 nofile 		<File not found>				/error
 nosize		<Size not found>				/error
-
+no_propagate    <Don't propagate event handling>		/info
 
 
 

src/msg/rt/src/rt_xnav_msg.msg

@@ -29,6 +29,7 @@ notraceattr     <No trace attribute for this class>             /error
 input_syntax	<Input syntax>					/error
 objnotfound	<Object is not found>				/error
 stringtolong	<String is too long>				/error
+fastconfig	<Error in fast configuration>			/error
 
 
 

src/msg/wb/src/wb_ldh_msg.msg

@@ -101,6 +101,7 @@ pasteincon	<paste inconsistency>					/error
 memincon	<buffer inconsistency>					/error
 access		<no such access for this configuration>			/error
 attrconv	<attribute conversion error>				/error
+nosuchfile	<no such file>						/error
 
 
 

wb/lib/wb/src/wb_admin.cpp

@@ -783,7 +783,7 @@ int Admin::user_properties( admin_eDiaUserFunction function, int username_edit,
       char system_name[80];
 
       ((AdminNav *)adminnav)->gu->get_system_name( item->group, system_name);
-      adminuser_setup( "User properties", username_edit, password_edit,
+      adminuser_setup( "New User", username_edit, password_edit,
 	system_edit, priv_edit, "", system_name, 0);
 
       diauser_function = admin_eDiaUserFunction_New;
@@ -853,7 +853,7 @@ int Admin::system_properties( admin_eDiaSysFunction function, int systemname_edi
     else
       strcpy( system_name, "");
 
-    adminsys_setup( "System group properties", systemname_edit, attr_edit, system_name, 0);
+    adminsys_setup( "New System Group", systemname_edit, attr_edit, system_name, 0);
     diasys_function = admin_eDiaSysFunction_New;
     
     XtManageChild( adminsys_dia);

wb/lib/wb/src/wb_vldh.c

@@ -4131,6 +4131,7 @@ int vldh_node_update_spec (
 	else if ( node->ln.classid == vldh_class( ldhses, VLDH_CLASS_SHOWPLCATTR))
 	{
 	  pwr_tObjid volume_objid;
+	  pwr_tObjid *thread_objid;
 
 	  volume_objid.oix = 0;
 	  volume_objid.vid = node->ln.object_did.vid;
@@ -4144,9 +4145,19 @@ int vldh_node_update_spec (
 
 	  sts = ldh_GetObjectPar( ldhses,
 			plc->lp.objdid, 
-			"DevBody",
+			"RtBody",
+			"ThreadObject",
+			(char **)&thread_objid, &size); 
+	  if ( EVEN(sts)) return sts;
+	  if ( cdh_ObjidIsNotNull( *thread_objid)) {
+	    sts = ldh_GetObjectPar( ldhses,
+				    *thread_objid, 
+				    "RtBody",
 				    "ScanTime",
 				    (char **)&time_ptr, &size); 
+	  }
+	  free((char *) thread_objid);
+	  if ( ODD(sts)) {
 	    sts = ldh_SetObjectPar( ldhses,
 				    node->ln.object_did, 
 				    "DevBody",
@@ -4154,6 +4165,7 @@ int vldh_node_update_spec (
 				    (char *)time_ptr, size); 
 	    if ( EVEN(sts)) return sts;
 	    free((char *) time_ptr);
+	  }
 
 	  sts = ldh_GetObjectPar( ldhses,
 			plc->lp.objdid, 
@@ -4539,6 +4551,7 @@ int vldh_node_create_spec (
 	else if ( node->ln.classid == vldh_class( ldhses, VLDH_CLASS_SHOWPLCATTR))
 	{
 	  pwr_tObjid volume_objid;
+	  pwr_tObjid *thread_objid;
 
 	  volume_objid.oix = 0;
 	  volume_objid.vid = node->ln.object_did.vid;
@@ -4552,9 +4565,19 @@ int vldh_node_create_spec (
 
 	  sts = ldh_GetObjectPar( ldhses,
 			plc->lp.objdid, 
-			"DevBody",
+			"RtBody",
+			"ThreadObject",
+			(char **)&thread_objid, &size); 
+	  if ( EVEN(sts)) return sts;
+	  if ( cdh_ObjidIsNotNull( *thread_objid)) {
+	    sts = ldh_GetObjectPar( ldhses,
+				    *thread_objid, 
+				    "RtBody",
 				    "ScanTime",
 				    (char **)&time_ptr, &size); 
+	  }
+	  free((char *) thread_objid);
+	  if ( ODD(sts)) {
 	    sts = ldh_SetObjectPar( ldhses,
 				    node->ln.object_did, 
 				    "DevBody",
@@ -4562,6 +4585,7 @@ int vldh_node_create_spec (
 				    (char *)time_ptr, size); 
 	    if ( EVEN(sts)) return sts;
 	    free((char *) time_ptr);
+	  }
 
 	  sts = ldh_GetObjectPar( ldhses,
 			plc->lp.objdid, 

wb/lib/wb/src/wb_vrepdb.cpp

@@ -4,6 +4,7 @@
 #include "wb_vrepdb.h"
 #include "wb_orepdb.h"
 #include "wb_erep.h"
+#include "wb_dbs.h"
 #include "db_cxx.h"
 #include "wb_ldh.h"
 
@@ -107,7 +108,18 @@ bool wb_vrepdb::isLocal(const wb_orep *o)
 
 bool wb_vrepdb::createSnapshot(const char *fileName)
 {
+  try {
+    wb_dbs dbs(this);
+        
+    if ( fileName)
+      dbs.setFileName( fileName);
+
+    dbs.importVolume(*this);
+
+    return true;
+  } catch (wb_error& e) {
     return false;
+  }
 }
 
 void wb_vrepdb::objectName(const wb_orep *o, char *str)

wb/lib/wb/src/wb_vrepwbl.cpp

@@ -274,6 +274,16 @@ int wb_vrepwbl::load( const char *fname)
     root_object->postBuild();
   }
   // info();
+
+  if ( !file_cnt) {
+    MsgWindow::message( 'F', "No file found, ", fname);
+    return LDH__NOSUCHFILE;
+  }
+  if ( strcmp( volume_name, "") == 0) {
+    MsgWindow::message( 'F', "No volume found, ", fname);
+    error_cnt++;
+  }
+
   if ( error_cnt || wblparser_error_cnt) {
     char str[80];
     sprintf( str, "Errors when loading volume: %d errors found", error_cnt + wblparser_error_cnt);

wb/lib/wb/src/wb_vsel.cpp

@@ -9,7 +9,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "wb_foe_macros.h"
 
 #include <Xm/Xm.h>
 #include <Xm/Text.h>
@@ -18,16 +17,18 @@
 #include <X11/Intrinsic.h>
 #include <Xm/MessageB.h>
 
+#include "rt_load.h"
+
 #include "flow.h"
 #include "flow_ctx.h"
 #include "flow_api.h"
 #include "flow_browctx.h"
 #include "flow_browapi.h"
+#include "wb_foe_macros.h"
 
 extern "C" {
 #include "pwr.h"
 #include "pwr_systemclasses.h"
-#include "rt_load.h"
 #include "co_cdh.h"
 #include "co_dcli.h"
 #include "wb.h"
@@ -703,19 +704,19 @@ pwr_tStatus WVsel::check_volumelist(
 	        switch( classid)
 	        {
 		  case pwr_eClass_RootVolume :
-	            if ( strcmp( volumelist_ptr->p2, "RootVolume"))
+	            if ( strcmp( volumelist_ptr->p1, "RootVolume"))
 		      class_error = 1;
 	            break;
 		  case pwr_eClass_SubVolume :
-	            if ( strcmp( volumelist_ptr->p2, "SubVolume"))
+	            if ( strcmp( volumelist_ptr->p1, "SubVolume"))
 		      class_error = 1;
 	            break;
 		  case pwr_eClass_ClassVolume :
-	            if ( strcmp( volumelist_ptr->p2, "ClassVolume"))
+	            if ( strcmp( volumelist_ptr->p1, "ClassVolume"))
 		      class_error = 1;
 	            break;
 		  case pwr_eClass_SharedVolume :
-	            if ( strcmp( volumelist_ptr->p2, "SharedVolume"))
+	            if ( strcmp( volumelist_ptr->p1, "SharedVolume"))
 		      class_error = 1;
 	            break;
 	        }
@@ -725,7 +726,7 @@ pwr_tStatus WVsel::check_volumelist(
 	          {
 	            errlen += sprintf( &errstr[errlen], 
 	                "** Error, Volume %s is configured with another class '%s'\n", 
-		        name, volumelist_ptr->p2);
+		        name, volumelist_ptr->p1);
 		    MsgWindow::message( 'E', &errstr[errlen_old], msgw_ePop_No);
 		    errlen_old = errlen;
                     BEEP;