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 ea50f6a HOP-2164, HOP-2165 Add format selector in Data Set and File
Definition (#376)
ea50f6a is described below
commit ea50f6a97c81a83a4616771db9a1f3d8635a73be
Author: Nicolas Adment <[email protected]>
AuthorDate: Thu Nov 12 19:28:46 2020 +0100
HOP-2164, HOP-2165 Add format selector in Data Set and File Definition
(#376)
* HOP-2164 Add format selector in Data Set creation
* HOP-2165 Add format selector in File Definition creation
---
.../main/java/org/apache/hop/beam/metadata/FileDefinitionDialog.java | 2 +-
.../testing/src/main/java/org/apache/hop/ui/testing/DataSetDialog.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinitionDialog.java
b/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinitionDialog.java
index 3d68ea7..3ec91b7 100644
---
a/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinitionDialog.java
+++
b/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinitionDialog.java
@@ -252,7 +252,7 @@ public class FileDefinitionDialog implements
IMetadataDialog {
ColumnInfo[] columnInfos = new ColumnInfo[] {
new ColumnInfo( BaseMessages.getString( PKG,
"FileDefinitionDialog.Fields.Column.FieldName" ), ColumnInfo.COLUMN_TYPE_TEXT,
false, false ),
new ColumnInfo( BaseMessages.getString( PKG,
"FileDefinitionDialog.Fields.Column.FieldType" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, ValueMetaFactory.getValueMetaNames(), false ),
- new ColumnInfo( BaseMessages.getString( PKG,
"FileDefinitionDialog.Fields.Column.FieldFormat" ),
ColumnInfo.COLUMN_TYPE_TEXT, false, false ),
+ new ColumnInfo( BaseMessages.getString( PKG,
"FileDefinitionDialog.Fields.Column.FieldFormat" ),
ColumnInfo.COLUMN_TYPE_FORMAT, 2 ),
new ColumnInfo( BaseMessages.getString( PKG,
"FileDefinitionDialog.Fields.Column.FieldLength" ),
ColumnInfo.COLUMN_TYPE_TEXT, false, false ),
new ColumnInfo( BaseMessages.getString( PKG,
"FileDefinitionDialog.Fields.Column.FieldPrecision" ),
ColumnInfo.COLUMN_TYPE_TEXT, false, false ),
};
diff --git
a/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/DataSetDialog.java
b/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/DataSetDialog.java
index 59969ff..605bb32 100644
---
a/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/DataSetDialog.java
+++
b/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/DataSetDialog.java
@@ -229,7 +229,7 @@ public class DataSetDialog extends Dialog implements
IMetadataDialog {
new ColumnInfo( BaseMessages.getString( PKG,
"DataSetDialog.ColumnInfo.FieldType" ),
ColumnInfo.COLUMN_TYPE_CCOMBO,
ValueMetaFactory.getAllValueMetaNames(), false ),
new ColumnInfo( BaseMessages.getString( PKG,
"DataSetDialog.ColumnInfo.FieldFormat" ),
- ColumnInfo.COLUMN_TYPE_TEXT, true, false ),
+ ColumnInfo.COLUMN_TYPE_FORMAT, 2 ),
new ColumnInfo( BaseMessages.getString( PKG,
"DataSetDialog.ColumnInfo.FieldLength" ),
ColumnInfo.COLUMN_TYPE_TEXT, true, false ),
new ColumnInfo( BaseMessages.getString( PKG,
"DataSetDialog.ColumnInfo.FieldPrecision" ),
