Rename ScriptRuntimeForRhino to ScriptRuntimeForJavaScript and replace

all references to language.

1 files changed, 13 insertions, 12 deletions

diff --git a/scripting/workben/bindings/ScriptBinding.xba b/scripting/workben/bindings/ScriptBinding.xba
index 34f47230496a..e25ab0718968 100644
--- a/scripting/workben/bindings/ScriptBinding.xba
+++ b/scripting/workben/bindings/ScriptBinding.xba
@@ -234,7 +234,7 @@ end sub
 Sub ExecuteEditDebug()
         
 	locations = Array ( "User", "Share", "Document", "Filesystem" )
-	languages = Array ( "BeanShell", "Rhino" )
+	languages = Array ( "BeanShell", "JavaScript" )
 	dialogName = "EditDebug"
 	initialiseFileExtensions()  
 	bindingDialog = LoadDialog( "ScriptBindingLibrary", "EditDebug" )
@@ -280,16 +280,17 @@ Sub initialiseNavigationComboArrays()
     
     langCount = 1
     for index = 0 to ubound(svrArray)
-    	iPos = inStr(svrArray(index), "ScriptRuntimeFor")
-        iJava = inStr(svrArray(index), "ScriptRuntimeForJava")
-        		
-        if 	(iJava = 0) and  (iPos > 0) then
-	        lang = Mid(svrArray(index), iPos + Len("ScriptRuntimeFor")
-
-            'Add to language vector
-            ReDim Preserve languages(langCount) as String
-            languages(langCount) = lang
-            langCount = langCount +1
+        iPos = inStr(svrArray(index), "ScriptRuntimeFor")
+
+        if (iPos > 0) then
+            lang = Mid(svrArray(index), iPos + Len("ScriptRuntimeFor")
+
+            if not (lang = "Java") then
+                'Add to language vector
+                ReDim Preserve languages(langCount) as String
+                languages(langCount) = lang
+                langCount = langCount + 1
+            endif
         endif  
     next index
     initialiseFileExtensions()
@@ -2036,4 +2037,4 @@ end sub
 sub HelpOKButton()
 	helpDialog.endExecute()
 end sub
-</script:module>
\ No newline at end of file
+</script:module>