You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2020/12/14 09:09:28 UTC
[incubator-hop] branch master updated: HOP-2283 Rename annotation
HopMetadata.iconImage > image
This is an automated email from the ASF dual-hosted git repository.
mcasters 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 92388ab HOP-2283 Rename annotation HopMetadata.iconImage > image
new db9b484 Merge pull request #460 from nadment/HOP-2283
92388ab is described below
commit 92388abc14f2966a344e5ccc3ceeba2eb7f7431a
Author: nadment <na...@gmail.com>
AuthorDate: Fri Dec 11 17:55:03 2020 +0100
HOP-2283 Rename annotation HopMetadata.iconImage > image
---
core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java | 2 +-
core/src/main/java/org/apache/hop/metadata/api/HopMetadata.java | 2 +-
.../java/org/apache/hop/metadata/plugin/MetadataPluginType.java | 2 +-
engine/src/main/java/org/apache/hop/partition/PartitionSchema.java | 2 +-
.../org/apache/hop/pipeline/config/PipelineRunConfiguration.java | 2 +-
engine/src/main/java/org/apache/hop/server/HopServer.java | 2 +-
.../org/apache/hop/workflow/config/WorkflowRunConfiguration.java | 4 +---
.../src/main/java/org/apache/hop/beam/metadata/FileDefinition.java | 2 +-
.../java/org/apache/hop/git/model/repository/GitRepository.java | 2 +-
.../misc/testing/src/main/java/org/apache/hop/testing/DataSet.java | 2 +-
.../src/main/java/org/apache/hop/testing/PipelineUnitTest.java | 2 +-
.../main/java/org/apache/hop/ui/core/metadata/MetadataEditor.java | 4 ++--
.../main/java/org/apache/hop/ui/core/metadata/MetadataManager.java | 4 ++--
.../main/java/org/apache/hop/ui/core/widget/MetaSelectionLine.java | 2 +-
.../hop/ui/hopgui/context/metadata/MetadataContextHandler.java | 6 +++---
.../org/apache/hop/ui/hopgui/dialog/MetadataExplorerDialog.java | 2 +-
.../hop/ui/hopgui/perspective/metadata/MetadataPerspective.java | 2 +-
17 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java b/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
index b54c8e9..ca16200 100644
--- a/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
+++ b/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
@@ -64,7 +64,7 @@ import java.util.concurrent.Future;
key = "rdbms",
name = "Relational Database Connection",
description = "This contains all the metadata needed to connect to a relational database",
- iconImage = "ui/images/CNC.svg")
+ image = "ui/images/CNC.svg")
public class DatabaseMeta extends HopMetadataBase implements Cloneable, IHopMetadata {
private static final Class<?> PKG = Database.class; // Needed by Translator
diff --git a/core/src/main/java/org/apache/hop/metadata/api/HopMetadata.java b/core/src/main/java/org/apache/hop/metadata/api/HopMetadata.java
index 180eddc..99f8ac9 100644
--- a/core/src/main/java/org/apache/hop/metadata/api/HopMetadata.java
+++ b/core/src/main/java/org/apache/hop/metadata/api/HopMetadata.java
@@ -43,5 +43,5 @@ public @interface HopMetadata {
String description() default "";
- String iconImage() default "ui/images/folder.svg";
+ String image() default "ui/images/folder.svg";
}
diff --git a/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java b/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
index 7316000..6730ceb 100644
--- a/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
+++ b/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
@@ -78,7 +78,7 @@ public class MetadataPluginType extends BasePluginType<HopMetadata> implements I
@Override
protected String extractImageFile( HopMetadata annotation ) {
- return annotation.iconImage();
+ return annotation.image();
}
@Override
diff --git a/engine/src/main/java/org/apache/hop/partition/PartitionSchema.java b/engine/src/main/java/org/apache/hop/partition/PartitionSchema.java
index b0bd99a..87872ea 100644
--- a/engine/src/main/java/org/apache/hop/partition/PartitionSchema.java
+++ b/engine/src/main/java/org/apache/hop/partition/PartitionSchema.java
@@ -37,7 +37,7 @@ import java.util.List;
key = "partition",
name = "Partition Schema",
description = "Describes a partition schema",
- iconImage = "ui/images/partition_schema.svg"
+ image = "ui/images/partition_schema.svg"
)
public class PartitionSchema extends HopMetadataBase implements Cloneable, IHopMetadata {
diff --git a/engine/src/main/java/org/apache/hop/pipeline/config/PipelineRunConfiguration.java b/engine/src/main/java/org/apache/hop/pipeline/config/PipelineRunConfiguration.java
index 82314a1..d0b4ffa 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/config/PipelineRunConfiguration.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/config/PipelineRunConfiguration.java
@@ -32,7 +32,7 @@ import java.util.List;
key = "pipeline-run-configuration",
name = "Pipeline Run Configuration",
description = "Describes how and with which engine a pipeline is to be executed",
- iconImage = "ui/images/run.svg"
+ image = "ui/images/run.svg"
)
public class PipelineRunConfiguration extends HopMetadataBase implements Cloneable, IHopMetadata {
diff --git a/engine/src/main/java/org/apache/hop/server/HopServer.java b/engine/src/main/java/org/apache/hop/server/HopServer.java
index f77b94b..b9c5321 100644
--- a/engine/src/main/java/org/apache/hop/server/HopServer.java
+++ b/engine/src/main/java/org/apache/hop/server/HopServer.java
@@ -96,7 +96,7 @@ import java.util.Random;
key = "server",
name = "Hop Server",
description = "Defines a Hop Hop Server",
- iconImage = "ui/images/server.svg"
+ image = "ui/images/server.svg"
)
public class HopServer extends HopMetadataBase implements Cloneable, IXml, IHopMetadata {
private static final Class<?> PKG = HopServer.class; // Needed by Translator
diff --git a/engine/src/main/java/org/apache/hop/workflow/config/WorkflowRunConfiguration.java b/engine/src/main/java/org/apache/hop/workflow/config/WorkflowRunConfiguration.java
index 145d314..f8b4dbf 100644
--- a/engine/src/main/java/org/apache/hop/workflow/config/WorkflowRunConfiguration.java
+++ b/engine/src/main/java/org/apache/hop/workflow/config/WorkflowRunConfiguration.java
@@ -18,8 +18,6 @@
package org.apache.hop.workflow.config;
-import org.apache.hop.core.variables.IVariables;
-import org.apache.hop.core.variables.Variables;
import org.apache.hop.metadata.api.HopMetadata;
import org.apache.hop.metadata.api.HopMetadataBase;
import org.apache.hop.metadata.api.HopMetadataProperty;
@@ -29,7 +27,7 @@ import org.apache.hop.metadata.api.IHopMetadata;
key = "workflow-run-configuration",
name = "Workflow Run Configuration",
description = "Describes how to execute a workflow",
- iconImage = "ui/images/run.svg"
+ image = "ui/images/run.svg"
)
public class WorkflowRunConfiguration extends HopMetadataBase implements Cloneable, IHopMetadata {
diff --git a/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinition.java b/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinition.java
index 362fe24..a761887 100644
--- a/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinition.java
+++ b/plugins/engines/beam/src/main/java/org/apache/hop/beam/metadata/FileDefinition.java
@@ -36,7 +36,7 @@ import java.util.List;
key = "file-definition",
name = "Beam File Definition",
description = "Describes a file layout in a Beam pipeline",
- iconImage = "ui/images/folder.svg"
+ image = "ui/images/folder.svg"
)
public class FileDefinition extends HopMetadataBase implements Serializable, IHopMetadata {
diff --git a/plugins/misc/git/src/main/java/org/apache/hop/git/model/repository/GitRepository.java b/plugins/misc/git/src/main/java/org/apache/hop/git/model/repository/GitRepository.java
index ec2bd2c..76c0bb9 100644
--- a/plugins/misc/git/src/main/java/org/apache/hop/git/model/repository/GitRepository.java
+++ b/plugins/misc/git/src/main/java/org/apache/hop/git/model/repository/GitRepository.java
@@ -29,7 +29,7 @@ import org.apache.hop.metadata.api.IHopMetadata;
key = "git",
name = "Git Repository",
description = "This defines a Git repository",
- iconImage = "git_icon.svg")
+ image = "git_icon.svg")
public class GitRepository extends HopMetadataBase implements Cloneable, IHopMetadata {
public static final String EXTENSION_POINT_ID_GIT_REPOSITORY_CREATION = "GitRepositoryCreate";
diff --git a/plugins/misc/testing/src/main/java/org/apache/hop/testing/DataSet.java b/plugins/misc/testing/src/main/java/org/apache/hop/testing/DataSet.java
index cb88848..5ec63e4 100644
--- a/plugins/misc/testing/src/main/java/org/apache/hop/testing/DataSet.java
+++ b/plugins/misc/testing/src/main/java/org/apache/hop/testing/DataSet.java
@@ -41,7 +41,7 @@ import java.util.List;
key = "dataset",
name = "Data Set",
description = "This defines a data set, a static pre-defined collection of rows",
- iconImage = "dataset.svg"
+ image = "dataset.svg"
)
public class DataSet extends HopMetadataBase implements Cloneable, IHopMetadata {
diff --git a/plugins/misc/testing/src/main/java/org/apache/hop/testing/PipelineUnitTest.java b/plugins/misc/testing/src/main/java/org/apache/hop/testing/PipelineUnitTest.java
index d20e91c..356f48a 100644
--- a/plugins/misc/testing/src/main/java/org/apache/hop/testing/PipelineUnitTest.java
+++ b/plugins/misc/testing/src/main/java/org/apache/hop/testing/PipelineUnitTest.java
@@ -49,7 +49,7 @@ import java.util.List;
key = "unit-test",
name = "Pipeline Unit Test",
description = "This describes a test for a pipeline with alternative data sets as input from certain transform and testing output against golden data",
- iconImage = "Test_tube_icon.svg"
+ image = "Test_tube_icon.svg"
)
public class PipelineUnitTest extends HopMetadataBase implements Cloneable, IHopMetadata {
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 f495b29..e404a68 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
@@ -76,7 +76,7 @@ public abstract class MetadataEditor<T extends IHopMetadata> extends MetadataFil
this.setTitleImage(
GuiResource.getInstance()
.getImage(
- annotation.iconImage(),
+ annotation.image(),
managedClass.getClassLoader(),
ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE));
@@ -86,7 +86,7 @@ public abstract class MetadataEditor<T extends IHopMetadata> extends MetadataFil
SwtSvgImageUtil.getImage(
hopGui.getDisplay(),
managedClass.getClassLoader(),
- annotation.iconImage(),
+ annotation.image(),
ConstUi.LARGE_ICON_SIZE,
ConstUi.LARGE_ICON_SIZE));
}
diff --git a/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataManager.java b/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataManager.java
index 82c277d..a2cfe27 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataManager.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataManager.java
@@ -89,7 +89,7 @@ public class MetadataManager<T extends IHopMetadata> {
//
List<GuiAction> actions = new ArrayList<>();
for ( final String name : names ) {
- GuiAction action = new GuiAction( name, GuiActionType.Modify, name, name + " : " + hopMetadata.description(), hopMetadata.iconImage(),
+ GuiAction action = new GuiAction( name, GuiActionType.Modify, name, name + " : " + hopMetadata.description(), hopMetadata.image(),
( shiftAction, controlAction, t ) -> editMetadata( name ) );
action.setClassLoader( getClassLoader() );
actions.add( action );
@@ -118,7 +118,7 @@ public class MetadataManager<T extends IHopMetadata> {
//
List<GuiAction> actions = new ArrayList<>();
for ( final String name : names ) {
- GuiAction action = new GuiAction( name, GuiActionType.Delete, name, name + " : " + hopMetadata.description(), hopMetadata.iconImage(),
+ GuiAction action = new GuiAction( name, GuiActionType.Delete, name, name + " : " + hopMetadata.description(), hopMetadata.image(),
( shiftAction, controlAction, t ) -> deleteMetadata( name ) );
action.setClassLoader( getClassLoader() );
actions.add( action );
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/MetaSelectionLine.java b/ui/src/main/java/org/apache/hop/ui/core/widget/MetaSelectionLine.java
index 5c7cf46..254ef80 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/MetaSelectionLine.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/MetaSelectionLine.java
@@ -124,7 +124,7 @@ public class MetaSelectionLine<T extends IHopMetadata> extends Composite {
wLabel.requestLayout(); // Avoid GTK error in log
HopMetadata hopMetadata = HopMetadataUtil.getHopMetadataAnnotation( managedClass );
- Image image = SwtSvgImageUtil.getImage( getDisplay(), managedClass.getClassLoader(), hopMetadata.iconImage(), ConstUi.SMALL_ICON_SIZE, ConstUi.SMALL_ICON_SIZE );
+ Image image = SwtSvgImageUtil.getImage( getDisplay(), managedClass.getClassLoader(), hopMetadata.image(), ConstUi.SMALL_ICON_SIZE, ConstUi.SMALL_ICON_SIZE );
final Menu menu = new Menu (getShell(), SWT.POP_UP);
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/context/metadata/MetadataContextHandler.java b/ui/src/main/java/org/apache/hop/ui/hopgui/context/metadata/MetadataContextHandler.java
index 22da883..ad1aa01 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/context/metadata/MetadataContextHandler.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/context/metadata/MetadataContextHandler.java
@@ -69,7 +69,7 @@ public class MetadataContextHandler implements IGuiContextHandler {
GuiActionType.Create,
hopMetadata.name(),
"Creates a new " + hopMetadata.name() + " : " + hopMetadata.description(),
- hopMetadata.iconImage(),
+ hopMetadata.image(),
( shiftClicked, controlClicked, parameters ) -> metadataManager.newMetadataWithEditor() );
newAction.setClassLoader( metadataObjectClass.getClassLoader() );
newAction.setCategory( "Metadata" );
@@ -81,7 +81,7 @@ public class MetadataContextHandler implements IGuiContextHandler {
GuiActionType.Modify,
hopMetadata.name(),
"Edits a " + hopMetadata.name() + " : " + hopMetadata.description(),
- hopMetadata.iconImage(),
+ hopMetadata.image(),
( shiftClicked, controlClicked, parameters ) -> metadataManager.editMetadata() );
editAction.setClassLoader( metadataObjectClass.getClassLoader() );
editAction.setCategory( "Metadata" );
@@ -93,7 +93,7 @@ public class MetadataContextHandler implements IGuiContextHandler {
GuiActionType.Delete,
hopMetadata.name(),
"After confirmation this deletes a " + hopMetadata.name() + " : " + hopMetadata.description(),
- hopMetadata.iconImage(),
+ hopMetadata.image(),
( shiftClicked, controlClicked, parameters ) -> metadataManager.deleteMetadata() );
deleteAction.setClassLoader( metadataObjectClass.getClassLoader() );
deleteAction.setCategory( "Metadata" );
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/dialog/MetadataExplorerDialog.java b/ui/src/main/java/org/apache/hop/ui/hopgui/dialog/MetadataExplorerDialog.java
index dd7b384..231f0c2 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/dialog/MetadataExplorerDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/dialog/MetadataExplorerDialog.java
@@ -413,7 +413,7 @@ public class MetadataExplorerDialog {
SwtSvgImageUtil.getImage(
shell.getDisplay(),
metadataClass.getClassLoader(),
- hopMetadata.iconImage(),
+ hopMetadata.image(),
ConstUi.ICON_SIZE,
ConstUi.ICON_SIZE);
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java
index 502bd3f..dc1b67b 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java
@@ -710,7 +710,7 @@ public class MetadataPerspective implements IHopPerspective {
Image image =
GuiResource.getInstance()
.getImage(
- annotation.iconImage(),
+ annotation.image(),
metadataClass.getClassLoader(),
ConstUi.SMALL_ICON_SIZE,
ConstUi.SMALL_ICON_SIZE);