From 65b5dc69db3bfd08b4392dcee16fa0542b097812 Mon Sep 17 00:00:00 2001 From: "Gary D. Gregory" Date: Wed, 2 Apr 2008 16:07:54 +0000 Subject: [PATCH] Simplify branching. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@643952 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/commons/lang/CharRange.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/java/org/apache/commons/lang/CharRange.java b/src/java/org/apache/commons/lang/CharRange.java index 9cf6cdc2f..ea2d500d6 100644 --- a/src/java/org/apache/commons/lang/CharRange.java +++ b/src/java/org/apache/commons/lang/CharRange.java @@ -167,16 +167,13 @@ public boolean contains(CharRange range) { if (negated) { if (range.negated) { return start >= range.start && end <= range.end; - } else { - return range.end < start || range.start > end; - } - } else { - if (range.negated) { - return start == 0 && end == Character.MAX_VALUE; - } else { - return start <= range.start && end >= range.end; } + return range.end < start || range.start > end; } + if (range.negated) { + return start == 0 && end == Character.MAX_VALUE; + } + return start <= range.start && end >= range.end; } // Basics