Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java @ 4413:c62598c372ab
FLYSUtils: Null-guard some conditionals (autoboxes).
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 05 Nov 2012 17:32:59 +0100 |
parents | 9dfec327acc6 |
children | e285630569dc |
comparison
equal
deleted
inserted
replaced
4412:1b4aaa7dbd07 | 4413:c62598c372ab |
---|---|
185 return isQ ? WQ_MODE.QGAUGE : WQ_MODE.WGAUGE; | 185 return isQ ? WQ_MODE.QGAUGE : WQ_MODE.WGAUGE; |
186 } | 186 } |
187 | 187 |
188 Boolean isFree = flys.getDataAsBoolean("wq_isfree"); | 188 Boolean isFree = flys.getDataAsBoolean("wq_isfree"); |
189 | 189 |
190 if (isQ) { | 190 if (isQ != null && isQ) { |
191 return isFree ? WQ_MODE.QFREE : WQ_MODE.QGAUGE; | 191 return isFree ? WQ_MODE.QFREE : WQ_MODE.QGAUGE; |
192 } | 192 } |
193 else if (!isQ) { | 193 else if (isQ != null && !isQ) { |
194 return isFree ? WQ_MODE.WFREE : WQ_MODE.WGAUGE; | 194 return isFree ? WQ_MODE.WFREE : WQ_MODE.WGAUGE; |
195 } | 195 } |
196 else { | 196 else { |
197 return WQ_MODE.NONE; | 197 return WQ_MODE.NONE; |
198 } | 198 } |