From 6bd6e81f9b83b41b996f3ff35f71e474f9f73f49 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Tue, 13 Dec 2011 19:20:59 +0000 Subject: [PATCH] Move static function useSafetyChecks() to Application. --- src/net/sf/openrocket/startup/Application.java | 11 +++++++++++ src/net/sf/openrocket/util/Invalidator.java | 2 +- src/net/sf/openrocket/util/SafetyMutex.java | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/net/sf/openrocket/startup/Application.java b/src/net/sf/openrocket/startup/Application.java index dbe28f848..863776f79 100644 --- a/src/net/sf/openrocket/startup/Application.java +++ b/src/net/sf/openrocket/startup/Application.java @@ -31,6 +31,17 @@ public final class Application { setLogOutputLevel(LogLevel.DEBUG); } + /** + * Return whether to use additional safety code checks. + */ + public static boolean useSafetyChecks() { + // Currently default to false unless openrocket.debug.safetycheck is defined + String s = System.getProperty("openrocket.debug.safetycheck"); + if (s != null && !(s.equalsIgnoreCase("false") || s.equalsIgnoreCase("off"))) { + return true; + } + return false; + } /** * Retrieve the logger to be used in logging. By default this returns diff --git a/src/net/sf/openrocket/util/Invalidator.java b/src/net/sf/openrocket/util/Invalidator.java index 7b6781141..9e40c1029 100644 --- a/src/net/sf/openrocket/util/Invalidator.java +++ b/src/net/sf/openrocket/util/Invalidator.java @@ -10,7 +10,7 @@ import net.sf.openrocket.startup.Application; * @author Sampo Niskanen */ public class Invalidator implements Invalidatable { - private static final boolean USE_CHECKS = Prefs.useSafetyChecks(); + private static final boolean USE_CHECKS = Application.useSafetyChecks(); private static final LogHelper log = Application.getLogger(); diff --git a/src/net/sf/openrocket/util/SafetyMutex.java b/src/net/sf/openrocket/util/SafetyMutex.java index df0139b99..1e8267ebc 100644 --- a/src/net/sf/openrocket/util/SafetyMutex.java +++ b/src/net/sf/openrocket/util/SafetyMutex.java @@ -18,6 +18,7 @@ import net.sf.openrocket.startup.Application; * @author Sampo Niskanen */ public abstract class SafetyMutex { + private static final boolean USE_CHECKS = Application.useSafetyChecks(); private static final LogHelper log = Application.getLogger(); @@ -28,7 +29,7 @@ public abstract class SafetyMutex { * @return a new instance of a safety mutex */ public static SafetyMutex newInstance() { - if (Prefs.useSafetyChecks()) { + if (USE_CHECKS) { return new ConcreteSafetyMutex(); } else { return new BogusSafetyMutex();