[hop] branch master updated: HOP-4558 Regex Transform - Format needs to be wider sizer Add ColumnResizer Fix column type can select only existing type Fix assembly base directory

[ha...@apache.org]

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/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new a0733b407a HOP-4558 Regex Transform - Format needs to be wider sizer Add ColumnResizer Fix column type can select only existing type Fix assembly base directory
     new c435da9eb6 Merge pull request #1777 from nadment/HOP-4558
a0733b407a is described below

commit a0733b407a94924a16b1b8d44ad03b8f5051d861
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Sat Nov 5 21:10:29 2022 +0100

    HOP-4558 Regex Transform - Format needs to be wider sizer
    Add ColumnResizer
    Fix column type can select only existing type
    Fix assembly base directory
---
 assemblies/plugins/transforms/regexeval/src/assembly/assembly.xml  | 2 +-
 .../apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/assemblies/plugins/transforms/regexeval/src/assembly/assembly.xml b/assemblies/plugins/transforms/regexeval/src/assembly/assembly.xml
index a5d25f9fc5..2cfc40856c 100644
--- a/assemblies/plugins/transforms/regexeval/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/regexeval/src/assembly/assembly.xml
@@ -23,7 +23,7 @@
     <formats>
         <format>zip</format>
     </formats>
-    <baseDirectory>transforms/dregexeval</baseDirectory>
+    <baseDirectory>transforms/regexeval</baseDirectory>
     <files>
         <file>
             <source>${project.basedir}/src/main/resources/version.xml</source>
diff --git a/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java b/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
index 951ec432c5..d56285f2e0 100644
--- a/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
+++ b/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
@@ -35,6 +35,7 @@ import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ColumnsResizer;
 import org.apache.hop.ui.core.widget.LabelTextVar;
 import org.apache.hop.ui.core.widget.StyledTextComp;
 import org.apache.hop.ui.core.widget.TableView;
@@ -389,7 +390,8 @@ public class RegexEvalDialog extends BaseTransformDialog implements ITransformDi
           new ColumnInfo(
               BaseMessages.getString(PKG, "RegexEvalDialog.ColumnInfo.Type"),
               ColumnInfo.COLUMN_TYPE_CCOMBO,
-              ValueMetaFactory.getValueMetaNames()),
+              ValueMetaFactory.getValueMetaNames(),
+              true),
           new ColumnInfo(
               BaseMessages.getString(PKG, "RegexEvalDialog.ColumnInfo.Length"),
               ColumnInfo.COLUMN_TYPE_TEXT,
@@ -445,7 +447,8 @@ public class RegexEvalDialog extends BaseTransformDialog implements ITransformDi
     fdFields.right = new FormAttachment(100, 0);
     fdFields.bottom = new FormAttachment(100, 0);
     wFields.setLayoutData(fdFields);
-
+    wFields.getTable().addListener(SWT.Resize, new ColumnsResizer(2, 20, 10, 5, 5, 10, 8, 8, 8, 8, 8, 8));
+    
     FormData fdGeneralComp = new FormData();
     fdGeneralComp.left = new FormAttachment(0, 0);
     fdGeneralComp.top = new FormAttachment(0, 0);