From f6a595978881b4fe1b2c712889a806f24456fcc9 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Tue, 4 Mar 2014 11:57:44 +0000 Subject: [PATCH] POI is now on JDK 1.6, so remove 1.5 workaround git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1574049 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/ss/usermodel/DataFormatter.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java b/src/java/org/apache/poi/ss/usermodel/DataFormatter.java index 334cd0670f..b86b090447 100644 --- a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java +++ b/src/java/org/apache/poi/ss/usermodel/DataFormatter.java @@ -894,38 +894,20 @@ public class DataFormatter { } /** - * Enables excel style rounding mode (round half up) - * on the Decimal Format if possible. - * This will work for Java 1.6, but isn't possible - * on Java 1.5. + * Enables excel style rounding mode (round half up) on the + * Decimal Format given. */ public static void setExcelStyleRoundingMode(DecimalFormat format) { setExcelStyleRoundingMode(format, RoundingMode.HALF_UP); } /** - * Enables custom rounding mode - * on the Decimal Format if possible. - * This will work for Java 1.6, but isn't possible - * on Java 1.5. + * Enables custom rounding mode on the given Decimal Format. * @param format DecimalFormat * @param roundingMode RoundingMode */ public static void setExcelStyleRoundingMode(DecimalFormat format, RoundingMode roundingMode) { - try { - Method srm = format.getClass().getMethod("setRoundingMode", RoundingMode.class); - srm.invoke(format, roundingMode); - } catch(NoSuchMethodException e) { - // Java 1.5 - } catch(IllegalAccessException iae) { - // Shouldn't happen - throw new RuntimeException("Unable to set rounding mode", iae); - } catch(InvocationTargetException ite) { - // Shouldn't happen - throw new RuntimeException("Unable to set rounding mode", ite); - } catch(SecurityException se) { - // Not much we can do here - } + format.setRoundingMode(roundingMode); } /** -- 2.39.5