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 2020/11/21 16:50:33 UTC
[incubator-hop] branch master updated: using i18n constant messages
(#402)
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 be08bfd using i18n constant messages (#402)
be08bfd is described below
commit be08bfd55c0c817865ecf9c04f71b1c02e5fb0f4
Author: Mahendran Mookkiah <ma...@gmail.com>
AuthorDate: Sat Nov 21 11:50:22 2020 -0500
using i18n constant messages (#402)
Signed-off-by: Mahendran Mookkiah <ma...@gmail.com>
---
.../transforms/file/BaseFileInputFiles.java | 6 ++--
.../transforms/file/BaseFileInputMeta.java | 6 ++--
.../transforms/calculator/CalculatorDialog.java | 12 ++++---
.../transforms/checksum/CheckSumDialog.java | 4 ++-
.../transforms/constant/ConstantDialog.java | 10 +++---
.../transforms/datagrid/DataGridDialog.java | 12 ++++---
.../transforms/excelinput/ExcelInputDialog.java | 14 ++++----
.../transforms/excelinput/ExcelInputMeta.java | 6 ++--
.../getfilenames/GetFileNamesDialog.java | 4 ++-
.../getsubfolders/GetSubFoldersMeta.java | 4 ++-
.../transforms/httppost/HttpPostDialog.java | 8 +++--
.../pipeline/transforms/ifnull/IfNullDialog.java | 16 +++++----
.../javascript/ScriptValuesMetaModDialog.java | 4 ++-
.../transforms/jsoninput/JsonInputDialog.java | 12 ++++---
.../transforms/jsoninput/JsonInputMeta.java | 4 ++-
.../transforms/ldapinput/LdapInputDialog.java | 24 +++++++-------
.../transforms/ldifinput/LDIFInputDialog.java | 12 ++++---
.../transforms/ldifinput/LDIFInputMeta.java | 4 ++-
.../loadfileinput/LoadFileInputDialog.java | 14 ++++----
.../loadfileinput/LoadFileInputMeta.java | 7 ++--
.../propertyinput/PropertyInputDialog.java | 14 ++++----
.../propertyinput/PropertyInputMeta.java | 4 ++-
.../replacestring/ReplaceStringDialog.java | 20 +++++++-----
.../rowgenerator/RowGeneratorDialog.java | 13 +++++---
.../selectvalues/SelectValuesDialog.java | 24 +++++++-------
.../setvalueconstant/SetValueConstantDialog.java | 10 +++---
.../pipeline/transforms/sort/SortRowsDialog.java | 38 ++++++++++++----------
.../transforms/sortedmerge/SortedMergeDialog.java | 10 +++---
.../stringoperations/StringOperationsMeta.java | 4 ++-
.../fileinput/text/TextFileInputDialog.java | 32 +++++++++---------
.../transforms/xml/addxml/AddXmlDialog.java | 12 ++++---
.../xml/getxmldata/GetXmlDataDialog.java | 12 ++++---
.../transforms/yamlinput/YamlInputMeta.java | 4 ++-
33 files changed, 222 insertions(+), 158 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputFiles.java b/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputFiles.java
index 1b8e3fa..f7c9416 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputFiles.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputFiles.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.file;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.fileinput.FileInputList;
import org.apache.hop.core.injection.Injection;
import org.apache.hop.i18n.BaseMessages;
@@ -47,8 +49,8 @@ public class BaseFileInputFiles implements Cloneable {
public static final String[] RequiredFilesCode = new String[] { "N", "Y" };
public static final String[] RequiredFilesDesc =
- new String[] { BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG,
- "System.Combo.Yes" ) };
+ new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG,
+ SYSTEM_COMBO_YES ) };
/**
* Array of filenames
diff --git a/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputMeta.java b/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputMeta.java
index 92c0973..bf99d45 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputMeta.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputMeta.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.file;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import com.google.common.base.Preconditions;
import org.apache.hop.core.fileinput.FileInputList;
import org.apache.hop.core.injection.InjectionDeep;
@@ -54,8 +56,8 @@ public abstract class BaseFileInputMeta<A extends BaseFileInputAdditionalField,
public static final String YES = "Y";
public static final String[] RequiredFilesDesc =
- new String[] { BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG,
- "System.Combo.Yes" ) };
+ new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG,
+ SYSTEM_COMBO_YES ) };
@InjectionDeep
public I inputFiles;
diff --git a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/CalculatorDialog.java b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/CalculatorDialog.java
index a7a927a..43e9fc7 100644
--- a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/CalculatorDialog.java
+++ b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/CalculatorDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.calculator;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -192,8 +194,8 @@ public class CalculatorDialog extends BaseTransformDialog implements ITransformD
new ColumnInfo(
BaseMessages.getString( PKG, "CalculatorDialog.RemoveColumn.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ),
- BaseMessages.getString( PKG, "System.Combo.Yes" ) } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) } ),
new ColumnInfo(
BaseMessages.getString( PKG, "CalculatorDialog.ConversionMask.Column" ),
ColumnInfo.COLUMN_TYPE_FORMAT, 6 ),
@@ -358,8 +360,8 @@ public class CalculatorDialog extends BaseTransformDialog implements ITransformD
}
item
.setText( 9, fn.isRemovedFromResult()
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
item.setText( 10, Const.NVL( fn.getConversionMask(), "" ) );
item.setText( 11, Const.NVL( fn.getDecimalSymbol(), "" ) );
item.setText( 12, Const.NVL( fn.getGroupingSymbol(), "" ) );
@@ -405,7 +407,7 @@ public class CalculatorDialog extends BaseTransformDialog implements ITransformD
int valueType = ValueMetaFactory.getIdForValueMeta( item.getText( 6 ) );
int valueLength = Const.toInt( item.getText( 7 ), -1 );
int valuePrecision = Const.toInt( item.getText( 8 ), -1 );
- boolean removed = BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 9 ) );
+ boolean removed = BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 9 ) );
String conversionMask = item.getText( 10 );
String decimalSymbol = item.getText( 11 );
String groupingSymbol = item.getText( 12 );
diff --git a/plugins/transforms/checksum/src/main/java/org/apache/hop/pipeline/transforms/checksum/CheckSumDialog.java b/plugins/transforms/checksum/src/main/java/org/apache/hop/pipeline/transforms/checksum/CheckSumDialog.java
index c76848a..b1278f1 100644
--- a/plugins/transforms/checksum/src/main/java/org/apache/hop/pipeline/transforms/checksum/CheckSumDialog.java
+++ b/plugins/transforms/checksum/src/main/java/org/apache/hop/pipeline/transforms/checksum/CheckSumDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.checksum;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -315,7 +317,7 @@ public class CheckSumDialog extends BaseTransformDialog implements ITransformDia
IRowMeta r = pipelineMeta.getPrevTransformFields( transformName );
if ( r != null ) {
ITableItemInsertListener insertListener = ( tableItem, v ) -> {
- tableItem.setText( 2, BaseMessages.getString( PKG, "System.Combo.Yes" ) );
+ tableItem.setText( 2, BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) );
return true;
};
BaseTransformDialog
diff --git a/plugins/transforms/constant/src/main/java/org/apache/hop/pipeline/transforms/constant/ConstantDialog.java b/plugins/transforms/constant/src/main/java/org/apache/hop/pipeline/transforms/constant/ConstantDialog.java
index d709a0a..a5c0825 100644
--- a/plugins/transforms/constant/src/main/java/org/apache/hop/pipeline/transforms/constant/ConstantDialog.java
+++ b/plugins/transforms/constant/src/main/java/org/apache/hop/pipeline/transforms/constant/ConstantDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.constant;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
@@ -148,7 +150,7 @@ public class ConstantDialog extends BaseTransformDialog implements ITransformDia
BaseMessages.getString( PKG, "ConstantDialog.Value.SetEmptyString" ),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ) } );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } );
wFields =
new TableView(
@@ -239,8 +241,8 @@ public class ConstantDialog extends BaseTransformDialog implements ITransformDia
item.setText( col++, Const.NVL( def, "" ) );
item
.setText( col++, input.isSetEmptyString()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
}
}
@@ -277,7 +279,7 @@ public class ConstantDialog extends BaseTransformDialog implements ITransformDia
for ( i = 0; i < nrFields; i++ ) {
TableItem item = wFields.getNonEmpty( i );
input.getFieldName()[ i ] = item.getText( 1 );
- input.isSetEmptyString()[ i ] = BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 10 ) );
+ input.isSetEmptyString()[ i ] = BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 10 ) );
input.getFieldType()[ i ] = input.isSetEmptyString()[ i ] ? "String" : item.getText( 2 );
input.getFieldFormat()[ i ] = item.getText( 3 );
diff --git a/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java b/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java
index 0f684bd..0e9a949 100644
--- a/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java
+++ b/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGridDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.datagrid;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
@@ -172,8 +174,8 @@ public class DataGridDialog extends BaseTransformDialog implements ITransformDia
new ColumnInfo(
BaseMessages.getString( PKG, "DataGridDialog.Value.SetEmptyString" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } ),
};
@@ -455,8 +457,8 @@ public class DataGridDialog extends BaseTransformDialog implements ITransformDia
item.setText( col++, Const.NVL( group, "" ) );
item
.setText( col++, input.isSetEmptyString()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
}
}
@@ -520,7 +522,7 @@ public class DataGridDialog extends BaseTransformDialog implements ITransformDia
meta.getFieldPrecision()[ i ] = -1;
}
meta.isSetEmptyString()[ i ] =
- BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( col++ ) );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( col++ ) );
if ( meta.isSetEmptyString()[ i ] ) {
meta.getFieldType()[ i ] = "String";
diff --git a/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java b/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java
index 87a02f1..461f425 100644
--- a/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java
+++ b/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.excelinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
@@ -80,7 +82,7 @@ public class ExcelInputDialog extends BaseTransformDialog implements ITransformD
private static final String TAB_FLAG = "!";
private static final String[] YES_NO_COMBO = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
private CTabFolder wTabFolder;
@@ -851,8 +853,8 @@ public class ExcelInputDialog extends BaseTransformDialog implements ITransformD
new ColumnInfo(
BaseMessages.getString( PKG, "ExcelInputDialog.Repeat.Column" ), ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } ),
new ColumnInfo(
BaseMessages.getString( PKG, "ExcelInputDialog.Format.Column" ), ColumnInfo.COLUMN_TYPE_FORMAT, 2 ),
new ColumnInfo(
@@ -1159,8 +1161,8 @@ public class ExcelInputDialog extends BaseTransformDialog implements ITransformD
String prec = "" + meta.getField()[ i ].getPrecision();
String trim = meta.getField()[ i ].getTrimTypeDesc();
String rep =
- meta.getField()[ i ].isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" );
+ meta.getField()[ i ].isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO );
String format = meta.getField()[ i ].getFormat();
String currency = meta.getField()[ i ].getCurrencySymbol();
String decimal = meta.getField()[ i ].getDecimalSymbol();
@@ -1352,7 +1354,7 @@ public class ExcelInputDialog extends BaseTransformDialog implements ITransformD
String slength = item.getText( 3 );
String sprec = item.getText( 4 );
meta.getField()[ i ].setTrimType( ExcelInputMeta.getTrimTypeByDesc( item.getText( 5 ) ) );
- meta.getField()[ i ].setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase(
+ meta.getField()[ i ].setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase(
item.getText( 6 ) ) );
meta.getField()[ i ].setLength( Const.toInt( slength, -1 ) );
diff --git a/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputMeta.java b/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputMeta.java
index 7c60d14..5919011 100644
--- a/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputMeta.java
+++ b/plugins/transforms/excelinput/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputMeta.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.excelinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
@@ -75,11 +77,9 @@ public class ExcelInputMeta extends BaseTransformMeta implements ITransformMeta<
private static final Class<?> PKG = ExcelInputMeta.class; // Needed by Translator
public static final String[] RequiredFilesDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] RequiredFilesCode = new String[] { "N", "Y" };
- private static final String NO = "N";
-
private static final String YES = "Y";
public static final int TYPE_TRIM_NONE = 0;
public static final int TYPE_TRIM_LEFT = 1;
diff --git a/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java b/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
index cd9421b..6ec1a2c 100644
--- a/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
+++ b/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.getfilenames;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -70,7 +72,7 @@ public class GetFileNamesDialog extends BaseTransformDialog implements ITransfor
private static final Class<?> PKG = GetFileNamesMeta.class; // Needed by Translator
private static final String[] YES_NO_COMBO = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
private Button wDoNotFailIfNoFile;
diff --git a/plugins/transforms/getsubfolders/src/main/java/org/apache/hop/pipeline/transforms/getsubfolders/GetSubFoldersMeta.java b/plugins/transforms/getsubfolders/src/main/java/org/apache/hop/pipeline/transforms/getsubfolders/GetSubFoldersMeta.java
index 4c5a7cc..bd7685b 100644
--- a/plugins/transforms/getsubfolders/src/main/java/org/apache/hop/pipeline/transforms/getsubfolders/GetSubFoldersMeta.java
+++ b/plugins/transforms/getsubfolders/src/main/java/org/apache/hop/pipeline/transforms/getsubfolders/GetSubFoldersMeta.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.getsubfolders;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.ICheckResult;
@@ -70,7 +72,7 @@ public class GetSubFoldersMeta extends BaseTransformMeta implements ITransformMe
private static final Class<?> PKG = GetSubFoldersMeta.class; // Needed by Translator
public static final String[] RequiredFoldersDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] RequiredFoldersCode = new String[] { "N", "Y" };
public static final String NO = "N";
diff --git a/plugins/transforms/httppost/src/main/java/org/apache/hop/pipeline/transforms/httppost/HttpPostDialog.java b/plugins/transforms/httppost/src/main/java/org/apache/hop/pipeline/transforms/httppost/HttpPostDialog.java
index 94c64ee..9db43df 100644
--- a/plugins/transforms/httppost/src/main/java/org/apache/hop/pipeline/transforms/httppost/HttpPostDialog.java
+++ b/plugins/transforms/httppost/src/main/java/org/apache/hop/pipeline/transforms/httppost/HttpPostDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.httppost;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -57,9 +59,9 @@ public class HttpPostDialog extends BaseTransformDialog implements ITransformDia
private static final Class<?> PKG = HttpPostMeta.class; // Needed by Translator
private static final String[] YES_NO_COMBO = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
- private static final String YES = BaseMessages.getString( PKG, "System.Combo.Yes" );
- private static final String NO = BaseMessages.getString( PKG, "System.Combo.No" );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
+ private static final String YES = BaseMessages.getString( PKG, SYSTEM_COMBO_YES );
+ private static final String NO = BaseMessages.getString( PKG, SYSTEM_COMBO_NO );
private Label wlUrl;
private TextVar wUrl;
diff --git a/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNullDialog.java b/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNullDialog.java
index bf0d50b..fcaffe1 100644
--- a/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNullDialog.java
+++ b/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNullDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.ifnull;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -290,7 +292,7 @@ public class IfNullDialog extends BaseTransformDialog implements ITransformDialo
new ColumnInfo( BaseMessages.getString( PKG, "IfNullDialog.Value.Column" ), ColumnInfo.COLUMN_TYPE_TEXT, false ),
new ColumnInfo( BaseMessages.getString( PKG, "IfNullDialog.Value.ConversionMask" ), ColumnInfo.COLUMN_TYPE_CCOMBO, Const.getDateFormats() ),
new ColumnInfo( BaseMessages.getString( PKG, "IfNullDialog.Value.SetEmptyString" ), ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ) } )
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } )
};
colval[ 1 ].setUsingVariables( true );
@@ -385,7 +387,7 @@ public class IfNullDialog extends BaseTransformDialog implements ITransformDialo
BaseMessages.getString( PKG, "IfNullDialog.Value.SetEmptyString" ),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ) } );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } );
wFields =
new TableView(
@@ -511,8 +513,8 @@ public class IfNullDialog extends BaseTransformDialog implements ITransformDialo
if ( input.getValueTypes()[ i ].getTypereplaceMask() != null ) {
ti.setText( 3, input.getValueTypes()[ i ].getTypereplaceMask() );
}
- ti.setText( 4, input.getValueTypes()[ i ].isSetTypeEmptyString() ? BaseMessages.getString( PKG, "System.Combo.Yes" )
- : BaseMessages.getString( PKG, "System.Combo.No" ) );
+ ti.setText( 4, input.getValueTypes()[ i ].isSetTypeEmptyString() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES )
+ : BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
}
@@ -537,7 +539,7 @@ public class IfNullDialog extends BaseTransformDialog implements ITransformDialo
ti.setText( 3, input.getFields()[ i ].getReplaceMask() );
}
ti.setText( 4, input.getFields()[ i ].isSetEmptyString()
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
}
wFields.setRowNums();
@@ -586,7 +588,7 @@ public class IfNullDialog extends BaseTransformDialog implements ITransformDialo
for ( int i = 0; i < nrtypes; i++ ) {
TableItem ti = wValueTypes.getNonEmpty( i );
input.getValueTypes()[ i ].setTypeName( ti.getText( 1 ) );
- input.getValueTypes()[ i ].setTypeEmptyString( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase(
+ input.getValueTypes()[ i ].setTypeEmptyString( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase(
ti.getText( 4 ) ) );
if ( input.getValueTypes()[ i ].isSetTypeEmptyString() ) {
input.getValueTypes()[ i ].setTypereplaceValue( "" );
@@ -601,7 +603,7 @@ public class IfNullDialog extends BaseTransformDialog implements ITransformDialo
for ( int i = 0; i < nrFields; i++ ) {
TableItem ti = wFields.getNonEmpty( i );
input.getFields()[ i ].setFieldName( ti.getText( 1 ) );
- input.getFields()[ i ].setEmptyString( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti
+ input.getFields()[ i ].setEmptyString( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti
.getText( 4 ) ) );
if ( input.getFields()[ i ].isSetEmptyString() ) {
input.getFields()[ i ].setReplaceValue( "" );
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/ScriptValuesMetaModDialog.java
index d26b158..27f6aa0 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/ScriptValuesMetaModDialog.java
@@ -24,6 +24,8 @@
package org.apache.hop.pipeline.transforms.javascript;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -77,7 +79,7 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
private static final Class<?> PKG = ScriptValuesMetaMod.class; // Needed by Translator
private static final String[] YES_NO_COMBO = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
private ModifyListener lsMod;
diff --git a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputDialog.java b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputDialog.java
index 70e9c45..100c27a 100644
--- a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputDialog.java
+++ b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.jsoninput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -427,8 +429,8 @@ public class JsonInputDialog extends BaseTransformDialog implements ITransformDi
new ColumnInfo(
BaseMessages.getString( PKG, "JsonInputDialog.FieldsTable.Repeat.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ),
};
@@ -1205,8 +1207,8 @@ public class JsonInputDialog extends BaseTransformDialog implements ITransformDi
String decim = field.getDecimalSymbol();
String trim = field.getTrimTypeDesc();
String rep =
- field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" );
+ field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO );
if ( name != null ) {
item.setText( 1, name );
@@ -1342,7 +1344,7 @@ public class JsonInputDialog extends BaseTransformDialog implements ITransformDi
field.setDecimalSymbol( item.getText( 8 ) );
field.setGroupSymbol( item.getText( 9 ) );
field.setTrimType( ValueMetaBase.getTrimTypeByDesc( item.getText( 10 ) ) );
- field.setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 11 ) ) );
+ field.setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 11 ) ) );
in.getInputFields()[ i ] = field;
}
diff --git a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputMeta.java b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputMeta.java
index 621419b..d1a6a55 100644
--- a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputMeta.java
+++ b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInputMeta.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.jsoninput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.Const;
@@ -84,7 +86,7 @@ public class JsonInputMeta
private static final Class<?> PKG = JsonInputMeta.class; // for i18n purposes, needed by Translator2!!
public static final String[] RequiredFilesDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
// TextFileInputMeta.Content.includeFilename
/**
diff --git a/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java b/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
index 3ed4882..8cc4615 100644
--- a/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
+++ b/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
@@ -22,6 +22,8 @@
******************************************************************************/
package org.apache.hop.pipeline.transforms.ldapinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.encryption.Encr;
@@ -1023,8 +1025,8 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
BaseMessages.getString(PKG, "LdapInputDialog.FieldsTable.IsSortedKey.Column"),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString(PKG, "System.Combo.Yes"),
- BaseMessages.getString(PKG, "System.Combo.No")
+ BaseMessages.getString(PKG, SYSTEM_COMBO_YES),
+ BaseMessages.getString(PKG, SYSTEM_COMBO_NO)
},
true),
new ColumnInfo(
@@ -1065,8 +1067,8 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
BaseMessages.getString(PKG, "LdapInputDialog.FieldsTable.Repeat.Column"),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString(PKG, "System.Combo.Yes"),
- BaseMessages.getString(PKG, "System.Combo.No")
+ BaseMessages.getString(PKG, SYSTEM_COMBO_YES),
+ BaseMessages.getString(PKG, SYSTEM_COMBO_NO)
},
true),
};
@@ -1254,7 +1256,7 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
} else {
item.setText(3, BaseMessages.getString(PKG, "LdapInputField.FetchAttributeAs.String"));
}
- item.setText(4, BaseMessages.getString(PKG, "System.Combo.No"));
+ item.setText(4, BaseMessages.getString(PKG, SYSTEM_COMBO_NO));
item.setText(5, v.getTypeDesc());
}
colinf[1].setComboValues(fieldsName);
@@ -1371,8 +1373,8 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
String path = field.getAttribute();
String issortedkey =
field.isSortedKey()
- ? BaseMessages.getString(PKG, "System.Combo.Yes")
- : BaseMessages.getString(PKG, "System.Combo.No");
+ ? BaseMessages.getString(PKG, SYSTEM_COMBO_YES)
+ : BaseMessages.getString(PKG, SYSTEM_COMBO_NO);
String returntype = field.getFetchAttributeAsDesc();
String type = field.getTypeDesc();
String format = field.getFormat();
@@ -1384,8 +1386,8 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
String trim = field.getTrimTypeDesc();
String rep =
field.isRepeated()
- ? BaseMessages.getString(PKG, "System.Combo.Yes")
- : BaseMessages.getString(PKG, "System.Combo.No");
+ ? BaseMessages.getString(PKG, SYSTEM_COMBO_YES)
+ : BaseMessages.getString(PKG, SYSTEM_COMBO_NO);
if (name != null) {
item.setText(1, name);
@@ -1504,7 +1506,7 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
field.setAttribute(item.getText(2));
field.setFetchAttributeAs(LdapInputField.getFetchAttributeAsByDesc(item.getText(3)));
field.setSortedKey(
- BaseMessages.getString(PKG, "System.Combo.Yes").equalsIgnoreCase(item.getText(4)));
+ BaseMessages.getString(PKG, SYSTEM_COMBO_YES).equalsIgnoreCase(item.getText(4)));
field.setType(ValueMetaFactory.getIdForValueMeta(item.getText(5)));
field.setFormat(item.getText(6));
field.setLength(Const.toInt(item.getText(7), -1));
@@ -1514,7 +1516,7 @@ public class LdapInputDialog extends BaseTransformDialog implements ITransformDi
field.setGroupSymbol(item.getText(11));
field.setTrimType(LdapInputField.getTrimTypeByDesc(item.getText(12)));
field.setRepeated(
- BaseMessages.getString(PKG, "System.Combo.Yes").equalsIgnoreCase(item.getText(13)));
+ BaseMessages.getString(PKG, SYSTEM_COMBO_YES).equalsIgnoreCase(item.getText(13)));
// CHECKSTYLE:Indentation:OFF
in.getInputFields()[i] = field;
diff --git a/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputDialog.java b/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputDialog.java
index bc54ab9..99714a8 100644
--- a/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputDialog.java
+++ b/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.ldifinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import netscape.ldap.LDAPAttribute;
import netscape.ldap.util.LDIF;
import netscape.ldap.util.LDIFAttributeContent;
@@ -775,8 +777,8 @@ public class LDIFInputDialog extends BaseTransformDialog implements ITransformDi
new ColumnInfo(
BaseMessages.getString( PKG, "LDIFInputDialog.FieldsTable.Repeat.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ),
};
@@ -1241,8 +1243,8 @@ public class LDIFInputDialog extends BaseTransformDialog implements ITransformDi
String decim = field.getDecimalSymbol();
String trim = field.getTrimTypeDesc();
String rep =
- field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" );
+ field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO );
if ( name != null ) {
item.setText( 1, name );
@@ -1389,7 +1391,7 @@ public class LDIFInputDialog extends BaseTransformDialog implements ITransformDi
field.setDecimalSymbol( item.getText( 8 ) );
field.setGroupSymbol( item.getText( 9 ) );
field.setTrimType( LDIFInputField.getTrimTypeByDesc( item.getText( 10 ) ) );
- field.setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 11 ) ) );
+ field.setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 11 ) ) );
//CHECKSTYLE:Indentation:OFF
in.getInputFields()[ i ] = field;
diff --git a/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputMeta.java b/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputMeta.java
index 988efa3..6025afb 100644
--- a/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputMeta.java
+++ b/plugins/transforms/ldifinput/src/main/java/org/apache/hop/pipeline/transforms/ldifinput/LDIFInputMeta.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.ldifinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.ICheckResult;
@@ -70,7 +72,7 @@ public class LDIFInputMeta extends BaseTransformMeta implements ITransformMeta<L
private static final Class<?> PKG = LDIFInputMeta.class; // Needed by Translator
public static final String[] RequiredFilesDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] RequiredFilesCode = new String[] { "N", "Y" };
private static final String NO = "N";
private static final String YES = "Y";
diff --git a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
index 01b5e36..80bd076 100644
--- a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
+++ b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.loadfileinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -76,7 +78,7 @@ public class LoadFileInputDialog extends BaseTransformDialog implements ITransfo
private static final Class<?> PKG = LoadFileInputMeta.class; // Needed by Translator
private static final String[] YES_NO_COMBO = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
private CTabFolder wTabFolder;
@@ -789,8 +791,8 @@ public class LoadFileInputDialog extends BaseTransformDialog implements ITransfo
new ColumnInfo(
BaseMessages.getString( PKG, "LoadFileInputDialog.FieldsTable.Repeat.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ),
};
@@ -1172,8 +1174,8 @@ public class LoadFileInputDialog extends BaseTransformDialog implements ITransfo
String decim = field.getDecimalSymbol();
String trim = field.getTrimTypeDesc();
String rep =
- field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" );
+ field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO );
if ( name != null ) {
item.setText( 1, name );
@@ -1313,7 +1315,7 @@ public class LoadFileInputDialog extends BaseTransformDialog implements ITransfo
field.setDecimalSymbol( item.getText( 8 ) );
field.setGroupSymbol( item.getText( 9 ) );
field.setTrimType( LoadFileInputField.getTrimTypeByDesc( item.getText( 10 ) ) );
- field.setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 11 ) ) );
+ field.setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 11 ) ) );
//CHECKSTYLE:Indentation:OFF
in.getInputFields()[ i ] = field;
diff --git a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputMeta.java b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputMeta.java
index 4cf2e46..dba88e8 100644
--- a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputMeta.java
+++ b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputMeta.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.loadfileinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.ICheckResult;
@@ -95,11 +97,10 @@ public class LoadFileInputMeta extends BaseTransformMeta implements ITransformMe
private static final Class<?> PKG = LoadFileInputMeta.class; // Needed by Translator
- public static final String[] RequiredFilesDesc = new String[] { BaseMessages.getString( PKG, "System.Combo.No" ),
- BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ public static final String[] RequiredFilesDesc = new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_NO ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] RequiredFilesCode = new String[] { "N", "Y" };
- private static final String NO = "N";
private static final String YES = "Y";
/**
diff --git a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
index 40d29d6..a439b02 100644
--- a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
+++ b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.propertyinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -66,7 +68,7 @@ import java.util.Iterator;
public class PropertyInputDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = PropertyInputMeta.class; // Needed by Translator
private static final String[] YES_NO_COMBO = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
private CTabFolder wTabFolder;
@@ -878,8 +880,8 @@ public class PropertyInputDialog extends BaseTransformDialog implements ITransfo
new ColumnInfo(
BaseMessages.getString( PKG, "PropertyInputDialog.FieldsTable.Repeat.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ),
};
@@ -1325,8 +1327,8 @@ public class PropertyInputDialog extends BaseTransformDialog implements ITransfo
String decim = field.getDecimalSymbol();
String trim = field.getTrimTypeDesc();
String rep =
- field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" );
+ field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO );
if ( name != null ) {
item.setText( 1, name );
@@ -1465,7 +1467,7 @@ public class PropertyInputDialog extends BaseTransformDialog implements ITransfo
field.setDecimalSymbol( item.getText( 8 ) );
field.setGroupSymbol( item.getText( 9 ) );
field.setTrimType( PropertyInputField.getTrimTypeByDesc( item.getText( 10 ) ) );
- field.setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 11 ) ) );
+ field.setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 11 ) ) );
//CHECKSTYLE:Indentation:OFF
in.getInputFields()[ i ] = field;
diff --git a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputMeta.java b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputMeta.java
index d8b22a7..4c79177 100644
--- a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputMeta.java
+++ b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputMeta.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.propertyinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.ICheckResult;
@@ -69,7 +71,7 @@ public class PropertyInputMeta extends BaseTransformMeta implements ITransformMe
private static final Class<?> PKG = PropertyInputMeta.class; // Needed by Translator
public static final String[] RequiredFilesDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] RequiredFilesCode = new String[] { "N", "Y" };
diff --git a/plugins/transforms/replacestring/src/main/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringDialog.java b/plugins/transforms/replacestring/src/main/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringDialog.java
index 634109f..39ea033 100644
--- a/plugins/transforms/replacestring/src/main/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringDialog.java
+++ b/plugins/transforms/replacestring/src/main/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.replacestring;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -159,7 +161,7 @@ public class ReplaceStringDialog extends BaseTransformDialog implements ITransfo
BaseMessages.getString( PKG, "ReplaceStringDialog.ColumnInfo.SetEmptyString" ),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ) } );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } );
ciKey[ 6 ] =
new ColumnInfo(
@@ -295,8 +297,8 @@ public class ReplaceStringDialog extends BaseTransformDialog implements ITransfo
}
item
.setText( 6, input.isSetEmptyString()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
if ( input.getFieldReplaceByString()[ i ] != null ) {
item.setText( 7, input.getFieldReplaceByString()[ i ] );
@@ -339,7 +341,7 @@ public class ReplaceStringDialog extends BaseTransformDialog implements ITransfo
inf.getReplaceByString()[ i ] = item.getText( 5 );
inf.isSetEmptyString()[ i ] =
- BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 6 ) );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 6 ) );
if ( inf.isSetEmptyString()[ i ] ) {
inf.getReplaceByString()[ i ] = "";
}
@@ -374,11 +376,11 @@ public class ReplaceStringDialog extends BaseTransformDialog implements ITransfo
ITableItemInsertListener listener = ( tableItem, v ) -> {
if ( v.getType() == IValueMeta.TYPE_STRING ) {
// Only process strings
- tableItem.setText( 3, BaseMessages.getString( PKG, "System.Combo.No" ) );
- tableItem.setText( 6, BaseMessages.getString( PKG, "System.Combo.No" ) );
- tableItem.setText( 8, BaseMessages.getString( PKG, "System.Combo.No" ) );
- tableItem.setText( 9, BaseMessages.getString( PKG, "System.Combo.No" ) );
- tableItem.setText( 10, BaseMessages.getString( PKG, "System.Combo.No" ) );
+ tableItem.setText( 3, BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
+ tableItem.setText( 6, BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
+ tableItem.setText( 8, BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
+ tableItem.setText( 9, BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
+ tableItem.setText( 10, BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
return true;
} else {
return false;
diff --git a/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java b/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java
index b0f2412..f7b79bb 100644
--- a/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java
+++ b/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java
@@ -22,6 +22,9 @@
package org.apache.hop.pipeline.transforms.rowgenerator;
+
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.value.ValueMetaFactory;
@@ -259,8 +262,8 @@ public class RowGeneratorDialog extends BaseTransformDialog implements ITransfor
new ColumnInfo(
BaseMessages.getString( PKG, "System.Column.SetEmptyString" ), ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } )
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } )
};
@@ -370,8 +373,8 @@ public class RowGeneratorDialog extends BaseTransformDialog implements ITransfor
item.setText( col++, Const.NVL( def, "" ) );
item
.setText( col++, input.isSetEmptyString()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
}
}
@@ -432,7 +435,7 @@ public class RowGeneratorDialog extends BaseTransformDialog implements ITransfor
meta.getDecimal()[ i ] = item.getText( 7 );
meta.getGroup()[ i ] = item.getText( 8 );
meta.isSetEmptyString()[ i ] =
- BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 10 ) );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 10 ) );
meta.getValue()[ i ] = meta.isSetEmptyString()[ i ] ? "" : item.getText( 9 );
meta.getFieldType()[ i ] = meta.isSetEmptyString()[ i ] ? "String" : item.getText( 2 );
diff --git a/plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectValuesDialog.java b/plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectValuesDialog.java
index 5380ab7..3c96245 100644
--- a/plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectValuesDialog.java
+++ b/plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectValuesDialog.java
@@ -22,6 +22,8 @@
package org.apache.hop.pipeline.transforms.selectvalues;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.SourceToTargetMapping;
@@ -377,14 +379,14 @@ public class SelectValuesDialog extends BaseTransformDialog implements ITransfor
new ColumnInfo(
BaseMessages.getString( PKG, "SelectValuesDialog.ColumnInfo.Storage.Label" ), ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ), } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), } ),
new ColumnInfo(
BaseMessages.getString( PKG, "SelectValuesDialog.ColumnInfo.Format" ),
ColumnInfo.COLUMN_TYPE_FORMAT, 3 ),
new ColumnInfo(
BaseMessages.getString( PKG, "SelectValuesDialog.ColumnInfo.DateLenient" ), ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ), } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), } ),
new ColumnInfo(
BaseMessages.getString( PKG, "SelectValuesDialog.ColumnInfo.DateFormatLocale" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, EnvUtil.getLocaleList() ),
@@ -394,7 +396,7 @@ public class SelectValuesDialog extends BaseTransformDialog implements ITransfor
new ColumnInfo(
BaseMessages.getString( PKG, "SelectValuesDialog.ColumnInfo.LenientStringToNumber" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ), } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), } ),
new ColumnInfo(
BaseMessages.getString( PKG, "SelectValuesDialog.ColumnInfo.Encoding" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, getCharsets(), false ),
@@ -590,20 +592,20 @@ public class SelectValuesDialog extends BaseTransformDialog implements ITransfor
item.setText( index++, change.getLength() < 0 ? "" : "" + change.getLength() );
item.setText( index++, change.getPrecision() < 0 ? "" : "" + change.getPrecision() );
item.setText( index++, change.getStorageType() == IValueMeta.STORAGE_TYPE_NORMAL ? BaseMessages
- .getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG, "System.Combo.No" ) );
+ .getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
item.setText( index++, Const.NVL( change.getConversionMask(), "" ) );
item
.setText( index++, change.isDateFormatLenient()
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
item
.setText( index++, change.getDateFormatLocale() == null ? "" : change.getDateFormatLocale().toString() );
item.setText( index++, change.getDateFormatTimeZone() == null ? "" : change
.getDateFormatTimeZone().toString() );
item
.setText( index++, change.isLenientStringToNumber()
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString(
- PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString(
+ PKG, SYSTEM_COMBO_NO ) );
item.setText( index++, Const.NVL( change.getEncoding(), "" ) );
item.setText( index++, Const.NVL( change.getDecimalSymbol(), "" ) );
item.setText( index++, Const.NVL( change.getGroupingSymbol(), "" ) );
@@ -699,18 +701,18 @@ public class SelectValuesDialog extends BaseTransformDialog implements ITransfor
if ( change.getPrecision() < -2 ) {
change.setPrecision( -2 );
}
- if ( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( index++ ) ) ) {
+ if ( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( index++ ) ) ) {
change.setStorageType( IValueMeta.STORAGE_TYPE_NORMAL );
}
change.setConversionMask( item.getText( index++ ) );
// If DateFormatLenient is anything but Yes (including blank) then it is false
change.setDateFormatLenient( item.getText( index++ ).equalsIgnoreCase(
- BaseMessages.getString( PKG, "System.Combo.Yes" ) ) ? true : false );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) ) ? true : false );
change.setDateFormatLocale( item.getText( index++ ) );
change.setDateFormatTimeZone( item.getText( index++ ) );
change.setLenientStringToNumber( item.getText( index++ ).equalsIgnoreCase(
- BaseMessages.getString( PKG, "System.Combo.Yes" ) ) ? true : false );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) ) ? true : false );
change.setEncoding( item.getText( index++ ) );
change.setDecimalSymbol( item.getText( index++ ) );
change.setGroupingSymbol( item.getText( index++ ) );
diff --git a/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstantDialog.java b/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstantDialog.java
index 2a65559..04cf8ee 100644
--- a/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstantDialog.java
+++ b/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstantDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.setvalueconstant;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -168,7 +170,7 @@ public class SetValueConstantDialog extends BaseTransformDialog implements ITran
BaseMessages.getString( PKG, "SetValueConstantDialog.Value.SetEmptyString" ),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ) } );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } );
wFields =
new TableView(
@@ -288,8 +290,8 @@ public class SetValueConstantDialog extends BaseTransformDialog implements ITran
if ( field.getReplaceMask() != null ) {
ti.setText( 3, field.getReplaceMask() );
}
- ti.setText( 4, field.isEmptyString() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
+ ti.setText( 4, field.isEmptyString() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
}
@@ -322,7 +324,7 @@ public class SetValueConstantDialog extends BaseTransformDialog implements ITran
TableItem ti = wFields.getNonEmpty( i );
SetValueConstantMeta.Field field = new SetValueConstantMeta.Field();
field.setFieldName( ti.getText( 1 ) );
- field.setEmptyString( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti.getText( 4 ) ) );
+ field.setEmptyString( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti.getText( 4 ) ) );
field.setReplaceValue( field.isEmptyString() ? "" : ti.getText( 2 ) );
field.setReplaceMask( field.isEmptyString() ? "" : ti.getText( 3 ) );
fields.add( field );
diff --git a/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRowsDialog.java b/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRowsDialog.java
index 848c7c1..0eecad6 100644
--- a/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRowsDialog.java
+++ b/plugins/transforms/sort/src/main/java/org/apache/hop/pipeline/transforms/sort/SortRowsDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.sort;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -282,18 +284,18 @@ public class SortRowsDialog extends BaseTransformDialog implements ITransformDia
new ColumnInfo(
BaseMessages.getString( PKG, "SortRowsDialog.Ascending.Column" ), ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } ),
new ColumnInfo(
BaseMessages.getString( PKG, "SortRowsDialog.CaseInsensitive.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } ),
new ColumnInfo(
BaseMessages.getString( PKG, "SortRowsDialog.CollatorDisabled.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } ),
new ColumnInfo(
BaseMessages.getString( PKG, "SortRowsDialog.CollatorStrength.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
@@ -304,8 +306,8 @@ public class SortRowsDialog extends BaseTransformDialog implements ITransformDia
new ColumnInfo(
BaseMessages.getString( PKG, "SortRowsDialog.PreSortedField.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) } ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } ) };
wFields =
new TableView(
@@ -425,16 +427,16 @@ public class SortRowsDialog extends BaseTransformDialog implements ITransformDia
TableItem ti = new TableItem( table, SWT.NONE );
ti.setText( 0, "" + ( i + 1 ) );
ti.setText( 1, input.getFieldName()[ i ] );
- ti.setText( 2, input.getAscending()[ i ] ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
+ ti.setText( 2, input.getAscending()[ i ] ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
ti.setText( 3, input.getCaseSensitive()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
ti.setText( 4, input.getCollatorEnabled()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
ti.setText( 5, input.getCollatorStrength()[ i ] == 0
? BaseMessages.getString( PKG, "System.Combo.Primary" ) : Integer.toString( input.getCollatorStrength()[ i ] ) );
ti.setText( 6, input.getPreSortedField()[ i ]
- ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG, "System.Combo.No" ) );
+ ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) );
}
wFields.setRowNums();
@@ -477,15 +479,15 @@ public class SortRowsDialog extends BaseTransformDialog implements ITransformDia
for ( int i = 0; i < nrFields; i++ ) {
TableItem ti = wFields.getNonEmpty( i );
input.getFieldName()[ i ] = ti.getText( 1 );
- input.getAscending()[ i ] = Utils.isEmpty( ti.getText( 2 ) ) || BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti.getText( 2 ) );
- input.getCaseSensitive()[ i ] = BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti.getText( 3 ) );
- input.getCollatorEnabled()[ i ] = BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti.getText( 4 ) );
+ input.getAscending()[ i ] = Utils.isEmpty( ti.getText( 2 ) ) || BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti.getText( 2 ) );
+ input.getCaseSensitive()[ i ] = BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti.getText( 3 ) );
+ input.getCollatorEnabled()[ i ] = BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti.getText( 4 ) );
if ( ti.getText( 5 ) == "" ) {
input.getCollatorStrength()[ i ] = Integer.parseInt( BaseMessages.getString( PKG, "System.Combo.Primary" ) );
} else {
input.getCollatorStrength()[ i ] = Integer.parseInt( ti.getText( 5 ) );
}
- input.getPreSortedField()[ i ] = BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti.getText( 6 ) );
+ input.getPreSortedField()[ i ] = BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti.getText( 6 ) );
}
dispose();
@@ -496,7 +498,7 @@ public class SortRowsDialog extends BaseTransformDialog implements ITransformDia
IRowMeta r = pipelineMeta.getPrevTransformFields( transformName );
if ( r != null ) {
ITableItemInsertListener insertListener = ( tableItem, v ) -> {
- tableItem.setText( 2, BaseMessages.getString( PKG, "System.Combo.Yes" ) );
+ tableItem.setText( 2, BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) );
return true;
};
BaseTransformDialog
diff --git a/plugins/transforms/sortedmerge/src/main/java/org/apache/hop/pipeline/transforms/sortedmerge/SortedMergeDialog.java b/plugins/transforms/sortedmerge/src/main/java/org/apache/hop/pipeline/transforms/sortedmerge/SortedMergeDialog.java
index e294686..6e83a24 100644
--- a/plugins/transforms/sortedmerge/src/main/java/org/apache/hop/pipeline/transforms/sortedmerge/SortedMergeDialog.java
+++ b/plugins/transforms/sortedmerge/src/main/java/org/apache/hop/pipeline/transforms/sortedmerge/SortedMergeDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.sortedmerge;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
@@ -139,7 +141,7 @@ public class SortedMergeDialog extends BaseTransformDialog implements ITransform
BaseMessages.getString( PKG, "SortedMergeDialog.Ascending.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {
- BaseMessages.getString( PKG, "System.Combo.Yes" ), BaseMessages.getString( PKG, "System.Combo.No" ) } );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ), BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) } );
wFields =
new TableView(
@@ -237,8 +239,8 @@ public class SortedMergeDialog extends BaseTransformDialog implements ITransform
TableItem ti = new TableItem( table, SWT.NONE );
ti.setText( 0, "" + ( i + 1 ) );
ti.setText( 1, input.getFieldName()[ i ] );
- ti.setText( 2, input.getAscending()[ i ] ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
+ ti.setText( 2, input.getAscending()[ i ] ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
}
wFields.setRowNums();
@@ -270,7 +272,7 @@ public class SortedMergeDialog extends BaseTransformDialog implements ITransform
TableItem ti = wFields.getNonEmpty( i );
input.getFieldName()[ i ] = ti.getText( 1 );
input.getAscending()[ i ] =
- BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( ti.getText( 2 ) );
+ BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( ti.getText( 2 ) );
}
// Show a warning (optional)
diff --git a/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsMeta.java b/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsMeta.java
index 2531996..fada2bd 100644
--- a/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsMeta.java
+++ b/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsMeta.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.stringoperations;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.Const;
import org.apache.hop.core.ICheckResult;
@@ -144,7 +146,7 @@ public class StringOperationsMeta extends BaseTransformMeta implements ITransfor
BaseMessages.getString( PKG, "StringOperationsMeta.LowerUpper.Upper" ) };
public static final String[] initCapDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] initCapCode = { "no", "yes" };
diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java
index 0d80e11..8e58bda 100644
--- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java
+++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.fileinput.text;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
@@ -88,8 +90,8 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
private static final Class<?> PKG = TextFileInputMeta.class; // Needed by Translator
private static final String[] YES_NO_COMBO =
- new String[] { BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG,
- "System.Combo.Yes" ) };
+ new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG,
+ SYSTEM_COMBO_YES ) };
private CTabFolder wTabFolder;
@@ -1841,8 +1843,8 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
ColumnInfo.COLUMN_TYPE_TEXT, false ), new ColumnInfo( BaseMessages.getString( PKG,
"TextFileInputDialog.TrimTypeColumn.Column" ), ColumnInfo.COLUMN_TYPE_CCOMBO, ValueMetaString.trimTypeDesc,
true ), new ColumnInfo( BaseMessages.getString( PKG, "TextFileInputDialog.RepeatColumn.Column" ),
- ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] { BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ) };
+ ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ) };
colinf[ 12 ].setToolTip( BaseMessages.getString( PKG, "TextFileInputDialog.RepeatColumn.Tooltip" ) );
@@ -2092,10 +2094,10 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
if ( filter.getFilterPosition() >= 0 ) {
item.setText( 2, "" + filter.getFilterPosition() );
}
- item.setText( 3, filter.isFilterLastLine() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
- item.setText( 4, filter.isFilterPositive() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
+ item.setText( 3, filter.isFilterLastLine() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
+ item.setText( 4, filter.isFilterPositive() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
}
// Date locale
@@ -2171,8 +2173,8 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
String ifNull = field.getIfNullValue();
String trim = field.getTrimTypeDesc();
String rep =
- field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG,
- "System.Combo.No" );
+ field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG,
+ SYSTEM_COMBO_NO );
if ( type != null ) {
item.setText( 2, type );
@@ -2326,7 +2328,7 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
field.setNullString( item.getText( 10 ) );
field.setIfNullValue( item.getText( 11 ) );
field.setTrimType( ValueMetaString.getTrimTypeByDesc( item.getText( 12 ) ) );
- field.setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 13 ) ) );
+ field.setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 13 ) ) );
// CHECKSTYLE:Indentation:OFF
meta.inputFields[ i ] = field;
@@ -2340,9 +2342,9 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
filter.setFilterString( item.getText( 1 ) );
filter.setFilterPosition( Const.toInt( item.getText( 2 ), -1 ) );
- filter.setFilterLastLine( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText(
+ filter.setFilterLastLine( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText(
3 ) ) );
- filter.setFilterPositive( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText(
+ filter.setFilterPositive( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText(
4 ) ) );
}
// Error handling fields...
@@ -2644,8 +2646,8 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
item.setText( 10, "" + field.getNullString() );
item.setText( 11, "" + field.getIfNullValue() );
item.setText( 12, "" + field.getTrimTypeDesc() );
- item.setText( 13, field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
+ item.setText( 13, field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
}
}
diff --git a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/addxml/AddXmlDialog.java b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/addxml/AddXmlDialog.java
index 620ab24..280a76c 100644
--- a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/addxml/AddXmlDialog.java
+++ b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/addxml/AddXmlDialog.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.xml.addxml;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -330,8 +332,8 @@ public class AddXmlDialog extends BaseTransformDialog implements ITransformDialo
false ),
new ColumnInfo( BaseMessages.getString( PKG, "AddXMLDialog.Null.Column" ), ColumnInfo.COLUMN_TYPE_TEXT, false ),
new ColumnInfo( BaseMessages.getString( PKG, "AddXMLDialog.Attribute.Column" ),
- ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] { BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ),
+ ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ),
new ColumnInfo( BaseMessages.getString( PKG, "AddXMLDialog.AttributeParentName.Column" ),
ColumnInfo.COLUMN_TYPE_TEXT, false ) };
wFields =
@@ -516,8 +518,8 @@ public class AddXmlDialog extends BaseTransformDialog implements ITransformDialo
if ( field.getNullString() != null ) {
item.setText( 10, field.getNullString() );
}
- item.setText( 11, field.isAttribute() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages
- .getString( PKG, "System.Combo.No" ) );
+ item.setText( 11, field.isAttribute() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages
+ .getString( PKG, SYSTEM_COMBO_NO ) );
if ( field.getAttributeParentName() != null ) {
item.setText( 12, field.getAttributeParentName() );
}
@@ -570,7 +572,7 @@ public class AddXmlDialog extends BaseTransformDialog implements ITransformDialo
field.setDecimalSymbol( item.getText( 8 ) );
field.setGroupingSymbol( item.getText( 9 ) );
field.setNullString( item.getText( 10 ) );
- field.setAttribute( BaseMessages.getString( PKG, "System.Combo.Yes" ).equals( item.getText( 11 ) ) );
+ field.setAttribute( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equals( item.getText( 11 ) ) );
field.setAttributeParentName( item.getText( 12 ) );
// CHECKSTYLE:Indentation:OFF
diff --git a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
index 2888455..71296eb 100644
--- a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
+++ b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
@@ -24,6 +24,8 @@
package org.apache.hop.pipeline.transforms.xml.getxmldata;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.RowMetaAndData;
@@ -970,8 +972,8 @@ public class GetXmlDataDialog extends BaseTransformDialog implements ITransformD
new ColumnInfo( BaseMessages.getString( PKG, "GetXMLDataDialog.FieldsTable.TrimType.Column" ),
ColumnInfo.COLUMN_TYPE_CCOMBO, GetXmlDataField.trimTypeDesc, true ),
new ColumnInfo( BaseMessages.getString( PKG, "GetXMLDataDialog.FieldsTable.Repeat.Column" ),
- ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] { BaseMessages.getString( PKG, "System.Combo.Yes" ),
- BaseMessages.getString( PKG, "System.Combo.No" ) }, true ),
+ ColumnInfo.COLUMN_TYPE_CCOMBO, new String[] { BaseMessages.getString( PKG, SYSTEM_COMBO_YES ),
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ) }, true ),
};
@@ -1531,8 +1533,8 @@ public class GetXmlDataDialog extends BaseTransformDialog implements ITransformD
String decim = field.getDecimalSymbol();
String trim = field.getTrimTypeDesc();
String rep =
- field.isRepeated() ? BaseMessages.getString( PKG, "System.Combo.Yes" ) : BaseMessages.getString( PKG,
- "System.Combo.No" );
+ field.isRepeated() ? BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) : BaseMessages.getString( PKG,
+ SYSTEM_COMBO_NO );
if ( name != null ) {
item.setText( 1, name );
@@ -1683,7 +1685,7 @@ public class GetXmlDataDialog extends BaseTransformDialog implements ITransformD
field.setDecimalSymbol( item.getText( 10 ) );
field.setGroupSymbol( item.getText( 11 ) );
field.setTrimType( GetXmlDataField.getTrimTypeByDesc( item.getText( 12 ) ) );
- field.setRepeated( BaseMessages.getString( PKG, "System.Combo.Yes" ).equalsIgnoreCase( item.getText( 13 ) ) );
+ field.setRepeated( BaseMessages.getString( PKG, SYSTEM_COMBO_YES ).equalsIgnoreCase( item.getText( 13 ) ) );
// CHECKSTYLE:Indentation:OFF
in.getInputFields()[ i ] = field;
diff --git a/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputMeta.java b/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputMeta.java
index 17053a8..fbf5ef7 100644
--- a/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputMeta.java
+++ b/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputMeta.java
@@ -23,6 +23,8 @@
package org.apache.hop.pipeline.transforms.yamlinput;
+import static org.apache.hop.i18n.ConstMessages.*;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.CheckResult;
import org.apache.hop.core.ICheckResult;
@@ -70,7 +72,7 @@ public class YamlInputMeta extends BaseTransformMeta implements ITransformMeta<Y
private static final String YES = "Y";
public static final String[] RequiredFilesDesc = new String[] {
- BaseMessages.getString( PKG, "System.Combo.No" ), BaseMessages.getString( PKG, "System.Combo.Yes" ) };
+ BaseMessages.getString( PKG, SYSTEM_COMBO_NO ), BaseMessages.getString( PKG, SYSTEM_COMBO_YES ) };
public static final String[] RequiredFilesCode = new String[] { "N", "Y" };
@Override