HOP-2283 Rename annotation HopMetadata.iconImage > image

apache · Dec 11, 2020 · 92388ab · 92388ab
1 parent e8eedbd
commit 92388ab
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 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
@@ -64,7 +64,7 @@
     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
@@ -43,5 +43,5 @@
 
   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
@@ -78,7 +78,7 @@ protected String extractName( HopMetadata annotation ) {
 
   @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
@@ -37,7 +37,7 @@
   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
@@ -32,7 +32,7 @@
   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
@@ -96,7 +96,7 @@
   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
@@ -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 @@
   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
@@ -36,7 +36,7 @@
   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
@@ -29,7 +29,7 @@
     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
@@ -41,7 +41,7 @@
   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
@@ -49,7 +49,7 @@
   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
@@ -76,7 +76,7 @@ public MetadataEditor(HopGui hopGui, MetadataManager<T> manager, T metadata) {
     this.setTitleImage(
         GuiResource.getInstance()
             .getImage(
-                annotation.iconImage(),
+                annotation.image(),
                 managedClass.getClassLoader(),
                 ConstUi.SMALL_ICON_SIZE,
                 ConstUi.SMALL_ICON_SIZE));
@@ -86,7 +86,7 @@ public MetadataEditor(HopGui hopGui, MetadataManager<T> manager, T metadata) {
         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
@@ -89,7 +89,7 @@ public boolean editMetadata() {
       //
       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 boolean deleteMetadata() {
       //
       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
@@ -124,7 +124,7 @@ public MetaSelectionLine( IVariables variables, IHopMetadataProvider metadataPro
     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
@@ -69,7 +69,7 @@ public MetadataContextHandler( HopGui hopGui, IHopMetadataProvider metadataProvi
       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 MetadataContextHandler( HopGui hopGui, IHopMetadataProvider metadataProvi
       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 MetadataContextHandler( HopGui hopGui, IHopMetadataProvider metadataProvi
       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
@@ -413,7 +413,7 @@ public void refreshTree() {
             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
@@ -710,7 +710,7 @@ public void refresh() {
         Image image =
             GuiResource.getInstance()
                 .getImage(
-                    annotation.iconImage(),
+                    annotation.image(),
                     metadataClass.getClassLoader(),
                     ConstUi.SMALL_ICON_SIZE,
                     ConstUi.SMALL_ICON_SIZE);