[PATCH] pdf export enhancements
Wald Commits
scm-commit at wald.intevation.org
Fri Jun 1 16:06:17 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1527861972 -7200
# Node ID 59cf6e6a452db421c3d1d088556816d5796ad74f
# Parent f5b55b383ef964cd6fe97be833bdb561cb5836ca
pdf export enhancements
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-17T10:14:04 -->
+<!-- 2018-06-01T13:49:16 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="842" pageHeight="595" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <style name="htmlStyle" markup="html"/>
+ <style name="htmlStyle" markup="html" fontName="Roboto"/>
<field name="meta:totalpagesoffset" class="java.lang.Integer"/>
<field name="meta:startpageoffset" class="java.lang.Integer"/>
<field name="meta:header" class="java.lang.String"/>
@@ -214,13 +214,13 @@
<textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement key="6" positionType="Float" stretchType="RelativeToBandHeight" x="295" y="0" width="80" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement key="7" positionType="Float" stretchType="RelativeToBandHeight" x="375" y="0" width="110" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textElement verticalAlignment="Top"/>
@@ -232,13 +232,13 @@
<textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement key="9" positionType="Float" stretchType="RelativeToBandHeight" x="545" y="0" width="95" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement key="10" positionType="Float" stretchType="RelativeToBandHeight" x="640" y="0" width="122" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textElement verticalAlignment="Top"/>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-16T10:31:02 -->
+<!-- 2018-06-01T13:50:10 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="842" pageHeight="595" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/>
<field name="meta:header" class="java.lang.String"/>
<field name="meta:calcMode" class="java.lang.String"/>
<field name="meta:version_label" class="java.lang.String"/>
@@ -212,7 +212,7 @@
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="560" y="0" width="191" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-12T10:42:57 -->
+<!-- 2018-06-01T13:52:40 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="842" pageHeight="595" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/>
<field name="meta:header" class="java.lang.String"/>
<field name="meta:calcMode" class="java.lang.String"/>
<field name="meta:version_label" class="java.lang.String"/>
@@ -185,10 +185,10 @@
</columnHeader>
<detail>
<band height="20" splitType="Stretch">
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="370" y="0" width="90" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
- <textElement textAlignment="Right"/>
+ <textElement textAlignment="Left"/>
<textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
@@ -233,12 +233,12 @@
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="541" y="0" width="100" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="641" y="0" width="120" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
<textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml
--- a/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-12T11:28:11 -->
+<!-- 2018-06-01T13:54:51 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="842" pageHeight="595" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/>
<field name="meta:header" class="java.lang.String"/>
<field name="meta:calcMode" class="java.lang.String"/>
<field name="meta:version_label" class="java.lang.String"/>
@@ -200,7 +200,7 @@
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="470" y="0" width="120" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -276,7 +276,7 @@
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <textField isBlankWhenNull="true">
<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="590" y="0" width="160" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/uinfo.inundationduration.jrxml
--- a/artifacts/doc/conf/jasper/templates/uinfo.inundationduration.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/uinfo.inundationduration.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-10T16:12:10 -->
+<!-- 2018-06-01T13:55:18 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
- <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/>
<field name="meta:header" class="java.lang.String"/>
<field name="meta:calcMode" class="java.lang.String"/>
<field name="meta:version_label" class="java.lang.String"/>
@@ -134,7 +133,7 @@
<textFieldExpression><![CDATA[$F{meta:tkh_header} + "<br/>[cm]"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="140" height="24"/>
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="380" height="24"/>
<box padding="5"/>
<textElement verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:tkhkind_header}]]></textFieldExpression>
@@ -168,8 +167,8 @@
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="140" height="20"/>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="380" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml
--- a/artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-16T11:03:24 -->
+<!-- 2018-06-01T13:48:24 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/>
<field name="meta:header" class="java.lang.String"/>
<field name="meta:calcMode" class="java.lang.String"/>
<field name="meta:version_label" class="java.lang.String"/>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/uinfo.vegetationzones.jrxml
--- a/artifacts/doc/conf/jasper/templates/uinfo.vegetationzones.jrxml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/uinfo.vegetationzones.jrxml Fri Jun 01 16:06:12 2018 +0200
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-04-16T11:38:36 -->
+<!-- 2018-06-01T14:30:28 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
- <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto">
+ <paragraph lineSpacing="Single"/>
+ </style>
<field name="meta:header" class="java.lang.String"/>
<field name="meta:calcMode" class="java.lang.String"/>
<field name="meta:version_label" class="java.lang.String"/>
@@ -118,19 +120,23 @@
<columnHeader>
<band height="25" splitType="Stretch">
<textField isStretchWithOverflow="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="140" height="24"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="267" height="24">
+ <property name="net.sf.jasperreports.text.hyphenation" value="true"/>
+ <property name="net.sf.jasperreports.text.save.line.breaks" value="true"/>
+ <property name="net.sf.jasperreports.export.xls.wrap.text" value="true"/>
+ </reportElement>
<box padding="5"/>
<textElement verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:veg_name}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="140" y="0" width="140" height="24"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="267" y="0" width="140" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:veg_dauervon}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="280" y="0" width="140" height="24"/>
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="407" y="0" width="140" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:veg_dauerbis}]]></textFieldExpression>
@@ -142,8 +148,8 @@
</columnHeader>
<detail>
<band height="20" splitType="Prevent">
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="140" height="20"/>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="267" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -154,7 +160,7 @@
<textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="140" y="0" width="140" height="20"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="267" y="0" width="140" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -165,7 +171,7 @@
<textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="280" y="0" width="140" height="20"/>
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="407" y="0" width="140" height="20"/>
<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/pom.xml
--- a/artifacts/pom.xml Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/pom.xml Fri Jun 01 16:06:12 2018 +0200
@@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dive4elements.river</groupId>
<artifactId>river-artifacts</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
-
<name>river-artifacts</name>
<url>http://maven.apache.org</url>
@@ -17,13 +15,13 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -47,27 +45,35 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version>
<configuration>
- <configLocation>../checkstyle.xml</configLocation>
- <encoding>UTF-8</encoding>
+ <configLocation>../checkstyle.xml</configLocation>
+ <encoding>UTF-8</encoding>
</configuration>
<executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
</executions>
- </plugin-->
+ </plugin -->
</plugins>
</build>
- <dependencies>
+ <dependencies>
+
+ <dependency>
+ <groupId>roboto.jar</groupId>
+ <artifactId>roboto</artifactId>
+ <version>0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/roboto.jar</systemPath>
+ </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
@@ -135,9 +141,9 @@
<version>1.3.158</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
@@ -193,9 +199,9 @@
</dependencies>
<repositories>
<repository>
- <id>jboss-repo2</id>
- <name>JBoss repo2</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <id>jboss-repo2</id>
+ <name>JBoss repo2</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>gt2.repo</id>
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java Fri Jun 01 16:06:12 2018 +0200
@@ -362,7 +362,7 @@
}
};
public static final SInfoResultType waterlevelDifference = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER,
- "sinfo.export.pdf.header.waterlevel.difference") {
+ "sinfo.export.csv.header.waterlevel.difference") {
private static final long serialVersionUID = 1L;
@Override
@@ -377,7 +377,7 @@
}
};
public static final SInfoResultType bedHeightDifference = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_MEAN_BED_HEIGHT_DIFFERENCE_HEADER,
- "sinfo.export.pdf.header.mean_bed_height.difference") {
+ "sinfo.export.csv.header.mean_bed_height.difference") {
private static final long serialVersionUID = 1L;
@Override
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties Fri Jun 01 16:06:12 2018 +0200
@@ -1015,10 +1015,8 @@
sinfo.export.csv.header.flowdepth.development = Flie\u00dftiefenentwicklung
sinfo.export.pdf.header.flowdepth.development = Flie\u00dftiefen-entwicklung
sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr
-sinfo.export.csv.header.waterlevel.difference = \u0394WSPL
-sinfo.export.pdf.header.waterlevel.difference = dWSPL
-sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH
-sinfo.export.pdf.header.mean_bed_height.difference = dMSH
+sinfo.export.csv.header.waterlevel.difference = \u0394WSPL
+sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH
sinfo.export.csv.header.flowdepth.current = Flie\u00dftiefe h-aktuell
sinfo.export.csv.header.flowdepth.historical = Flie\u00dftiefe h-historisch
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties Tue May 29 18:17:55 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties Fri Jun 01 16:06:12 2018 +0200
@@ -1015,10 +1015,8 @@
sinfo.export.pdf.header.flowdepth.development = Flie\u00dftiefen-entwicklung
sinfo.export.csv.header.flowdepth.development = Flie\u00dftiefenentwicklung
sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr
-sinfo.export.csv.header.waterlevel.difference = \u0394WSPL
-sinfo.export.pdf.header.waterlevel.difference = dWSPL
-sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH
-sinfo.export.pdf.header.mean_bed_height.difference = dMSH
+sinfo.export.csv.header.waterlevel.difference = \u0394WSPL
+sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH
sinfo.export.csv.header.flowdepth.current = Flie\u00dftiefe h-aktuell
sinfo.export.csv.header.flowdepth.historical = Flie\u00dftiefe h-historisch
diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/resources/roboto.jar
Binary file artifacts/src/main/resources/roboto.jar has changed
More information about the Dive4Elements-commits
mailing list