Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95BEF18F05 for ; Wed, 17 Feb 2016 18:01:57 +0000 (UTC) Received: (qmail 88597 invoked by uid 500); 17 Feb 2016 18:01:57 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 88574 invoked by uid 500); 17 Feb 2016 18:01:57 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 88565 invoked by uid 99); 17 Feb 2016 18:01:57 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Feb 2016 18:01:57 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 11578C0998 for ; Wed, 17 Feb 2016 18:01:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.794 X-Spam-Level: * X-Spam-Status: No, score=1.794 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7Q5SNCybs2EV for ; Wed, 17 Feb 2016 18:01:55 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id C7F74684E9 for ; Wed, 17 Feb 2016 17:27:13 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id DE40AE00B0 for ; Wed, 17 Feb 2016 17:27:12 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DD44C3A039C for ; Wed, 17 Feb 2016 17:27:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1730881 - in /pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight: content/ContentStreamEngine.java graphic/ColorSpaces.java graphic/DeviceColorSpaceHelper.java graphic/StandardColorSpaceHelper.java Date: Wed, 17 Feb 2016 17:27:12 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160217172712.DD44C3A039C@svn01-us-west.apache.org> Author: tilman Date: Wed Feb 17 17:27:12 2016 New Revision: 1730881 URL: http://svn.apache.org/viewvc?rev=1730881&view=rev Log: PDFBOX-3235: rename colorspaces like in 2.0; improve message Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ColorSpaces.java pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java?rev=1730881&r1=1730880&r2=1730881&view=diff ============================================================================== --- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java (original) +++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java Wed Feb 17 17:27:12 2016 @@ -341,7 +341,7 @@ public abstract class ContentStreamEngin if (cs == null) { - registerError("The ColorSpace is unknown", ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY); + registerError("The ColorSpace " + colorSpace + " is unknown", ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY); return; } } @@ -597,7 +597,7 @@ public abstract class ContentStreamEngin if (cs == null) { - registerError("The ColorSpace is unknown", ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY); + registerError("The ColorSpace " + colorSpaceName + " is unknown", ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY); return; } Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ColorSpaces.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ColorSpaces.java?rev=1730881&r1=1730880&r2=1730881&view=diff ============================================================================== --- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ColorSpaces.java (original) +++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ColorSpaces.java Wed Feb 17 17:27:12 2016 @@ -29,9 +29,9 @@ package org.apache.pdfbox.preflight.grap public enum ColorSpaces { - Lab("Lab"), CalRGB("CalRGB"), CalGray("CalGray"), DeviceN("DeviceN"), Indexed("Indexed"), Indexed_SHORT("I"), Pattern( - "Pattern"), ICCBased("ICCBased"), DeviceRGB("DeviceRGB"), DeviceRGB_SHORT("RGB"), DeviceGray("DeviceGray"), DeviceGray_SHORT( - "G"), DeviceCMYK("DeviceCMYK"), DeviceCMYK_SHORT("CMYK"), Separation("Separation"); + Lab("Lab"), CalRGB("CalRGB"), CalGray("CalGray"), DeviceN("DeviceN"), Indexed("Indexed"), I("I"), Pattern( + "Pattern"), ICCBased("ICCBased"), DeviceRGB("DeviceRGB"), RGB("RGB"), DeviceGray("DeviceGray"), G( + "G"), DeviceCMYK("DeviceCMYK"), CMYK("CMYK"), Separation("Separation"); /** * Name of the ColorSpace Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java?rev=1730881&r1=1730880&r2=1730881&view=diff ============================================================================== --- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java (original) +++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java Wed Feb 17 17:27:12 2016 @@ -79,7 +79,7 @@ public class DeviceColorSpaceHelper exte switch (colorSpace) { case Indexed: - case Indexed_SHORT: + case I: case Pattern: context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_FORBIDDEN, colorSpace .getLabel() + " ColorSpace is forbidden")); Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1730881&r1=1730880&r2=1730881&view=diff ============================================================================== --- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java (original) +++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Wed Feb 17 17:27:12 2016 @@ -96,9 +96,6 @@ public class StandardColorSpaceHelper im * * @param pdcs * the color space object to check. - * @param result - * the list of error to update if the validation fails. - * @return true if the validation succeed, false otherwise. */ protected final void processAllColorSpace(PDColorSpace pdcs) { @@ -107,11 +104,11 @@ public class StandardColorSpaceHelper im switch (cs) { case DeviceRGB: - case DeviceRGB_SHORT: + case RGB: processRGBColorSpace(pdcs); break; case DeviceCMYK: - case DeviceCMYK_SHORT: + case CMYK: processCYMKColorSpace(pdcs); break; case CalRGB: @@ -120,7 +117,7 @@ public class StandardColorSpaceHelper im processCalibratedColorSpace(pdcs); break; case DeviceGray: - case DeviceGray_SHORT: + case G: processGrayColorSpace(pdcs); break; case ICCBased: @@ -130,7 +127,7 @@ public class StandardColorSpaceHelper im processDeviceNColorSpace(pdcs); break; case Indexed: - case Indexed_SHORT: + case I: processIndexedColorSpace(pdcs); break; case Separation: @@ -353,7 +350,7 @@ public class StandardColorSpaceHelper im { PDColorSpace based = indexed.getBaseColorSpace(); ColorSpaces cs = ColorSpaces.valueOf(based.getName()); - if (cs == ColorSpaces.Indexed || cs == ColorSpaces.Indexed_SHORT) + if (cs == ColorSpaces.Indexed || cs == ColorSpaces.I) { context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_INDEXED, "Indexed color space can't be used as Base color space")); @@ -398,7 +395,7 @@ public class StandardColorSpaceHelper im case DeviceN: case Pattern: case Indexed: - case Indexed_SHORT: + case I: context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_ALTERNATE, acs .getLabel() + " color space can't be used as alternate color space")); break;