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/14 07:26:21 UTC

[incubator-hop] branch master updated: HOP-2294 Move the plugin image to its folder

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 052ab0f  HOP-2294 Move the plugin image to its folder
     new 4a7f466  Merge pull request #463 from nadment/HOP-2294
052ab0f is described below

commit 052ab0f1542ecb58e286a500d9b46a137096b466
Author: nadment <na...@gmail.com>
AuthorDate: Sat Dec 12 15:40:14 2020 +0100

    HOP-2294 Move the plugin image to its folder
---
 .../hop/workflow/actions/repeat/EndRepeat.java     |  2 +-
 .../apache/hop/workflow/actions/repeat/Repeat.java |  3 +-
 .../repeat/src/main/resources/endrepeat.svg        |  7 ++
 .../actions/repeat/src/main/resources/repeat.svg   | 79 ++++++++++++++++++++++
 .../mongodboutput/MongoDbOutputMeta.java           |  2 +-
 .../mongodb/src/main/resources}/mongodb-input.svg  |  0
 .../mongodb/src/main/resources/mongodb-output.svg  |  0
 7 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeat.java b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeat.java
index 442299e..226951b 100644
--- a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeat.java
+++ b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeat.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
     name = "End Repeat",
     description = "End repeated execution of a workflow or a transformation",
     categoryDescription = "General",
-    image = "ui/images/SUC.svg")
+    image = "endrepeat.svg")
 public class EndRepeat extends ActionBase implements IAction, Cloneable {
 
   public EndRepeat(String name, String description) {
diff --git a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java
index 18b4257..8619a6a 100644
--- a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java
+++ b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java
@@ -59,7 +59,8 @@ import java.util.Map;
     name = "Repeat",
     description = "Repeat execution of a workflow or a transformation",
     categoryDescription = "General",
-    image = "ui/images/JOBEx.svg")
+    image = "repeat.svg"
+)
 public class Repeat extends ActionBase implements IAction, Cloneable {
 
   public static final String REPEAT_END_LOOP = "_REPEAT_END_LOOP_";
diff --git a/plugins/actions/repeat/src/main/resources/endrepeat.svg b/plugins/actions/repeat/src/main/resources/endrepeat.svg
new file mode 100644
index 0000000..2cb562b
--- /dev/null
+++ b/plugins/actions/repeat/src/main/resources/endrepeat.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+     width="42px" height="42px" viewBox="0 0 42 42" enable-background="new 0 0 42 42" xml:space="preserve">
+<polygon fill="#5CC0C4" points="16.401,30.281 9.373,23.252 10.928,21.696 16.401,27.169 31.073,12.499 32.628,14.055 "/>
+</svg>
diff --git a/plugins/actions/repeat/src/main/resources/repeat.svg b/plugins/actions/repeat/src/main/resources/repeat.svg
new file mode 100644
index 0000000..a032aad
--- /dev/null
+++ b/plugins/actions/repeat/src/main/resources/repeat.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    version="1.1"
+    id="Layer_1"
+    x="0px"
+    y="0px"
+    viewBox="-284 376 42 42"
+    style="enable-background:new -284 376 42 42;"
+    xml:space="preserve"
+    inkscape:version="0.48.4 r9939"
+    width="100%"
+    height="100%"
+    sodipodi:docname="JOBEx.svg"><metadata
+     id="metadata21"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+    rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata>
+  <defs
+      id="defs19"/>
+  <sodipodi:namedview
+      pagecolor="#ffffff"
+      bordercolor="#666666"
+      borderopacity="1"
+      objecttolerance="10"
+      gridtolerance="10"
+      guidetolerance="10"
+      inkscape:pageopacity="0"
+      inkscape:pageshadow="2"
+      inkscape:window-width="747"
+      inkscape:window-height="657"
+      id="namedview17"
+      showgrid="false"
+      inkscape:zoom="5.6190476"
+      inkscape:cx="22.073552"
+      inkscape:cy="21"
+      inkscape:window-x="276"
+      inkscape:window-y="101"
+      inkscape:window-maximized="0"
+      inkscape:current-layer="Layer_1"/>
+  <style
+      type="text/css"
+      id="style3">
+	.st0{fill:none;}
+	.st1{fill:#F99C1C;}
+	.st2{fill:#5CC0C4;}
+</style>
+  <polygon
+      style="fill:#f99c1c"
+      id="polygon9"
+      points="-276.1,399.5 -276.1,407.1 -274.4,407.1 -274.4,402.4 -266.3,410.5 -265.1,409.3 -273.2,401.2 -268.6,401.2 -268.6,399.5 "
+      class="st1"/>
+  <path
+      style="fill:#5cc0c4"
+      inkscape:connector-curvature="0"
+      id="path15"
+      d="m -259.9,399.5 v 11.1 l 11.9,-5.6 -11.9,-5.5 z m 1.9,2.9 5.7,2.7 -5.7,2.7 v -5.4 z"
+      class="st2"/>
+  <polygon
+      style="fill:none"
+      id="polygon7"
+      points="-248.5,409.5 -254.2,406.8 -254.2,412.1 "
+      class="st0"/>
+  <polygon
+      style="fill:#f99c1c"
+      id="polygon11"
+      points="-275.9,393 -274.7,394.2 -266.6,386.1 -266.6,390.7 -264.9,390.7 -264.9,383.2 -272.4,383.2 -272.4,384.9 -267.8,384.9 "
+      class="st1"/>
+  <polygon
+      style="fill:#f99c1c"
+      id="polygon13"
+      points="-248.9,386.9 -250.6,386.9 -250.6,391.6 -258.7,383.5 -259.9,384.7 -251.8,392.8 -256.4,392.8 -256.4,394.5 -248.9,394.5 "
+      class="st1"/></svg>
\ No newline at end of file
diff --git a/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputMeta.java b/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputMeta.java
index fdcfc91..ef37cd0 100644
--- a/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputMeta.java
+++ b/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputMeta.java
@@ -49,7 +49,7 @@ import java.util.List;
  */
 @Transform(
     id = "MongoDbOutput",
-    image = "MongoDB.svg",
+    image = "mongodb-output.svg",
     name = "MongoDB output",
     description = "Writes to a Mongo DB collection",
     documentationUrl = "https://hop.apache.org/manual/latest/plugins/transforms/mongodboutput.html",
diff --git a/ui/src/main/resources/ui/images/mongodb-input.svg b/plugins/transforms/mongodb/src/main/resources/mongodb-input.svg
similarity index 100%
rename from ui/src/main/resources/ui/images/mongodb-input.svg
rename to plugins/transforms/mongodb/src/main/resources/mongodb-input.svg
diff --git a/ui/src/main/resources/ui/images/MongoDB.svg b/plugins/transforms/mongodb/src/main/resources/mongodb-output.svg
similarity index 100%
rename from ui/src/main/resources/ui/images/MongoDB.svg
rename to plugins/transforms/mongodb/src/main/resources/mongodb-output.svg