You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/07/20 17:47:42 UTC
[incubator-hop] branch master updated: HOP-3101 Fix
StyledTextComposite layout + rename ScriptValuesMod -> ScriptValues
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 405820b HOP-3101 Fix StyledTextComposite layout + rename ScriptValuesMod -> ScriptValues
new 3e68f1f Merge pull request #953 from nadment/HOP-3101
405820b is described below
commit 405820b4330e22a9d3526240db1bfc08f02952c2
Author: Nicolas Adment <na...@gmail.com>
AuthorDate: Tue Jul 20 18:50:06 2021 +0200
HOP-3101 Fix StyledTextComposite layout + rename ScriptValuesMod ->
ScriptValues
---
.../{ScriptValuesMod.java => ScriptValues.java} | 10 ++++----
.../javascript/ScriptValuesAddedFunctions.java | 26 +++++++++----------
...iptValuesModData.java => ScriptValuesData.java} | 4 +--
...tValuesModDummy.java => ScriptValuesDummy.java} | 4 +--
...iptValuesMetaMod.java => ScriptValuesMeta.java} | 30 +++++++++++-----------
...aModDialog.java => ScriptValuesMetaDialog.java} | 20 +++++++--------
...est.java => ScriptValuesMetaInjectionTest.java} | 4 +--
...sMetaModTest.java => ScriptValuesMetaTest.java} | 14 +++++-----
...iptValuesModTest.java => ScriptValuesTest.java} | 14 +++++-----
.../apache/hop/ui/core/widget/StyledTextComp.java | 12 ++++++++-
10 files changed, 74 insertions(+), 64 deletions(-)
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMod.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValues.java
similarity index 97%
rename from plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMod.java
rename to plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValues.java
index 832662c..49eba1f 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMod.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValues.java
@@ -47,8 +47,8 @@ import org.mozilla.javascript.ScriptableObject;
* @author Matt
* @since 5-April-2003
*/
-public class ScriptValuesMod extends BaseTransform<ScriptValuesMetaMod, ScriptValuesModData> implements ITransform<ScriptValuesMetaMod, ScriptValuesModData> {
- private static final Class<?> PKG = ScriptValuesMetaMod.class; // For Translator
+public class ScriptValues extends BaseTransform<ScriptValuesMeta, ScriptValuesData> implements ITransform<ScriptValuesMeta, ScriptValuesData> {
+ private static final Class<?> PKG = ScriptValuesMeta.class; // For Translator
public static final int SKIP_PIPELINE = 1;
@@ -78,7 +78,7 @@ public class ScriptValuesMod extends BaseTransform<ScriptValuesMetaMod, ScriptVa
public Script script;
- public ScriptValuesMod(TransformMeta transformMeta, ScriptValuesMetaMod meta, ScriptValuesModData data, int copyNr, PipelineMeta pipelineMeta,
+ public ScriptValues(TransformMeta transformMeta, ScriptValuesMeta meta, ScriptValuesData data, int copyNr, PipelineMeta pipelineMeta,
Pipeline pipeline ) {
super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline );
}
@@ -168,9 +168,9 @@ public class ScriptValuesMod extends BaseTransform<ScriptValuesMetaMod, ScriptVa
logBasic( BaseMessages.getString( PKG, "ScriptValuesMod.Optimization.Level", resolve( meta
.getOptimizationLevel() ) ) );
} else {
- data.cx.setOptimizationLevel( Integer.parseInt( ScriptValuesMetaMod.OPTIMIZATION_LEVEL_DEFAULT ) );
+ data.cx.setOptimizationLevel( Integer.parseInt( ScriptValuesMeta.OPTIMIZATION_LEVEL_DEFAULT ) );
logBasic( BaseMessages.getString(
- PKG, "ScriptValuesMod.Optimization.UsingDefault", ScriptValuesMetaMod.OPTIMIZATION_LEVEL_DEFAULT ) );
+ PKG, "ScriptValuesMod.Optimization.UsingDefault", ScriptValuesMeta.OPTIMIZATION_LEVEL_DEFAULT ) );
}
} catch ( NumberFormatException nfe ) {
throw new HopTransformException( BaseMessages.getString(
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
index 5ef64b6..bb01c1b 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
@@ -368,7 +368,7 @@ public class ScriptValuesAddedFunctions extends ScriptableObject {
try {
if (!isNull(ArgList) && !isUndefined(ArgList)) {
Object scmO = actualObject.get("_transform_", actualObject);
- ScriptValuesMod scm = (ScriptValuesMod) Context.jsToJava(scmO, ScriptValuesMod.class);
+ ScriptValues scm = (ScriptValues) Context.jsToJava(scmO, ScriptValues.class);
String strMessage = Context.toString(ArgList[0]);
scm.logDebug(strMessage);
}
@@ -380,7 +380,7 @@ public class ScriptValuesAddedFunctions extends ScriptableObject {
try {
if (!isNull(ArgList) && !isUndefined(ArgList)) {
Object scmO = actualObject.get("_transform_", actualObject);
- ScriptValuesMod scm = (ScriptValuesMod) Context.jsToJava(scmO, ScriptValuesMod.class);
+ ScriptValues scm = (ScriptValues) Context.jsToJava(scmO, ScriptValues.class);
String strType = Context.toString(ArgList[0]).toLowerCase();
String strMessage = Context.toString(ArgList[1]);
@@ -568,7 +568,7 @@ public class ScriptValuesAddedFunctions extends ScriptableObject {
if (ArgList.length == 2) {
try {
Object scmO = actualObject.get("_transform_", actualObject);
- ScriptValuesMod scm = (ScriptValuesMod) Context.jsToJava(scmO, ScriptValuesMod.class);
+ ScriptValues scm = (ScriptValues) Context.jsToJava(scmO, ScriptValues.class);
String strDBName = Context.toString(ArgList[0]);
String strSql = Context.toString(ArgList[1]);
DatabaseMeta databaseMeta =
@@ -2019,11 +2019,11 @@ public class ScriptValuesAddedFunctions extends ScriptableObject {
try {
Object scmO = actualObject.get("_transform_", actualObject);
try {
- ScriptValuesMod scm = (ScriptValuesMod) Context.jsToJava(scmO, ScriptValuesMod.class);
+ ScriptValues scm = (ScriptValues) Context.jsToJava(scmO, ScriptValues.class);
return scm.getOutputRowMeta();
} catch (Exception e) {
- ScriptValuesModDummy scm =
- (ScriptValuesModDummy) Context.jsToJava(scmO, ScriptValuesModDummy.class);
+ ScriptValuesDummy scm =
+ (ScriptValuesDummy) Context.jsToJava(scmO, ScriptValuesDummy.class);
return scm.getOutputRowMeta();
}
} catch (Exception e) {
@@ -2045,11 +2045,11 @@ public class ScriptValuesAddedFunctions extends ScriptableObject {
try {
Object scmO = actualObject.get("_transform_", actualObject);
try {
- ScriptValuesMod scm = (ScriptValuesMod) Context.jsToJava(scmO, ScriptValuesMod.class);
+ ScriptValues scm = (ScriptValues) Context.jsToJava(scmO, ScriptValues.class);
return scm.getInputRowMeta();
} catch (Exception e) {
- ScriptValuesModDummy scm =
- (ScriptValuesModDummy) Context.jsToJava(scmO, ScriptValuesModDummy.class);
+ ScriptValuesDummy scm =
+ (ScriptValuesDummy) Context.jsToJava(scmO, ScriptValuesDummy.class);
return scm.getInputRowMeta();
}
} catch (Exception e) {
@@ -2092,12 +2092,12 @@ public class ScriptValuesAddedFunctions extends ScriptableObject {
Object scmO = actualObject.get("_transform_", actualObject);
try {
- ScriptValuesMod transform =
- (ScriptValuesMod) Context.jsToJava(scmO, ScriptValuesMod.class);
+ ScriptValues transform =
+ (ScriptValues) Context.jsToJava(scmO, ScriptValues.class);
transform.putRow(transform.getOutputRowMeta(), newRow);
} catch (Exception e) {
- ScriptValuesModDummy transform =
- (ScriptValuesModDummy) Context.jsToJava(scmO, ScriptValuesModDummy.class);
+ ScriptValuesDummy transform =
+ (ScriptValuesDummy) Context.jsToJava(scmO, ScriptValuesDummy.class);
transform.putRow(transform.getOutputRowMeta(), newRow);
}
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModData.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesData.java
similarity index 92%
rename from plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModData.java
rename to plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesData.java
index 47586ad..c014244 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModData.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesData.java
@@ -29,7 +29,7 @@ import org.mozilla.javascript.Scriptable;
* @author Matt
* @since 24-jan-2005
*/
-public class ScriptValuesModData extends BaseTransformData implements ITransformData {
+public class ScriptValuesData extends BaseTransformData implements ITransformData {
public Context cx;
public Scriptable scope;
public Script script;
@@ -40,7 +40,7 @@ public class ScriptValuesModData extends BaseTransformData implements ITransform
public IRowMeta outputRowMeta;
public int[] replaceIndex;
- public ScriptValuesModData() {
+ public ScriptValuesData() {
super();
cx = null;
fieldsUsed = null;
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModDummy.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDummy.java
similarity index 98%
rename from plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModDummy.java
rename to plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDummy.java
index 8c4e8c2..25a161c 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModDummy.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDummy.java
@@ -43,11 +43,11 @@ import java.util.List;
import java.util.Map;
/** Dummy class used for test(). */
-public class ScriptValuesModDummy implements ITransform {
+public class ScriptValuesDummy implements ITransform {
private IRowMeta inputRowMeta;
private IRowMeta outputRowMeta;
- public ScriptValuesModDummy(IRowMeta inputRowMeta, IRowMeta outputRowMeta) {
+ public ScriptValuesDummy(IRowMeta inputRowMeta, IRowMeta outputRowMeta) {
this.inputRowMeta = inputRowMeta;
this.outputRowMeta = outputRowMeta;
}
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaMod.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMeta.java
similarity index 97%
rename from plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaMod.java
rename to plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMeta.java
index 0f0b7c6..21d09e3 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaMod.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMeta.java
@@ -76,9 +76,9 @@ import java.util.Properties;
@InjectionSupported(
localizationPrefix = "ScriptValuesMod.Injection.",
groups = {"FIELDS", "SCRIPTS"})
-public class ScriptValuesMetaMod extends BaseTransformMeta
- implements ITransformMeta<ScriptValuesMod, ScriptValuesModData> {
- private static final Class<?> PKG = ScriptValuesMetaMod.class; // For Translator
+public class ScriptValuesMeta extends BaseTransformMeta
+ implements ITransformMeta<ScriptValues, ScriptValuesData> {
+ private static final Class<?> PKG = ScriptValuesMeta.class; // For Translator
private static final String JSSCRIPT_TAG_TYPE = "jsScript_type";
private static final String JSSCRIPT_TAG_NAME = "jsScript_name";
@@ -123,7 +123,7 @@ public class ScriptValuesMetaMod extends BaseTransformMeta
@Injection(name = "OPTIMIZATION_LEVEL")
private String optimizationLevel;
- public ScriptValuesMetaMod() {
+ public ScriptValuesMeta() {
super(); // allocate BaseTransformMeta
try {
parseXmlForAdditionalClasses();
@@ -282,7 +282,7 @@ public class ScriptValuesMetaMod extends BaseTransformMeta
}
public Object clone() {
- ScriptValuesMetaMod retval = (ScriptValuesMetaMod) super.clone();
+ ScriptValuesMeta retval = (ScriptValuesMeta) super.clone();
int nrFields = fieldname.length;
@@ -300,11 +300,11 @@ public class ScriptValuesMetaMod extends BaseTransformMeta
@Override
public ITransform createTransform(
TransformMeta transformMeta,
- ScriptValuesModData data,
+ ScriptValuesData data,
int copyNr,
PipelineMeta pipelineMeta,
Pipeline pipeline) {
- return new ScriptValuesMod(transformMeta, this, data, copyNr, pipelineMeta, pipeline);
+ return new ScriptValues(transformMeta, this, data, copyNr, pipelineMeta, pipeline);
}
private void readData(Node transformNode) throws HopXmlException {
@@ -588,11 +588,11 @@ public class ScriptValuesMetaMod extends BaseTransformMeta
// Adding some Constants to the JavaScript
try {
- jsscope.put("SKIP_PIPELINE", jsscope, Integer.valueOf(ScriptValuesMod.SKIP_PIPELINE));
- jsscope.put("ABORT_PIPELINE", jsscope, Integer.valueOf(ScriptValuesMod.ABORT_PIPELINE));
- jsscope.put("ERROR_PIPELINE", jsscope, Integer.valueOf(ScriptValuesMod.ERROR_PIPELINE));
+ jsscope.put("SKIP_PIPELINE", jsscope, Integer.valueOf(ScriptValues.SKIP_PIPELINE));
+ jsscope.put("ABORT_PIPELINE", jsscope, Integer.valueOf(ScriptValues.ABORT_PIPELINE));
+ jsscope.put("ERROR_PIPELINE", jsscope, Integer.valueOf(ScriptValues.ERROR_PIPELINE));
jsscope.put(
- "CONTINUE_PIPELINE", jsscope, Integer.valueOf(ScriptValuesMod.CONTINUE_PIPELINE));
+ "CONTINUE_PIPELINE", jsscope, Integer.valueOf(ScriptValues.CONTINUE_PIPELINE));
} catch (Exception ex) {
errorMessage = "Couldn't add Pipeline Constants! Error:" + Const.CR + ex.toString();
cr = new CheckResult(ICheckResult.TYPE_RESULT_ERROR, errorMessage, transformMeta);
@@ -600,8 +600,8 @@ public class ScriptValuesMetaMod extends BaseTransformMeta
}
try {
- ScriptValuesModDummy dummyTransform =
- new ScriptValuesModDummy(
+ ScriptValuesDummy dummyTransform =
+ new ScriptValuesDummy(
prev, pipelineMeta.getTransformFields(variables, transformMeta));
Scriptable jsvalue = Context.toObject(dummyTransform, jsscope);
jsscope.put("_transform_", jsscope, jsvalue);
@@ -796,8 +796,8 @@ public class ScriptValuesMetaMod extends BaseTransformMeta
return sRC;
}
- public ScriptValuesModData getTransformData() {
- return new ScriptValuesModData();
+ public ScriptValuesData getTransformData() {
+ return new ScriptValuesData();
}
// This is for Additional Classloading
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaDialog.java
similarity index 99%
rename from plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
rename to plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaDialog.java
index e95a7ec..2787d71 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaDialog.java
@@ -70,8 +70,8 @@ import java.util.Hashtable;
import java.util.List;
import java.util.*;
-public class ScriptValuesMetaModDialog extends BaseTransformDialog implements ITransformDialog {
- private static final Class<?> PKG = ScriptValuesMetaMod.class; // For Translator
+public class ScriptValuesMetaDialog extends BaseTransformDialog implements ITransformDialog {
+ private static final Class<?> PKG = ScriptValuesMeta.class; // For Translator
private static final String[] YES_NO_COMBO =
new String[] {
@@ -124,7 +124,7 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
private static final int ERROR_PIPELINE = -2;
private static final int CONTINUE_PIPELINE = 0;
- private final ScriptValuesMetaMod input;
+ private final ScriptValuesMeta input;
private ScriptValuesHelp scVHelp;
private TextVar wOptimizationLevel;
@@ -138,11 +138,11 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
private RowGeneratorMeta genMeta;
- public ScriptValuesMetaModDialog(
+ public ScriptValuesMetaDialog(
Shell parent, IVariables variables, Object in, PipelineMeta pipelineMeta, String sname) {
super(parent, variables, (BaseTransformMeta) in, pipelineMeta, sname);
- input = (ScriptValuesMetaMod) in;
+ input = (ScriptValuesMeta) in;
genMeta = null;
try {
imageActiveScript = guiresource.getImage("ui/images/script-active.svg");
@@ -769,7 +769,7 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
if (!Utils.isEmpty(Const.trim(input.getOptimizationLevel()))) {
wOptimizationLevel.setText(input.getOptimizationLevel().trim());
} else {
- wOptimizationLevel.setText(ScriptValuesMetaMod.OPTIMIZATION_LEVEL_DEFAULT);
+ wOptimizationLevel.setText(ScriptValuesMeta.OPTIMIZATION_LEVEL_DEFAULT);
}
for (int i = 0; i < input.getFieldname().length; i++) {
@@ -863,7 +863,7 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
return true;
}
- private void getInfo(ScriptValuesMetaMod meta) {
+ private void getInfo(ScriptValuesMeta meta) {
// meta.setCompatible( wCompatible.getSelection() );
meta.setOptimizationLevel(wOptimizationLevel.getText());
int nrFields = wFields.nrNonEmpty();
@@ -1064,7 +1064,7 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
// Now create a JavaScript transform with the information in this dialog
//
- ScriptValuesMetaMod scriptMeta = new ScriptValuesMetaMod();
+ ScriptValuesMeta scriptMeta = new ScriptValuesMeta();
getInfo(scriptMeta);
TransformMeta scriptTransform =
new TransformMeta(
@@ -1184,8 +1184,8 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
IRowMeta rowMeta = pipelineMeta.getPrevTransformFields(variables, transformName);
if (rowMeta != null) {
- ScriptValuesModDummy dummyTransform =
- new ScriptValuesModDummy(
+ ScriptValuesDummy dummyTransform =
+ new ScriptValuesDummy(
rowMeta, pipelineMeta.getTransformFields(variables, transformName));
Scriptable jsvalue = Context.toObject(dummyTransform, jsscope);
jsscope.put("_transform_", jsscope, jsvalue);
diff --git a/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModInjectionTest.java b/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaInjectionTest.java
similarity index 97%
rename from plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModInjectionTest.java
rename to plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaInjectionTest.java
index 24cf15d..db66072 100644
--- a/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModInjectionTest.java
+++ b/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaInjectionTest.java
@@ -30,13 +30,13 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ScriptValuesMetaModInjectionTest extends BaseMetadataInjectionTest<ScriptValuesMetaMod> {
+public class ScriptValuesMetaInjectionTest extends BaseMetadataInjectionTest<ScriptValuesMeta> {
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
@Before
public void setup() throws Exception {
- setup( new ScriptValuesMetaMod() );
+ setup( new ScriptValuesMeta() );
}
@Test
diff --git a/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModTest.java b/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaTest.java
similarity index 95%
rename from plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModTest.java
rename to plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaTest.java
index 5e311dc..1596c3b 100644
--- a/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModTest.java
+++ b/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaTest.java
@@ -42,11 +42,11 @@ import java.util.Map;
import java.util.Random;
import java.util.UUID;
-public class ScriptValuesMetaModTest implements IInitializer<ITransformMeta> {
+public class ScriptValuesMetaTest implements IInitializer<ITransformMeta> {
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
LoadSaveTester loadSaveTester;
- Class<ScriptValuesMetaMod> testMetaClass = ScriptValuesMetaMod.class;
+ Class<ScriptValuesMeta> testMetaClass = ScriptValuesMeta.class;
@Before
public void setUpLoadSave() throws Exception {
@@ -106,8 +106,8 @@ public class ScriptValuesMetaModTest implements IInitializer<ITransformMeta> {
// Call the allocate method on the LoadSaveTester meta class
public void modify( ITransformMeta someMeta ) {
- if ( someMeta instanceof ScriptValuesMetaMod ) {
- ( (ScriptValuesMetaMod) someMeta ).allocate( 5 );
+ if ( someMeta instanceof ScriptValuesMeta ) {
+ ( (ScriptValuesMeta) someMeta ).allocate( 5 );
}
}
@@ -141,7 +141,7 @@ public class ScriptValuesMetaModTest implements IInitializer<ITransformMeta> {
@Test
public void testExtend() {
- ScriptValuesMetaMod meta = new ScriptValuesMetaMod();
+ ScriptValuesMeta meta = new ScriptValuesMeta();
int size = 1;
meta.extend( size );
@@ -158,7 +158,7 @@ public class ScriptValuesMetaModTest implements IInitializer<ITransformMeta> {
Assert.assertEquals( size, meta.getReplace().length );
Assert.assertFalse( meta.getReplace()[ 0 ] );
- meta = new ScriptValuesMetaMod();
+ meta = new ScriptValuesMeta();
// set some values, uneven lengths
Whitebox.setInternalState( meta, "fieldname", new String[] { "Field 1", "Field 2", "Field 3" } );
Whitebox.setInternalState( meta, "rename", new String[] { "Field 1 - new" } );
@@ -169,7 +169,7 @@ public class ScriptValuesMetaModTest implements IInitializer<ITransformMeta> {
validateExtended( meta );
}
- private void validateExtended( final ScriptValuesMetaMod meta ) {
+ private void validateExtended( final ScriptValuesMeta meta ) {
Assert.assertEquals( 3, meta.getFieldname().length );
Assert.assertEquals( "Field 1", meta.getFieldname()[ 0 ] );
diff --git a/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModTest.java b/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesTest.java
similarity index 86%
rename from plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModTest.java
rename to plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesTest.java
index 10ca913..c10d466 100644
--- a/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesModTest.java
+++ b/plugins/transforms/javascript/src/test/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesTest.java
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.spy;
/**
* @author Andrey Khayrutdinov
*/
-public class ScriptValuesModTest {
+public class ScriptValuesTest {
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
@BeforeClass
@@ -48,7 +48,7 @@ public class ScriptValuesModTest {
@Test
@Ignore
public void bigNumberAreNotTrimmedToInt() throws Exception {
- ScriptValuesMod transform = TransformMockUtil.getTransform( ScriptValuesMod.class, ScriptValuesMetaMod.class, ScriptValuesModData.class, "test" );
+ ScriptValues transform = TransformMockUtil.getTransform( ScriptValues.class, ScriptValuesMeta.class, ScriptValuesData.class, "test" );
RowMeta input = new RowMeta();
input.addValueMeta( new ValueMetaBigNumber( "value_int" ) );
@@ -58,7 +58,7 @@ public class ScriptValuesModTest {
transform = spy( transform );
doReturn( new Object[] { BigDecimal.ONE, BigDecimal.ONE } ).when( transform ).getRow();
- ScriptValuesMetaMod meta = new ScriptValuesMetaMod();
+ ScriptValuesMeta meta = new ScriptValuesMeta();
meta.allocate( 2 );
meta.setFieldname( new String[] { "value_int", "value_double" } );
meta.setType( new int[] { IValueMeta.TYPE_BIGNUMBER, IValueMeta.TYPE_BIGNUMBER } );
@@ -69,7 +69,7 @@ public class ScriptValuesModTest {
"value_int = 10.00;\nvalue_double = 10.50" )
} );
- ScriptValuesModData data = new ScriptValuesModData();
+ ScriptValuesData data = new ScriptValuesData();
transform.init();
Object[] expectedRow = { BigDecimal.TEN, new BigDecimal( "10.5" ) };
@@ -80,7 +80,7 @@ public class ScriptValuesModTest {
@Test
@Ignore
public void variableIsSetInScopeOfTransform() throws Exception {
- ScriptValuesMod transform = TransformMockUtil.getTransform( ScriptValuesMod.class, ScriptValuesMetaMod.class, ScriptValuesModData.class, "test" );
+ ScriptValues transform = TransformMockUtil.getTransform( ScriptValues.class, ScriptValuesMeta.class, ScriptValuesData.class, "test" );
RowMeta input = new RowMeta();
input.addValueMeta( new ValueMetaString( "str" ) );
@@ -89,7 +89,7 @@ public class ScriptValuesModTest {
transform = spy( transform );
doReturn( new Object[] { "" } ).when( transform ).getRow();
- ScriptValuesMetaMod meta = new ScriptValuesMetaMod();
+ ScriptValuesMeta meta = new ScriptValuesMeta();
meta.allocate( 1 );
meta.setFieldname( new String[] { "str" } );
meta.setType( new int[] { IValueMeta.TYPE_STRING } );
@@ -100,7 +100,7 @@ public class ScriptValuesModTest {
"setVariable('temp', 'pass', 'r');\nstr = getVariable('temp', 'fail');" )
} );
- ScriptValuesModData data = new ScriptValuesModData();
+ ScriptValuesData data = new ScriptValuesData();
transform.init();
Object[] expectedRow = { "pass" };
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java b/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
index 44c823f..1b73ea3 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
@@ -74,6 +74,16 @@ public class StyledTextComp extends Composite {
buildingStyledTextMenu();
+ // Default layout without variables
+ textWidget.setLayoutData(
+ new FormDataBuilder()
+ .top()
+ .left()
+ .right(100, 0)
+ .bottom(100, 0)
+ .result());
+
+ // Special layout for variables decorator
if (varsSensitive) {
textWidget.addKeyListener(new ControlSpaceKeyAdapter(variables, textWidget));
image = GuiResource.getInstance().getImageVariable();
@@ -106,7 +116,7 @@ public class StyledTextComp extends Composite {
.result());
}
- }
+ }
}
public String getSelectionText() {