Always use blocks. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/imaging/trunk@1775886 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-imaging/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-imaging/commit/eb8be124 Tree: http://git-wip-us.apache.org/repos/asf/commons-imaging/tree/eb8be124 Diff: http://git-wip-us.apache.org/repos/asf/commons-imaging/diff/eb8be124 Branch: refs/heads/master Commit: eb8be124f7d1ebc75e3ed69c0a7d8802cea29d67 Parents: e6799d8 Author: Gary D. Gregory <ggreg...@apache.org> Authored: Fri Dec 23 18:50:18 2016 +0000 Committer: Gary D. Gregory <ggreg...@apache.org> Committed: Fri Dec 23 18:50:18 2016 +0000 ---------------------------------------------------------------------- .../org/apache/commons/imaging/color/ColorCmyk.java | 4 +++- .../commons/imaging/formats/pnm/PnmImageParser.java | 15 ++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/eb8be124/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java index fb4c4f0..da65fdf 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java @@ -128,7 +128,9 @@ public final class ColorCmyk { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) return false; + if (o == null || getClass() != o.getClass()) { + return false; + } ColorCmyk colorCmyk = (ColorCmyk) o; if (Double.compare(colorCmyk.C, C) != 0) { http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/eb8be124/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java index 3ae6b0b..4acd09d 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java @@ -156,28 +156,33 @@ public class PnmImageParser extends ImageParser { final String type = tokenizer.nextToken(); if ("WIDTH".equals(type)) { seenWidth = true; - if(!tokenizer.hasMoreTokens()) + if(!tokenizer.hasMoreTokens()) { throw new ImageReadException("PAM header has no WIDTH value"); + } width = Integer.parseInt(tokenizer.nextToken()); } else if ("HEIGHT".equals(type)) { seenHeight = true; - if(!tokenizer.hasMoreTokens()) + if(!tokenizer.hasMoreTokens()) { throw new ImageReadException("PAM header has no HEIGHT value"); + } height = Integer.parseInt(tokenizer.nextToken()); } else if ("DEPTH".equals(type)) { seenDepth = true; - if(!tokenizer.hasMoreTokens()) + if(!tokenizer.hasMoreTokens()) { throw new ImageReadException("PAM header has no DEPTH value"); + } depth = Integer.parseInt(tokenizer.nextToken()); } else if ("MAXVAL".equals(type)) { seenMaxVal = true; - if(!tokenizer.hasMoreTokens()) + if(!tokenizer.hasMoreTokens()) { throw new ImageReadException("PAM header has no MAXVAL value"); + } maxVal = Integer.parseInt(tokenizer.nextToken()); } else if ("TUPLTYPE".equals(type)) { seenTupleType = true; - if(!tokenizer.hasMoreTokens()) + if(!tokenizer.hasMoreTokens()) { throw new ImageReadException("PAM header has no TUPLTYPE value"); + } tupleType.append(tokenizer.nextToken()); } else if ("ENDHDR".equals(type)) { break;
