From e1cd3dd258dc916a5760d5f62c1fbc4e9fca4da6 Mon Sep 17 00:00:00 2001 From: gallenc Date: Wed, 19 Oct 2022 17:31:13 +0100 Subject: [PATCH 1/2] changed karaf version so compiles with java 11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bced84..21b2823 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 6.0.0 5.0.0 0.4.1 - 4.1.5 + 4.3.6 1.7.25 From dda3e249bbd2fb4e285b003793463ecf3444eaf5 Mon Sep 17 00:00:00 2001 From: gallenc Date: Wed, 19 Oct 2022 18:17:17 +0100 Subject: [PATCH 2/2] fixed jira PRIS_159 --- .../java/org/opennms/plugins/pris/xls/XlsSource.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pris-xls/src/main/java/org/opennms/plugins/pris/xls/XlsSource.java b/pris-xls/src/main/java/org/opennms/plugins/pris/xls/XlsSource.java index 402e10a..8971a66 100644 --- a/pris-xls/src/main/java/org/opennms/plugins/pris/xls/XlsSource.java +++ b/pris-xls/src/main/java/org/opennms/plugins/pris/xls/XlsSource.java @@ -80,8 +80,16 @@ public class XlsSource implements Source { public static String getStringValueFromCell(Cell cell) { String value = null; switch (cell.getCellTypeEnum()) { - case NUMERIC: value = Integer.toString((int)cell.getNumericCellValue()); + case NUMERIC: + double d = cell.getNumericCellValue(); + if (d % 1 ==0) { + value = Integer.toString((int) d); + } else { + // prints double with 7 decimal places - suitable for lat/long + value = String.format("%.7f",d); + } break; + case STRING: value = cell.getStringCellValue(); break; case BOOLEAN: value = ((Boolean) cell.getBooleanCellValue()).toString();