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/12/04 22:18:47 UTC
[incubator-hop] branch master updated: HOP-2260 : Metadata
perspective: code cleanup
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 1a46e86 HOP-2260 : Metadata perspective: code cleanup
new 84229a5 Merge pull request #434 from mattcasters/master
1a46e86 is described below
commit 1a46e86306a703181c52e0df120ec41468175d87
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Fri Dec 4 18:56:11 2020 +0100
HOP-2260 : Metadata perspective: code cleanup
---
.../hop/ui/core/database/DatabaseMetaEditor.java | 17 +++++------------
.../apache/hop/ui/core/metadata/MetadataEditor.java | 20 ++++++++++----------
.../config/PipelineRunConfigurationEditor.java | 4 ++--
3 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/database/DatabaseMetaEditor.java b/ui/src/main/java/org/apache/hop/ui/core/database/DatabaseMetaEditor.java
index 753ac26..bcc802a 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/database/DatabaseMetaEditor.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/database/DatabaseMetaEditor.java
@@ -68,16 +68,13 @@ import org.eclipse.swt.widgets.Text;
description = "This is the editor for database connection metadata"
)
/**
- * The dialog for DatabaseMeta
+ * The metadata editor for DatabaseMeta
* Don't move this class around as it's sync'ed with the DatabaseMeta package to find the dialog.
*
*/
public class DatabaseMetaEditor extends MetadataEditor<DatabaseMeta> {
private static final Class<?> PKG = DatabaseMetaEditor.class; // Needed by Translator
-// private DatabaseMeta databaseMeta;
-// private DatabaseMeta workingMeta;
-
private CTabFolder wTabFolder;
private Composite wGeneralComp;
@@ -112,16 +109,12 @@ public class DatabaseMetaEditor extends MetadataEditor<DatabaseMeta> {
private Map<Class<? extends IDatabase>, IDatabase> metaMap;
/**
- * @param parent The parent shell
- * @param metadataProvider metadataProvider
- * @param databaseMeta The object to edit
+ * @param hopGui The hop GUI
+ * @param manager The metadata
+ * @param databaseMeta The object to edit
*/
public DatabaseMetaEditor(HopGui hopGui, MetadataManager<DatabaseMeta> manager, DatabaseMeta databaseMeta ) {
- super(hopGui, manager, databaseMeta);
-
- //this.databaseMeta = databaseMeta;
- // this.workingMeta = new DatabaseMeta( databaseMeta );
- // this.workingMeta.initializeVariablesFrom( this.databaseMeta );
+ super(hopGui, manager, databaseMeta);
props = PropsUi.getInstance();
metaMap = populateMetaMap();
metaMap.put( databaseMeta.getIDatabase().getClass(), databaseMeta.getIDatabase() );
diff --git a/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataEditor.java b/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataEditor.java
index 7f588ea..623447e 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataEditor.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataEditor.java
@@ -47,16 +47,16 @@ public abstract class MetadataEditor<T extends IHopMetadata> extends MetadataFil
private static final Class<?> PKG = MetadataEditorDialog.class; // Needed by Translator
- private HopGui hopGui;
- private MetadataManager<T> manager;
- private T metadata;
-
- private String title;
- private String toolTip;
- private Image titleImage;
- private Image image;
- private boolean isChanged = false;
- private String originalName;
+ protected HopGui hopGui;
+ protected MetadataManager<T> manager;
+ protected T metadata;
+
+ protected String title;
+ protected String toolTip;
+ protected Image titleImage;
+ protected Image image;
+ protected boolean isChanged = false;
+ protected String originalName;
public MetadataEditor(HopGui hopGui, MetadataManager<T> manager, T metadata) {
this.hopGui = hopGui;
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java b/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java
index 8c15738..d1b0317 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java
@@ -85,8 +85,8 @@ public class PipelineRunConfigurationEditor extends MetadataEditor<PipelineRunCo
private Listener modifyListener = e -> setChanged();
/**
- * @param parent The parent shell
- * @param metadataProvider metadataProvider
+ * @param hopGui
+ * @param manager
* @param runConfiguration The object to edit
*/
public PipelineRunConfigurationEditor(HopGui hopGui, MetadataManager<PipelineRunConfiguration> manager, PipelineRunConfiguration runConfiguration ) {