From 6623fd262fccf6d263c484fdf779a97289d47c1f Mon Sep 17 00:00:00 2001
From: Lennart Hensler <lennart.hensler@sap.com>
Date: Tue, 7 Feb 2012 10:59:02 +0100
Subject: [PATCH] Refactored resources for the ExpandCollapseButtonCell

---
 .../ui/leaderboard/ExpandCollapseButtonCell.java    |   6 +++++-
 .../gwt/ui/leaderboard/LeaderboardResources.java    |   6 ++++++
 .../sap/sailing/gwt/ui/client}/images/magnifier.png | Bin
 .../gwt/ui/client}/images/magnifier_slashed.png     | Bin
 4 files changed, 11 insertions(+), 1 deletion(-)
 rename java/com.sap.sailing.gwt.ui/{ => src/main/resources/com/sap/sailing/gwt/ui/client}/images/magnifier.png (100%)
 rename java/com.sap.sailing.gwt.ui/{ => src/main/resources/com/sap/sailing/gwt/ui/client}/images/magnifier_slashed.png (100%)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandCollapseButtonCell.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandCollapseButtonCell.java
index 060bd26d5c9..d775e56c67a 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandCollapseButtonCell.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandCollapseButtonCell.java
@@ -4,6 +4,7 @@ import com.google.gwt.cell.client.AbstractCell;
 import com.google.gwt.cell.client.ActionCell;
 import com.google.gwt.cell.client.ActionCell.Delegate;
 import com.google.gwt.cell.client.ValueUpdater;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.EventTarget;
 import com.google.gwt.dom.client.NativeEvent;
@@ -12,6 +13,7 @@ import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 
 public class ExpandCollapseButtonCell extends AbstractCell<SafeHtml> {
 
+    private static final LeaderboardResources RESOURCES = GWT.create(LeaderboardResources.class);
 
     private final SafeHtml html;
     private final Delegate<SafeHtml> delegate;
@@ -27,8 +29,10 @@ public class ExpandCollapseButtonCell extends AbstractCell<SafeHtml> {
       super("click", "keydown");
       this.column = column;
       this.delegate = delegate;
+      
+      String src = column.isExpanded() ? RESOURCES.magnifierSlashedIcon().getSafeUri().asString() : RESOURCES.magnifierIcon().getSafeUri().asString();
       this.html = new SafeHtmlBuilder().appendHtmlConstant(
-          "<input class=\"valignMiddle magnifier\" type=\"image\" src=\"/gwt/images/"+(column.isExpanded()?"magnifier_slashed":"magnifier")+".png\" />").toSafeHtml();
+          "<input class=\"valignMiddle magnifier\" type=\"image\" src=\"" + src + "\" />").toSafeHtml();
     }
 
     @Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java
index 0ad74d77f02..ab0f58e8a33 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java
@@ -16,4 +16,10 @@ interface LeaderboardResources extends ClientBundle {
 
     @Source("com/sap/sailing/gwt/ui/client/images/chart.png")
     ImageResource chartIcon();
+
+    @Source("com/sap/sailing/gwt/ui/client/images/magnifier.png")
+    ImageResource magnifierIcon();
+
+    @Source("com/sap/sailing/gwt/ui/client/images/magnifier_slashed.png")
+    ImageResource magnifierSlashedIcon();
 }
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/images/magnifier.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/magnifier.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/magnifier.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/magnifier.png
diff --git a/java/com.sap.sailing.gwt.ui/images/magnifier_slashed.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/magnifier_slashed.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/images/magnifier_slashed.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/magnifier_slashed.png