Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AECA4105AF for ; Sun, 4 Jan 2015 17:15:25 +0000 (UTC) Received: (qmail 21754 invoked by uid 500); 4 Jan 2015 17:15:26 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 21677 invoked by uid 500); 4 Jan 2015 17:15:26 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 21667 invoked by uid 99); 4 Jan 2015 17:15:26 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jan 2015 17:15:26 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 98639AC010E; Sun, 4 Jan 2015 17:15:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1649366 - in /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders: CompressedDataReader.java DataReader.java UncompressedDataReader.java Date: Sun, 04 Jan 2015 17:15:22 -0000 To: commits@commons.apache.org From: britter@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150104171524.98639AC010E@hades.apache.org> Author: britter Date: Sun Jan 4 17:15:22 2015 New Revision: 1649366 URL: http://svn.apache.org/r1649366 Log: DataReader really is an interface Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java?rev=1649366&r1=1649365&r2=1649366&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java Sun Jan 4 17:15:22 2015 @@ -33,13 +33,14 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.psd.dataparsers.DataParser; import org.apache.commons.imaging.util.IoUtils; -public class CompressedDataReader extends DataReader { +public class CompressedDataReader implements DataReader { - public CompressedDataReader(final DataParser fDataParser) { - super(fDataParser); + private DataParser dataParser; + + public CompressedDataReader(final DataParser dataParser) { + this.dataParser = dataParser; } - @Override public void readData(final InputStream is, final BufferedImage bi, final ImageContents imageContents, final BinaryFileParser bfp) throws ImageReadException, IOException { Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java?rev=1649366&r1=1649365&r2=1649366&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java Sun Jan 4 17:15:22 2015 @@ -25,14 +25,10 @@ import org.apache.commons.imaging.common import org.apache.commons.imaging.formats.psd.ImageContents; import org.apache.commons.imaging.formats.psd.dataparsers.DataParser; -public abstract class DataReader { - protected final DataParser dataParser; +public interface DataReader { - public DataReader(final DataParser fDataParser) { - this.dataParser = fDataParser; - } - - public abstract void readData(InputStream is, BufferedImage bi, + void readData(InputStream is, BufferedImage bi, ImageContents imageContents, BinaryFileParser bfp) throws ImageReadException, IOException; + } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java?rev=1649366&r1=1649365&r2=1649366&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java Sun Jan 4 17:15:22 2015 @@ -30,12 +30,14 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.psd.dataparsers.DataParser; import org.apache.commons.imaging.util.IoUtils; -public class UncompressedDataReader extends DataReader { - public UncompressedDataReader(final DataParser fDataParser) { - super(fDataParser); +public class UncompressedDataReader implements DataReader { + + private DataParser dataParser; + + public UncompressedDataReader(final DataParser dataParser) { + this.dataParser = dataParser; } - @Override public void readData(final InputStream is, final BufferedImage bi, final ImageContents imageContents, final BinaryFileParser bfp) throws ImageReadException, IOException {