Author: rwhitcomb
Date: Tue Jun 9 22:21:47 2015
New Revision: 1684545
URL: http://svn.apache.org/r1684545
Log:
Code cleanup: Use try-with-resources in the Image loading code to simplify.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java?rev=1684545&r1=1684544&r2=1684545&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java Tue Jun 9
22:21:47 2015
@@ -89,33 +89,21 @@ public abstract class Image implements V
public Image execute() throws TaskExecutionException {
Image image = null;
- try {
- InputStream inputStream = null;
+ // NOTE We don't open the stream until the callback executes
+ // because this is a potentially time-consuming operation
+ try (InputStream inputStream =
+ new MonitoredInputStream(new
BufferedInputStream(location.openStream()))) {
- try {
- // NOTE We don't open the stream until the callback
executes
- // because
- // this is a potentially time-consuming operation
- inputStream = new MonitoredInputStream(new
BufferedInputStream(
- location.openStream()));
-
- if
(location.getFile().endsWith(SVGDiagramSerializer.SVG_EXTENSION)) {
- SVGDiagramSerializer serializer = new
SVGDiagramSerializer();
- SVGDiagram diagram =
serializer.readObject(inputStream);
- image = new Drawing(diagram);
- } else {
- BufferedImageSerializer serializer = new
BufferedImageSerializer();
- BufferedImage bufferedImage =
serializer.readObject(inputStream);
- image = new Picture(bufferedImage);
- }
- } finally {
- if (inputStream != null) {
- inputStream.close();
- }
+ if
(location.getFile().endsWith(SVGDiagramSerializer.SVG_EXTENSION)) {
+ SVGDiagramSerializer serializer = new
SVGDiagramSerializer();
+ SVGDiagram diagram = serializer.readObject(inputStream);
+ image = new Drawing(diagram);
+ } else {
+ BufferedImageSerializer serializer = new
BufferedImageSerializer();
+ BufferedImage bufferedImage =
serializer.readObject(inputStream);
+ image = new Picture(bufferedImage);
}
- } catch (IOException exception) {
- throw new TaskExecutionException(exception);
- } catch (SerializationException exception) {
+ } catch (IOException | SerializationException exception) {
throw new TaskExecutionException(exception);
}
