From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Tue, 13 Dec 2011 19:20:59 +0000 (+0000)
Subject: Move static function useSafetyChecks() to Application.
X-Git-Tag: upstream/12.03~1^2~242
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=64e81838cf6915cf57151f7ece0b35ec65b7cf46;p=debian%2Fopenrocket

Move static function useSafetyChecks() to Application.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@228 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/src/net/sf/openrocket/startup/Application.java b/src/net/sf/openrocket/startup/Application.java
index dbe28f84..863776f7 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 7b678114..9e40c102 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 <sampo.niskanen@iki.fi>
  */
 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 df0139b9..1e8267eb 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 <sampo.niskanen@iki.fi>
  */
 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();