Merge pull request #3399 from bmorrise/BACKLOG-12233

[BACKLOG-12233] Added slave server image for tree
pentaho · Jan 19, 2017 · 6bc9a08 · 6bc9a08
2 parents ef76e54 + 1d49ccb
commit 6bc9a08
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 2 deletions.
diff --git a/assembly/package-res/ui/laf.properties b/assembly/package-res/ui/laf.properties
@@ -36,6 +36,7 @@ Color_image=ui/images/color.svg
 Note_image=ui/images/noteSmall.svg
 Cluster_image=ui/images/cluster.svg
 Slave_image=ui/images/slave.svg
+Slave_tree_image=ui/images/slave-tree.svg
 Calendar_image=ui/images/calendar.svg
 RegExSmall_image=ui/images/regex.svg
 KeySmall_image=ui/images/keySmall.svg

diff --git a/ui/package-res/ui/images/slave-tree.png b/ui/package-res/ui/images/slave-tree.png
diff --git a/ui/package-res/ui/images/slave-tree.svg b/ui/package-res/ui/images/slave-tree.svg
diff --git a/ui/src/org/pentaho/di/ui/core/gui/GUIResource.java b/ui/src/org/pentaho/di/ui/core/gui/GUIResource.java
@@ -3,7 +3,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2017 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -201,6 +201,8 @@ public class GUIResource {
 
   private SwtUniversalImage imageSlave;
 
+  private SwtUniversalImage imageSlaveTree;
+
   private SwtUniversalImage imageArrow;
 
   private SwtUniversalImage imageFolder;
@@ -567,6 +569,7 @@ private void dispose( boolean reload ) {
       imageCalendar.dispose();
       imageCluster.dispose();
       imageSlave.dispose();
+      imageSlaveTree.dispose();
       imageArrow.dispose();
       imageFolder.dispose();
       imageTransRepo.dispose();
@@ -861,6 +864,9 @@ private void loadCommonImages() {
     // , "ui/images/slave.png"
     imageSlave = SwtSvgImageUtil.getImageAsResource( display, BasePropertyHandler.getProperty( "Slave_image" ) );
 
+    // , "ui/images/slave-tree.png"
+    imageSlaveTree = SwtSvgImageUtil.getImageAsResource( display, BasePropertyHandler.getProperty( "Slave_tree_image" ) );
+
     // "ui/images/logo_kettle_lrg.png"
     imageKettleLogo = loadAsResource( display, BasePropertyHandler.getProperty( "Logo_lrg_image" ), 0 );
     // "ui/images/bg_banner.png"
@@ -1455,6 +1461,20 @@ public Image getImageSlaveMedium() {
     return imageSlave.getAsBitmapForSize( display, ConstUI.MEDIUM_ICON_SIZE, ConstUI.MEDIUM_ICON_SIZE );
   }
 
+  /**
+   * @return Returns the imageSlaveTree.
+   */
+  public Image getImageSlaveTree() {
+    return imageSlaveTree.getAsBitmapForSize( display, ConstUI.MEDIUM_ICON_SIZE, ConstUI.MEDIUM_ICON_SIZE );
+  }
+
+  /**
+   * @return Returns the imageSlave.
+   */
+  public Image getImageSlaveTreeMedium() {
+    return imageSlaveTree.getAsBitmapForSize( display, ConstUI.MEDIUM_ICON_SIZE, ConstUI.MEDIUM_ICON_SIZE );
+  }
+
   /**
    * @return Returns the imageConnection.
    */

diff --git a/ui/src/org/pentaho/di/ui/spoon/Spoon.java b/ui/src/org/pentaho/di/ui/spoon/Spoon.java
@@ -6526,7 +6526,7 @@ private List<SlaveServer> pickupSlaveServers( AbstractMeta transMeta ) throws Ke
 
       SlaveServer slaveServer = SlaveServer.findSlaveServer( servers, slaveName );
 
-      TreeItem tiSlave = createTreeItem( tiSlaveTitle, slaveServer.getName(), guiResource.getImageSlaveMedium() );
+      TreeItem tiSlave = createTreeItem( tiSlaveTitle, slaveServer.getName(), guiResource.getImageSlaveTree() );
       if ( slaveServer.isShared() ) {
         tiSlave.setFont( guiResource.getFontBold() );
       }