From e7f4d132f159cd6a3c0034b9cfde5f0a3987f2ed Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Mon, 10 Aug 2015 06:17:44 +0000 Subject: [PATCH] Provide more output when failing range-checks on HSL2RGB-construction git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1694960 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/stress/XSLFFileHandler.java | 5 ++--- src/java/org/apache/poi/sl/draw/DrawPaint.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java b/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java index 2669238be1..ba33ad589e 100644 --- a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java +++ b/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java @@ -97,7 +97,7 @@ public class XSLFFileHandler extends AbstractFileHandler { // a test-case to test this locally without executing the full TestAllFiles @Test public void test() throws Exception { - InputStream stream = new FileInputStream("test-data/slideshow/SampleShow.pptx"); + InputStream stream = new FileInputStream("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx"); try { handleFile(stream); } finally { @@ -105,10 +105,9 @@ public class XSLFFileHandler extends AbstractFileHandler { } } - // a test-case to test this locally without executing the full TestAllFiles @Test public void testExtractor() throws Exception { - handleExtracting(new File("test-data/slideshow/testPPT.thmx")); + handleExtracting(new File("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx")); } } \ No newline at end of file diff --git a/src/java/org/apache/poi/sl/draw/DrawPaint.java b/src/java/org/apache/poi/sl/draw/DrawPaint.java index 2221c2f2f6..c291717431 100644 --- a/src/java/org/apache/poi/sl/draw/DrawPaint.java +++ b/src/java/org/apache/poi/sl/draw/DrawPaint.java @@ -357,17 +357,17 @@ public class DrawPaint { */ private static Color HSL2RGB(double h, double s, double l, double alpha) { if (s <0.0f || s > 100.0f) { - String message = "Color parameter outside of expected range - Saturation"; + String message = "Color parameter outside of expected range - Saturation: " + s; throw new IllegalArgumentException( message ); } if (l <0.0f || l > 100.0f) { - String message = "Color parameter outside of expected range - Luminance"; + String message = "Color parameter outside of expected range - Luminance: " + l; throw new IllegalArgumentException( message ); } if (alpha <0.0f || alpha > 1.0f) { - String message = "Color parameter outside of expected range - Alpha"; + String message = "Color parameter outside of expected range - Alpha: " + alpha; throw new IllegalArgumentException( message ); } -- 2.39.5