Skip to content

Commit cce9a03

Browse files
authored
Merge pull request #462 from BuZZ-dEE/master
Remove double ImagingException
2 parents 758002d + 9956daf commit cce9a03

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@ public void removeXmpXml(final InputStream src, final OutputStream os) throws Im
101101
* @param src Byte array containing JPEG image data.
102102
* @param os OutputStream to write the image to.
103103
* @param xmpXml String containing XMP XML.
104-
* @throws ImagingException if it fails to read the JFIF segments
104+
* @throws ImagingException if it fails to read or write the JFIF segments
105105
* @throws IOException if it fails to read or write the data from the segments
106-
* @throws ImagingException if it fails to write the JFIF segments
107106
*/
108-
public void updateXmpXml(final byte[] src, final OutputStream os, final String xmpXml) throws ImagingException, IOException, ImagingException {
107+
public void updateXmpXml(final byte[] src, final OutputStream os, final String xmpXml) throws ImagingException, IOException {
109108
final ByteSource byteSource = ByteSource.array(src);
110109
updateXmpXml(byteSource, os, xmpXml);
111110
}
@@ -116,11 +115,10 @@ public void updateXmpXml(final byte[] src, final OutputStream os, final String x
116115
* @param byteSource ByteSource containing JPEG image data.
117116
* @param os OutputStream to write the image to.
118117
* @param xmpXml String containing XMP XML.
119-
* @throws ImagingException if it fails to read the JFIF segments
118+
* @throws ImagingException if it fails to read or write the JFIF segments
120119
* @throws IOException if it fails to read or write the data from the segments
121-
* @throws ImagingException if it fails to write the JFIF segments
122120
*/
123-
public void updateXmpXml(final ByteSource byteSource, final OutputStream os, final String xmpXml) throws ImagingException, IOException, ImagingException {
121+
public void updateXmpXml(final ByteSource byteSource, final OutputStream os, final String xmpXml) throws ImagingException, IOException {
124122
final JFIFPieces jfifPieces = analyzeJfif(byteSource);
125123
List<JFIFPiece> pieces = jfifPieces.pieces;
126124
pieces = removeXmpSegments(pieces);
@@ -146,11 +144,10 @@ public void updateXmpXml(final ByteSource byteSource, final OutputStream os, fin
146144
* @param src Image file.
147145
* @param os OutputStream to write the image to.
148146
* @param xmpXml String containing XMP XML.
149-
* @throws ImagingException if it fails to read the JFIF segments
147+
* @throws ImagingException if it fails to read or write the JFIF segments
150148
* @throws IOException if it fails to read or write the data from the segments
151-
* @throws ImagingException if it fails to write the JFIF segments
152149
*/
153-
public void updateXmpXml(final File src, final OutputStream os, final String xmpXml) throws ImagingException, IOException, ImagingException {
150+
public void updateXmpXml(final File src, final OutputStream os, final String xmpXml) throws ImagingException, IOException {
154151
final ByteSource byteSource = ByteSource.file(src);
155152
updateXmpXml(byteSource, os, xmpXml);
156153
}
@@ -161,11 +158,10 @@ public void updateXmpXml(final File src, final OutputStream os, final String xmp
161158
* @param src InputStream containing JPEG image data.
162159
* @param os OutputStream to write the image to.
163160
* @param xmpXml String containing XMP XML.
164-
* @throws ImagingException if it fails to read the JFIF segments
161+
* @throws ImagingException if it fails to read or write the JFIF segments
165162
* @throws IOException if it fails to read or write the data from the segments
166-
* @throws ImagingException if it fails to write the JFIF segments
167163
*/
168-
public void updateXmpXml(final InputStream src, final OutputStream os, final String xmpXml) throws ImagingException, IOException, ImagingException {
164+
public void updateXmpXml(final InputStream src, final OutputStream os, final String xmpXml) throws ImagingException, IOException {
169165
final ByteSource byteSource = ByteSource.inputStream(src, null);
170166
updateXmpXml(byteSource, os, xmpXml);
171167
}

0 commit comments

Comments
 (0)