Mercurial > dive4elements > river
changeset 9783:ae298eccc25c 3.2.x
Remove outdated Intevation logo
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 26 Apr 2023 16:28:07 +0200 |
| parents | c670bf2ec4b0 |
| children | 7df65516ee8b |
| files | artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java artifacts/src/main/resources/images/intevation.png gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java gwt-client/src/main/webapp/images/logo-intevation.png |
| diffstat | 6 files changed, 12 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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();
--- 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;
--- 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;");