No comments

diff --git a/src/WOKUtils/FILES b/src/WOKUtils/FILES
index 8ef2207a5f01a683608cbdfda97ba3215d28c8f6..86d56fb3774997721545c2e1f35f1550b7a1f833 100755 (executable)
--- a/src/WOKUtils/FILES
+++ b/src/WOKUtils/FILES
@@ -28,3 +28,4 @@ EDL.edl
 WOKUtils_Trigger_proto.hxx
 WOKUtils_Param_proto.hxx
 WOKUtils_WOKSteps.edl
+

diff --git a/src/WOKUtils/WOKUtils_Param.cxx b/src/WOKUtils/WOKUtils_Param.cxx
index d433a389aecc583190b01578d6018d2824243ad6..92776beb0be25ba8fe859d3fc238586a9a274271 100755 (executable)
--- a/src/WOKUtils/WOKUtils_Param.cxx
+++ b/src/WOKUtils/WOKUtils_Param.cxx
@@ -453,6 +453,10 @@ Standard_Boolean WOKUtils_Param::LoadFile(const Handle(TCollection_HAsciiString)
       ErrorMsg << "WOKUtils_Param::LoadParamClass"
               << "Too many include levels while loading file : " << afile << endm;
       break;
+    case EDL_FILENOTFOUND:
+      ErrorMsg << "WOKUtils_Param::LoadParamClass"
+              << "File not found : " << afile << endm;
+      break;
     }
   return Standard_False;
 }

diff --git a/src/WOKUtils/WOKUtils_Replace.tcl b/src/WOKUtils/WOKUtils_Replace.tcl
index a1a7801cc76a76fcf1da8010bf7bbcec892d2d4f..dba617ba2030a1d41008d24bf896296d542b0269 100755 (executable)
--- a/src/WOKUtils/WOKUtils_Replace.tcl
+++ b/src/WOKUtils/WOKUtils_Replace.tcl
@@ -1,15 +1,15 @@
 
 
-proc WOKUtils_Replace::AdmFileType {} {
+proc WOKUtils_Replace:AdmFileType {} {
     return "dbadmfile";
 }
 
-proc WOKUtils_Replace::OutputDirTypeName {} {
+proc WOKUtils_Replace:OutputDirTypeName {} {
     return "dbtmpfile";
 }
 
 
-proc WOKUtils_Replace::HandleInputFile { ID } { 
+proc WOKUtils_Replace:HandleInputFile { ID } { 
 
     scan $ID "%\[^:\]:%\[^:\]:%\[^:\]"  unit type name
 
@@ -34,14 +34,14 @@ proc WOKUtils_Replace::HandleInputFile { ID } {
     }
 }
 
-proc WOKUtils_Replace::Execute { unit args } {
+proc WOKUtils_Replace:Execute { unit args } {
     
     global tcl_interactive
 
     set tcl_interactive 1
     package require Wokutils
 
-    msgprint -i -c "WOKUtils_Replace::Execute" "Copying of WOKUtils includes"
+    msgprint -i -c "WOKUtils_Replace:Execute" "Copying of WOKUtils includes"
 
     if { [wokparam -e %Station $unit] != "wnt" } {
        set copycmd "cp -p "
@@ -69,13 +69,13 @@ proc WOKUtils_Replace::Execute { unit args } {
        }
        
        if { ! $result } {
-           msgprint -i -c "WOKUtils_Replace::Execute" "Copy $source to $target"
+           msgprint -i -c "WOKUtils_Replace:Execute" "Copy $source to $target"
            if { [file exist $target] && [wokparam -e %Station $unit] != "wnt" } {
                eval exec "chmod u+w $target"
            }
            eval exec "$copycmd $TheArgs"
        } else {
-           msgprint -i -c "WOKUtils_Replace::Execute" "No change in $source"
+           msgprint -i -c "WOKUtils_Replace:Execute" "No change in $source"
        }
     }
     return 0;

diff --git a/src/WOKUtils/WOKUtils_Trigger.cxx b/src/WOKUtils/WOKUtils_Trigger.cxx
index fdfe5faab5cfa15aa26b17f1fe0b5b08e1dfcb35..36b81bb7c19adb14703bacbf1ebc851e0ca33100 100755 (executable)
--- a/src/WOKUtils/WOKUtils_Trigger.cxx
+++ b/src/WOKUtils/WOKUtils_Trigger.cxx
@@ -21,7 +21,7 @@
 //purpose  : 
 //=======================================================================
 WOKUtils_Trigger::WOKUtils_Trigger()
-  : mystat(WOKUtils_Unknown), myidx(1)
+  : myidx(1), mystat(WOKUtils_Unknown)
 {
 }
 
@@ -58,6 +58,7 @@ WOKUtils_TriggerStatus DefaultHandler(WOKUtils_Trigger& atrigger)
            InfoMsg << "DefaultHandler" << "Arg " << i << " is : " << astrval->Value() << endm;
          }
          break;
+        default: break;
        }
     }
   return WOKUtils_Unknown;

diff --git a/src/WOKUtils/WOKUtils_WOKSteps.edl b/src/WOKUtils/WOKUtils_WOKSteps.edl
index 49bff7574bf87fa083718477b9ff891b468d1f63..7b7493de368d18765f3f80b69bf4359e704e8b13 100755 (executable)
--- a/src/WOKUtils/WOKUtils_WOKSteps.edl
+++ b/src/WOKUtils/WOKUtils_WOKSteps.edl
@@ -1,13 +1,6 @@
--- File:       WOKUtils_WOKSteps.edl
--- Author:     Jean GAUTIER
--- History:    Tue Aug 12 17:12:59 1997        Jean GAUTIER    Creation
--- Copyright:   Matra Datavision 1997
-
-@ifnotdefined ( %WOKUtils_WOKSteps_EDL) then
-@set %WOKUtils_WOKSteps_EDL = "";
-
-
-@string %WOKSteps_XcppGroup += "xcpp.repl";
-@set %WOKSteps_xcpp_repl = "*WOKUtils_Replace(xcpp.header)";
-
+@ifnotdefined ( %WOKUtils_WOKSteps_EDL ) then
+ @set %WOKUtils_WOKSteps_EDL  = "";
+ @string %WOKSteps_XcppGroup += "xcpp.repl";
+ @set %WOKSteps_xcpp_repl     = "*WOKUtils_Replace(xcpp.header)";
 @endif;
+