From f73333d951b4a8d83b83fbca3050c7147c414706 Mon Sep 17 00:00:00 2001
From: Dave Hoover <dhoover@threerings.net>
Date: Tue, 30 Nov 2010 01:06:34 +0000
Subject: [PATCH] Damn, setIconImages is new in 1.6.

When I'm feeling more up to it, I'll potentially rejigger this to
allow its use if it's available, but for now just simplify it so
folks can set a single icon.
---
 .../threerings/getdown/data/Application.java  |  6 +++---
 .../getdown/launcher/GetdownApp.java          | 20 +++++--------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java
index 549d86f..ac5c73d 100644
--- a/src/main/java/com/threerings/getdown/data/Application.java
+++ b/src/main/java/com/threerings/getdown/data/Application.java
@@ -112,8 +112,8 @@ public class Application
         /** The error background image for {@link RotatingBackgrounds}. */
         public String errorBackground;
 
-        /** The paths (relative to the appdir) of file names for icon images. */
-        public String[] iconImages;
+        /** The path (relative to the appdir) of an image for the window icon. */
+        public String iconImage;
 
         /** The path (relative to the appdir) to a single background image. */
         public String backgroundImage;
@@ -598,7 +598,7 @@ public class Application
         }
         ui.progressImage = (String)cdata.get("ui.progress_image");
         ui.rotatingBackgrounds = ConfigUtil.getMultiValue(cdata, "ui.rotating_background");
-        ui.iconImages = ConfigUtil.getMultiValue(cdata, "ui.icon");
+        ui.iconImage = (String)cdata.get("ui.icon");
         ui.errorBackground = (String)cdata.get("ui.error_background");
         _dockIconPath = (String)cdata.get("ui.mac_dock_icon");
         if (_dockIconPath == null) {
diff --git a/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
index 069b40f..63283ae 100644
--- a/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
+++ b/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
@@ -38,7 +38,6 @@ import java.io.IOException;
 import java.io.BufferedOutputStream;
 import java.io.PrintStream;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -125,21 +124,12 @@ public class GetdownApp
                         _frame.setTitle(title);
                         _frame.getContentPane().removeAll();
                     }
-                    if (_ifc.iconImages != null) {
-                        ArrayList<Image> icons = new ArrayList<Image>();
-                        for (String path : _ifc.iconImages) {
-                            Image img = loadImage(path);
-                            if (img == null) {
-                                log.warning("Error loading icon image", "path", path);
-                            } else {
-                                icons.add(img);
-                            }
-                        }
-                        if (icons.isEmpty()) {
-                            log.warning("Failed to load any icons", "iconImages", _ifc.iconImages);
-
+                    if (_ifc.iconImage != null) {
+                        Image img = loadImage(_ifc.iconImage);
+                        if (img == null) {
+                            log.warning("Failed to load icon", "iconImage", _ifc.iconImage);
                         } else {
-                            _frame.setIconImages(icons);
+                            _frame.setIconImage(img);
                         }
                     }
                     _frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);