From 5408d01b9cf414f86c891ae21cd809db0b35cee9 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Sat, 12 Mar 2016 22:19:53 +1100 Subject: [PATCH] call hasValue() --- src/com/bytezone/diskbrowser/visicalc/Count.java | 4 +--- src/com/bytezone/diskbrowser/visicalc/Max.java | 4 +--- src/com/bytezone/diskbrowser/visicalc/Min.java | 4 +--- src/com/bytezone/diskbrowser/visicalc/Sum.java | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/bytezone/diskbrowser/visicalc/Count.java b/src/com/bytezone/diskbrowser/visicalc/Count.java index b53b7f2..80606d2 100644 --- a/src/com/bytezone/diskbrowser/visicalc/Count.java +++ b/src/com/bytezone/diskbrowser/visicalc/Count.java @@ -23,9 +23,7 @@ public class Count extends Function @Override public double getValue () { - if (!hasChecked) - calculate (); - return hasValue ? count : 0; + return hasValue () ? count : 0; } private void calculate () diff --git a/src/com/bytezone/diskbrowser/visicalc/Max.java b/src/com/bytezone/diskbrowser/visicalc/Max.java index 30d4dbf..04ca6a0 100644 --- a/src/com/bytezone/diskbrowser/visicalc/Max.java +++ b/src/com/bytezone/diskbrowser/visicalc/Max.java @@ -23,9 +23,7 @@ public class Max extends Function @Override public double getValue () { - if (!hasChecked) - calculate (); - return hasValue ? max : 0; + return hasValue () ? max : 0; } private void calculate () diff --git a/src/com/bytezone/diskbrowser/visicalc/Min.java b/src/com/bytezone/diskbrowser/visicalc/Min.java index 236f570..3cbe645 100644 --- a/src/com/bytezone/diskbrowser/visicalc/Min.java +++ b/src/com/bytezone/diskbrowser/visicalc/Min.java @@ -23,9 +23,7 @@ public class Min extends Function @Override public double getValue () { - if (!hasChecked) - calculate (); - return hasValue ? min : 0; + return hasValue () ? min : 0; } private void calculate () diff --git a/src/com/bytezone/diskbrowser/visicalc/Sum.java b/src/com/bytezone/diskbrowser/visicalc/Sum.java index 43bc854..84020dc 100644 --- a/src/com/bytezone/diskbrowser/visicalc/Sum.java +++ b/src/com/bytezone/diskbrowser/visicalc/Sum.java @@ -23,9 +23,7 @@ public class Sum extends Function @Override public double getValue () { - if (!hasChecked) - calculate (); - return hasValue ? sum : 0; + return hasValue () ? sum : 0; } public void calculate ()