[PATCH 2 of 2] Remove outdated Intevation logo

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1682519287 -7200
#      Wed Apr 26 16:28:07 2023 +0200
# Branch 3.2.x
# Node ID ae298eccc25cc159495152128c38d42a63cc4939
# Parent  c670bf2ec4b00f37c58a70ccb9fdb970b32327eb
Remove outdated Intevation logo

diff -r c670bf2ec4b0 -r ae298eccc25c artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Wed Apr 26 16:04:45 2023 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Wed Apr 26 16:28:07 2023 +0200
@@ -276,10 +276,6 @@
             return;
         }
 
-        ImageIcon imageIcon = null;
-        if (logo.equals("none")) {
-            return;
-        }
         /*
          If you want to add images, remember to change code in these places:
          flys-artifacts:
@@ -291,15 +287,13 @@
          flys-client/src/main/webapp/images/
          */
         java.net.URL imageURL;
-        if (logo.equals("Intevation")) {
-            imageURL = DiagramGenerator.class.getResource(
-                "/images/intevation.png");
-        }
-        else { // TODO else if ...
+        if (logo.equals("BfG")) {
             imageURL = DiagramGenerator.class.getResource(
                 "/images/bfg_logo.gif");
+        } else {
+            return;
         }
-        imageIcon = new ImageIcon(imageURL);
+        ImageIcon imageIcon = new ImageIcon(imageURL);
 
 
         double xPos = 0d, yPos = 0d;
diff -r c670bf2ec4b0 -r ae298eccc25c artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Wed Apr 26 16:04:45 2023 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Wed Apr 26 16:28:07 2023 +0200
@@ -168,10 +168,6 @@
             return;
         }
 
-        ImageIcon imageIcon = null;
-        if (logo.equals("none")) {
-            return;
-        }
         /*
          If you want to add images, remember to change code in these places:
          flys-artifacts:
@@ -183,15 +179,13 @@
          flys-client/src/main/webapp/images/
          */
         java.net.URL imageURL;
-        if (logo.equals("Intevation")) {
-            imageURL = XYChartGenerator.class.getResource(
-                "/images/intevation.png");
-        }
-        else { // TODO else if ...
+        if (logo.equals("BfG")) {
             imageURL = XYChartGenerator.class.getResource(
                 "/images/bfg_logo.gif");
+        } else {
+            return;
         }
-        imageIcon = new ImageIcon(imageURL);
+        ImageIcon imageIcon = new ImageIcon(imageURL);
         double xPos = 0d, yPos = 0d;
 
         String placeh = logoHPlace();
diff -r c670bf2ec4b0 -r ae298eccc25c artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java	Wed Apr 26 16:04:45 2023 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java	Wed Apr 26 16:28:07 2023 +0200
@@ -191,10 +191,6 @@
             return;
         }
 
-        ImageIcon imageIcon = null;
-        if (logo.equals("none")) {
-            return;
-        }
         /*
          If you want to add images, remember to change code in these places:
          flys-artifacts:
@@ -206,15 +202,13 @@
          flys-client/src/main/webapp/images/
          */
         java.net.URL imageURL;
-        if (logo.equals("Intevation")) {
-            imageURL = XYChartGenerator.class.getResource(
-                "/images/intevation.png");
-        }
-        else { // TODO else if ...
+        if (logo.equals("BfG")) {
             imageURL = XYChartGenerator.class.getResource(
                 "/images/bfg_logo.gif");
+        } else {
+            return;
         }
-        imageIcon = new ImageIcon(imageURL);
+        ImageIcon imageIcon = new ImageIcon(imageURL);
 
 
         double xPos = 0d, yPos = 0d;
diff -r c670bf2ec4b0 -r ae298eccc25c artifacts/src/main/resources/images/intevation.png
Binary file artifacts/src/main/resources/images/intevation.png has changed
diff -r c670bf2ec4b0 -r ae298eccc25c gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Wed Apr 26 16:04:45 2023 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Wed Apr 26 16:28:07 2023 +0200
@@ -411,9 +411,7 @@
              flys-client/src/main/webapp/images/
              */
             valueMap.put("BfG", "");
-            valueMap.put("Intevation", "");
             valueIcons.put("BfG", "bfg.gif");
-            valueIcons.put("Intevation", "intevation.png");
             logoChooser.setValueIcons(valueIcons);
             logoChooser.setValueMap(valueMap);
             logoChooser.setTitleStyle("color:#000;");
diff -r c670bf2ec4b0 -r ae298eccc25c gwt-client/src/main/webapp/images/logo-intevation.png
Binary file gwt-client/src/main/webapp/images/logo-intevation.png has changed