JAL-3594 JAL-3728 Added taskbar icons to desktop and Java console. Changed "Jalview...

[jalview.git] / src / jalview / gui / Console.java

diff --git a/src/jalview/gui/Console.java b/src/jalview/gui/Console.java
index b456025..050523e 100644 (file)
--- a/src/jalview/gui/Console.java
+++ b/src/jalview/gui/Console.java
@@ -54,6 +54,7 @@ import org.apache.log4j.Level;
 import org.apache.log4j.SimpleLayout;
 
 import jalview.bin.Cache;
+import jalview.util.ChannelProperties;
 import jalview.util.MessageManager;
 
 /**
@@ -255,6 +256,9 @@ public class Console extends WindowAdapter
     textAppender = new Thread(this);
     textAppender.setDaemon(true);
     textAppender.start();
+
+    // set icons
+    frame.setIconImages(ChannelProperties.getIconList());
   }
 
   private void setChosenLogLevelCombo()
@@ -453,13 +457,16 @@ public class Console extends WindowAdapter
     Rectangle bounds = desktop.getLastKnownDimensions("JAVA_CONSOLE_");
     if (bounds == null)
     {
-      frame = initFrame("Jalview Java Console", desktop.getWidth() / 2,
-              desktop.getHeight() / 4, desktop.getX(), desktop.getY());
+      frame = initFrame(
+              ChannelProperties.getProperty("app_name") + " Java Console",
+              desktop.getWidth() / 2, desktop.getHeight() / 4,
+              desktop.getX(), desktop.getY());
     }
     else
     {
-      frame = initFrame("Jalview Java Console", bounds.width, bounds.height,
-              bounds.x, bounds.y);
+      frame = initFrame(
+              ChannelProperties.getProperty("app_name") + " Java Console",
+              bounds.width, bounds.height, bounds.x, bounds.y);
     }
     frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
     // desktop.add(frame);