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 2023/03/31 13:00:13 UTC
[hop] branch master updated: fix #2789 Code cleanup and Sonar issues
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 95b312f2ae fix #2789 Code cleanup and Sonar issues
new a0d7747f61 Merge pull request #2790 from gvdutra/HOP-2789
95b312f2ae is described below
commit 95b312f2ae5f0352d3f2a5c70a0251de374b8cf9
Author: Gabriel Dutra <gv...@gmail.com>
AuthorDate: Thu Mar 30 11:40:36 2023 -0700
fix #2789 Code cleanup and Sonar issues
---
.../hop/core/injection/bean/BeanInjector.java | 2 +-
.../dimensionlookup/DimensionLookupDialog.java | 3 ---
.../FieldsChangeSequenceDialog.java | 7 +++---
.../pipeline/transforms/formula/FormulaDialog.java | 4 +--
.../transforms/fuzzymatch/FuzzyMatchDialog.java | 29 ++++++++++------------
.../pipeline/transforms/nullif/NullIfDialog.java | 6 ++---
.../hop/pipeline/transforms/rest/RestDialog.java | 3 ++-
.../setvaluefield/SetValueFieldDialog.java | 6 ++---
.../hop/pipeline/transforms/sql/ExecSqlDialog.java | 21 ++--------------
.../transforms/stringcut/StringCutDialog.java | 6 ++---
.../stringoperations/StringOperationsDialog.java | 13 ++++------
.../dialog/GetPreviewTableProgressDialog.java | 10 +++-----
.../org/apache/hop/ui/core/widget/ColumnInfo.java | 3 +--
.../tabs/ConfigGeneralOptionsTab.java | 4 +--
.../dialog/PipelinePreviewProgressDialog.java | 13 +++-------
15 files changed, 44 insertions(+), 86 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/core/injection/bean/BeanInjector.java b/engine/src/main/java/org/apache/hop/core/injection/bean/BeanInjector.java
index aaa03a536e..c5e3202853 100644
--- a/engine/src/main/java/org/apache/hop/core/injection/bean/BeanInjector.java
+++ b/engine/src/main/java/org/apache/hop/core/injection/bean/BeanInjector.java
@@ -443,7 +443,7 @@ public class BeanInjector<Meta extends Object> {
return null;
}
// if constants are added without data we still want 1 row created
- if (existList.size() == 0) {
+ if (existList.isEmpty()) {
return extendList(s, obj, 1);
}
diff --git a/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupDialog.java b/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupDialog.java
index fb2181a223..74ecc66c17 100644
--- a/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupDialog.java
+++ b/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupDialog.java
@@ -18,10 +18,7 @@
package org.apache.hop.pipeline.transforms.dimensionlookup;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.hop.core.Const;
import org.apache.hop.core.DbCache;
diff --git a/plugins/transforms/fieldschangesequence/src/main/java/org/apache/hop/pipeline/transforms/fieldschangesequence/FieldsChangeSequenceDialog.java b/plugins/transforms/fieldschangesequence/src/main/java/org/apache/hop/pipeline/transforms/fieldschangesequence/FieldsChangeSequenceDialog.java
index 65eae520ee..07da8cc9ea 100644
--- a/plugins/transforms/fieldschangesequence/src/main/java/org/apache/hop/pipeline/transforms/fieldschangesequence/FieldsChangeSequenceDialog.java
+++ b/plugins/transforms/fieldschangesequence/src/main/java/org/apache/hop/pipeline/transforms/fieldschangesequence/FieldsChangeSequenceDialog.java
@@ -249,10 +249,9 @@ public class FieldsChangeSequenceDialog extends BaseTransformDialog implements I
if (!wFields.isDisposed()) {
for (int i = 0; i < wFields.table.getItemCount(); i++) {
TableItem it = wFields.table.getItem(i);
- if (!Utils.isEmpty(it.getText(1))) {
- if (!inputFields.contains(it.getText(1))) {
- it.setBackground(GuiResource.getInstance().getColorRed());
- }
+ if (!Utils.isEmpty(it.getText(1))
+ && (!inputFields.contains(it.getText(1)))) {
+ it.setBackground(GuiResource.getInstance().getColorRed());
}
}
}
diff --git a/plugins/transforms/formula/src/main/java/org/apache/hop/pipeline/transforms/formula/FormulaDialog.java b/plugins/transforms/formula/src/main/java/org/apache/hop/pipeline/transforms/formula/FormulaDialog.java
index af8147e65b..dc2567b1b5 100644
--- a/plugins/transforms/formula/src/main/java/org/apache/hop/pipeline/transforms/formula/FormulaDialog.java
+++ b/plugins/transforms/formula/src/main/java/org/apache/hop/pipeline/transforms/formula/FormulaDialog.java
@@ -58,7 +58,6 @@ public class FormulaDialog extends BaseTransformDialog implements ITransformDial
private static final Class<?> PKG = FormulaDialog.class; // For Translator
private TableView wFields;
- private FormData fdFields;
private FormulaMeta currentMeta;
private FormulaMeta originalMeta;
@@ -79,6 +78,7 @@ public class FormulaDialog extends BaseTransformDialog implements ITransformDial
@Override
public String open() {
+ FormData fdFields;
Shell parent = getParent();
Display display = parent.getDisplay();
@@ -231,7 +231,7 @@ public class FormulaDialog extends BaseTransformDialog implements ITransformDial
wFields.addModifyListener(
arg0 ->
// Now set the combo's
- shell.getDisplay().asyncExec(() -> setComboBoxes()));
+ shell.getDisplay().asyncExec(this::setComboBoxes));
// Some buttons
wOk = new Button(shell, SWT.PUSH);
diff --git a/plugins/transforms/fuzzymatch/src/main/java/org/apache/hop/pipeline/transforms/fuzzymatch/FuzzyMatchDialog.java b/plugins/transforms/fuzzymatch/src/main/java/org/apache/hop/pipeline/transforms/fuzzymatch/FuzzyMatchDialog.java
index 7c850e1fd4..6ee4c88170 100644
--- a/plugins/transforms/fuzzymatch/src/main/java/org/apache/hop/pipeline/transforms/fuzzymatch/FuzzyMatchDialog.java
+++ b/plugins/transforms/fuzzymatch/src/main/java/org/apache/hop/pipeline/transforms/fuzzymatch/FuzzyMatchDialog.java
@@ -17,11 +17,21 @@
package org.apache.hop.pipeline.transforms.fuzzymatch;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.DAMERAU_LEVENSHTEIN;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.DOUBLE_METAPHONE;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.JARO;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.JARO_WINKLER;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.LEVENSHTEIN;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.METAPHONE;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.NEEDLEMAN_WUNSH;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.PAIR_SIMILARITY;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.REFINED_SOUNDEX;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.SOUNDEX;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.getDescriptions;
+import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.lookupDescription;
+
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
@@ -59,19 +69,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.DAMERAU_LEVENSHTEIN;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.DOUBLE_METAPHONE;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.JARO;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.JARO_WINKLER;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.LEVENSHTEIN;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.METAPHONE;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.NEEDLEMAN_WUNSH;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.PAIR_SIMILARITY;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.REFINED_SOUNDEX;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.SOUNDEX;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.getDescriptions;
-import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.lookupDescription;
-
public class FuzzyMatchDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = FuzzyMatchMeta.class; // For Translator
diff --git a/plugins/transforms/nullif/src/main/java/org/apache/hop/pipeline/transforms/nullif/NullIfDialog.java b/plugins/transforms/nullif/src/main/java/org/apache/hop/pipeline/transforms/nullif/NullIfDialog.java
index bb9188fdee..dd777811ab 100644
--- a/plugins/transforms/nullif/src/main/java/org/apache/hop/pipeline/transforms/nullif/NullIfDialog.java
+++ b/plugins/transforms/nullif/src/main/java/org/apache/hop/pipeline/transforms/nullif/NullIfDialog.java
@@ -17,7 +17,8 @@
package org.apache.hop.pipeline.transforms.nullif;
-import org.apache.hop.core.Const;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.util.Utils;
@@ -45,9 +46,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.util.ArrayList;
-import java.util.List;
-
public class NullIfDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = NullIfMeta.class; // For Translator
diff --git a/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java b/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
index 47283569f9..094c70b41a 100644
--- a/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
+++ b/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
@@ -18,6 +18,7 @@
package org.apache.hop.pipeline.transforms.rest;
import org.apache.hop.core.Const;
+import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.util.Utils;
@@ -164,7 +165,7 @@ public class RestDialog extends BaseTransformDialog implements ITransformDialog
setupTransformName(lsMod, middle, margin);
CTabFolder wTabFolder = new CTabFolder(shell, SWT.BORDER);
- PropsUi.setLook(wTabFolder, PropsUi.WIDGET_STYLE_TAB);
+ PropsUi.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
// ////////////////////////
// START OF GENERAL TAB ///
diff --git a/plugins/transforms/setvaluefield/src/main/java/org/apache/hop/pipeline/transforms/setvaluefield/SetValueFieldDialog.java b/plugins/transforms/setvaluefield/src/main/java/org/apache/hop/pipeline/transforms/setvaluefield/SetValueFieldDialog.java
index 8cb9829686..5df4f5de37 100644
--- a/plugins/transforms/setvaluefield/src/main/java/org/apache/hop/pipeline/transforms/setvaluefield/SetValueFieldDialog.java
+++ b/plugins/transforms/setvaluefield/src/main/java/org/apache/hop/pipeline/transforms/setvaluefield/SetValueFieldDialog.java
@@ -17,7 +17,8 @@
package org.apache.hop.pipeline.transforms.setvaluefield;
-import org.apache.hop.core.Const;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.util.Utils;
@@ -45,9 +46,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.util.ArrayList;
-import java.util.List;
-
public class SetValueFieldDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = SetValueFieldMeta.class; // For Translator
diff --git a/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlDialog.java b/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlDialog.java
index 4dd05ac2f3..9f6cfef89a 100644
--- a/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlDialog.java
+++ b/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlDialog.java
@@ -17,7 +17,8 @@
package org.apache.hop.pipeline.transforms.sql;
-import org.apache.hop.core.Const;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hop.core.Props;
import org.apache.hop.core.database.DatabaseMeta;
import org.apache.hop.core.exception.HopException;
@@ -62,9 +63,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.util.ArrayList;
-import java.util.List;
-
public class ExecSqlDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = ExecSqlMeta.class; // For Translator
@@ -628,21 +626,6 @@ public class ExecSqlDialog extends BaseTransformDialog implements ITransformDial
wTransformName.setFocus();
}
- private void checkCancel(ShellEvent e) {
- if (changedInDialog) {
- int save = HopGuiWorkflowGraph.showChangedWarning(shell, wTransformName.getText());
- if (save == SWT.CANCEL) {
- e.doit = false;
- } else if (save == SWT.YES) {
- ok();
- } else {
- cancel();
- }
- } else {
- cancel();
- }
- }
-
private void cancel() {
transformName = null;
input.setChanged(changed);
diff --git a/plugins/transforms/stringcut/src/main/java/org/apache/hop/pipeline/transforms/stringcut/StringCutDialog.java b/plugins/transforms/stringcut/src/main/java/org/apache/hop/pipeline/transforms/stringcut/StringCutDialog.java
index ccc6a18834..37ac94bd52 100644
--- a/plugins/transforms/stringcut/src/main/java/org/apache/hop/pipeline/transforms/stringcut/StringCutDialog.java
+++ b/plugins/transforms/stringcut/src/main/java/org/apache/hop/pipeline/transforms/stringcut/StringCutDialog.java
@@ -17,7 +17,8 @@
package org.apache.hop.pipeline.transforms.stringcut;
-import org.apache.hop.core.Const;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
@@ -47,9 +48,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.util.ArrayList;
-import java.util.List;
-
public class StringCutDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = StringCutMeta.class; // For Translator
diff --git a/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsDialog.java b/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsDialog.java
index 43d3eceace..49481d9831 100644
--- a/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsDialog.java
+++ b/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperationsDialog.java
@@ -17,7 +17,8 @@
package org.apache.hop.pipeline.transforms.stringoperations;
-import org.apache.hop.core.Const;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
@@ -49,9 +50,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.util.ArrayList;
-import java.util.List;
-
public class StringOperationsDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = StringOperationsMeta.class; // For Translator
@@ -251,10 +249,9 @@ public class StringOperationsDialog extends BaseTransformDialog implements ITran
if (!wFields.isDisposed()) {
for (int i = 0; i < wFields.table.getItemCount(); i++) {
TableItem it = wFields.table.getItem(i);
- if (!Utils.isEmpty(it.getText(1))) {
- if (!inputFields.contains(it.getText(1))) {
- it.setBackground(GuiResource.getInstance().getColorRed());
- }
+ if (!Utils.isEmpty(it.getText(1))
+ && (!inputFields.contains(it.getText(1)))) {
+ it.setBackground(GuiResource.getInstance().getColorRed());
}
}
}
diff --git a/ui/src/main/java/org/apache/hop/ui/core/database/dialog/GetPreviewTableProgressDialog.java b/ui/src/main/java/org/apache/hop/ui/core/database/dialog/GetPreviewTableProgressDialog.java
index aa247e362c..43f3011331 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/database/dialog/GetPreviewTableProgressDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/database/dialog/GetPreviewTableProgressDialog.java
@@ -17,6 +17,8 @@
package org.apache.hop.ui.core.database.dialog;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
import org.apache.hop.core.IProgressMonitor;
import org.apache.hop.core.IRunnableWithProgress;
import org.apache.hop.core.ProgressMonitorAdapter;
@@ -35,9 +37,6 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.widgets.Shell;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
/**
* Takes care of displaying a dialog that will handle the wait while we're getting rows for a
* certain SQL query on a database.
@@ -119,10 +118,7 @@ public class GetPreviewTableProgressDialog {
new Thread(run).start();
pmd.run(true, op);
- } catch (InvocationTargetException e) {
- showErrorDialog(e);
- return null;
- } catch (InterruptedException e) {
+ } catch (InvocationTargetException | InterruptedException e) {
showErrorDialog(e);
return null;
}
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/ColumnInfo.java b/ui/src/main/java/org/apache/hop/ui/core/widget/ColumnInfo.java
index 1bcfbc576d..5da756ac03 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/ColumnInfo.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/ColumnInfo.java
@@ -221,8 +221,7 @@ public class ColumnInfo {
}
public String[] getComboValues() {
- String[] retval = comboValueSupplier.get();
- return retval;
+ return comboValueSupplier.get();
}
/** @return the numeric */
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
index c10069903c..6097e0649a 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
@@ -337,8 +337,8 @@ public class ConfigGeneralOptionsTab {
fdSortFieldByName.right = new FormAttachment(100, -margin);
fdSortFieldByName.top = new FormAttachment(wlSortFieldByName, 0, SWT.CENTER);
wSortFieldByName.setLayoutData(fdSortFieldByName);
- wSortFieldByName.setSelection(props.isSortFieldByName());
- wSortFieldByName.addListener(SWT.Selection, e -> saveValues(e));
+ wSortFieldByName.setSelection(props.isSortFieldByName());
+ wSortFieldByName.addListener(SWT.Selection, this::saveValues);
lastControl = wSortFieldByName;
// Tooltips
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelinePreviewProgressDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelinePreviewProgressDialog.java
index c9aa00fd85..18c7297601 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelinePreviewProgressDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelinePreviewProgressDialog.java
@@ -17,9 +17,11 @@
package org.apache.hop.ui.pipeline.dialog;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hop.core.IProgressMonitor;
import org.apache.hop.core.IRunnableWithProgress;
-import org.apache.hop.core.exception.HopDatabaseException;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.logging.HopLogStore;
import org.apache.hop.core.row.IRowMeta;
@@ -39,10 +41,6 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.widgets.Shell;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
/** Takes care of displaying a dialog that will handle the wait while previewing a pipeline... */
public class PipelinePreviewProgressDialog {
private static final Class<?> PKG = PipelineDialog.class; // For Translator
@@ -252,11 +250,8 @@ public class PipelinePreviewProgressDialog {
int worked = pct - previousPct;
- if(progressMonitor != null){
- if (worked > 0) {
+ if (progressMonitor != null && (worked > 0)) {
progressMonitor.worked(worked);
- }
-
}
previousPct = pct;