Issue #3234 : Remove comment string from script step

apache · Nov 14, 2023 · 78be5b9 · 78be5b9
1 parent 7dc8292
commit 78be5b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/...ansforms/script/src/main/java/org/apache/hop/pipeline/transforms/script/ScriptDialog.java b/...ansforms/script/src/main/java/org/apache/hop/pipeline/transforms/script/ScriptDialog.java
@@ -298,8 +298,8 @@ public String open() {
 
     folder = new CTabFolder(wTop, SWT.BORDER | SWT.RESIZE);
 
-    //This function does not allowed in the web that will lead to error
-    //folder.setSimple(false);
+    // This function does not allowed in the web that will lead to error
+    // folder.setSimple(false);
     folder.setUnselectedImageVisible(true);
     folder.setUnselectedCloseVisible(true);
     FormData fdScript = new FormData();
@@ -572,12 +572,9 @@ private void addCTab(String cScriptName, String strScript, int iType) {
     StyledTextComp wScript =
         new StyledTextComp(
             variables, item.getParent(), SWT.MULTI | SWT.LEFT | SWT.H_SCROLL | SWT.V_SCROLL, false);
-    if ((strScript != null) && strScript.length() > 0) {
-      wScript.setText(strScript);
-    } else {
-      wScript.setText(
-          BaseMessages.getString(PKG, "ScriptDialog.ScriptHere.Label") + Const.CR + Const.CR);
-    }
+
+    wScript.setText(Const.NVL(strScript, ""));
+
     item.setImage(imageInactiveScript);
     PropsUi.setLook(wScript, Props.WIDGET_STYLE_FIXED);
 

diff --git a/...in/resources/org/apache/hop/pipeline/transforms/script/messages/messages_en_US.properties b/...in/resources/org/apache/hop/pipeline/transforms/script/messages/messages_en_US.properties
@@ -47,7 +47,6 @@ ScriptDialog.CouldNotAddTransformationConstants=Couldn''t add Transformation Con
 ScriptDialog.Position.Label2=Position\: 
 ScriptMeta.CheckResult.CouldNotExecuteScript=Couldn''t execute this script\! Error\:
 ScriptDialog.DeleteItem.Label=Delete Item
-ScriptDialog.ScriptHere.Label=//Script here
 ScriptDialog.SetStartScript=Set Start Script
 ScriptDialog.Fields.Label=Fields 
 Script.Log.UsingValuesFromInputStream=This script is using {0} values from the input stream(s)
@@ -59,7 +58,6 @@ ScriptDialog.ConfirmDeleteItem.Label=Do you really want to delete {0} ?
 ScriptDialog.Exception.CouldNotExecuteScript=Couldn''t execute this script\! Error on position {0} \:
 ScriptDialog.ScriptFunctions.Label=Script functions \:
 ScriptMeta.Exception.UnableToLoadAdditionalClass=Unable to load additional classes
-Script.ScriptHere=\ Script here
 ScriptDialog.AddCopy=Add copy
 ScriptDialog.RemoveScriptType=Remove Script Type
 Script.Log.CouldNotAddDefaultConstants=Couldn''t add default constants to the environment.