# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1346283981 0
# Node ID 119b8ba2b77f9569c62176706ab2db43f5ad4e25
# Parent  5e505060a9bf9b624f92d19534cb08e62dcdc221
Include logos in resources.

flys-artifacts/trunk@5300 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 5e505060a9bf -r 119b8ba2b77f flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Aug 29 15:26:50 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Aug 29 23:46:21 2012 +0000
@@ -1,3 +1,16 @@
+2012-08-30	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java:
+	  Mention how/where to change predefined logos in comment.
+
+	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java:
+	  Mention how/where to change predefined logos in comment,
+	  Use resource for images.
+
+	* src/main/resources/images/bfg_logo.gif,
+	  src/main/resources/images/intevation.png:
+	  Added sample logos of intevation and bfg.
+
 2012-08-29	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java:
diff -r 5e505060a9bf -r 119b8ba2b77f flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java	Wed Aug 29 15:26:50 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java	Wed Aug 29 23:46:21 2012 +0000
@@ -267,6 +267,13 @@
         if (logo.equals("none")) {
             return;
         }
+        /*
+         If you want to add images, remember to change code in these places:
+         flys-artifacts:
+         XYChartGenerator.java
+         Timeseries*Generator.java and
+         in the flys-client projects Chart*Propert*Editor.java.
+         */
         if (logo.equals("Intevation")) {
             imageIcon = new ImageIcon("/home/felix/Downloads/intevation_logo_120.png");
         }
diff -r 5e505060a9bf -r 119b8ba2b77f flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Wed Aug 29 15:26:50 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Wed Aug 29 23:46:21 2012 +0000
@@ -284,12 +284,22 @@
         if (logo.equals("none")) {
             return;
         }
+        /*
+         If you want to add images, remember to change code in these places:
+         flys-artifacts:
+         XYChartGenerator.java
+         Timeseries*Generator.java and
+         in the flys-client projects Chart*Propert*Editor.java.
+         */
+        java.net.URL imageURL;
         if (logo.equals("Intevation")) {
-            imageIcon = new ImageIcon("/home/felix/Downloads/intevation_logo_120.png");
+            imageURL = XYChartGenerator.class.getResource("/images/intevation.png");
         }
         else { // TODO else if ...
-            imageIcon = new ImageIcon("/home/felix/Downloads/bfg_logo.gif");
+            imageURL = XYChartGenerator.class.getResource("/images/bfg_logo.gif");
         }
+        imageIcon = new ImageIcon(imageURL);
+
 
         double xPos = 0d, yPos = 0d;
 
diff -r 5e505060a9bf -r 119b8ba2b77f flys-artifacts/src/main/resources/images/bfg_logo.gif
Binary file flys-artifacts/src/main/resources/images/bfg_logo.gif has changed
diff -r 5e505060a9bf -r 119b8ba2b77f flys-artifacts/src/main/resources/images/intevation.png
Binary file flys-artifacts/src/main/resources/images/intevation.png has changed