From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Mon, 12 Dec 2011 21:24:01 +0000 (+0000)
Subject: Move getDPI to GUIUtil.
X-Git-Tag: upstream/12.03~1^2~252
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b30cf77aa2bf4b724c60399a85dcae5fefde8e57;p=debian%2Fopenrocket

Move getDPI to GUIUtil.

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

diff --git a/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java b/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java
index 02fbac58..e22243de 100644
--- a/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java
+++ b/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 import javax.swing.JPanel;
 
-import net.sf.openrocket.util.Prefs;
+import net.sf.openrocket.gui.util.GUIUtil;
 import net.sf.openrocket.util.StateChangeListener;
 
 
@@ -32,7 +32,7 @@ public abstract class AbstractScaleFigure extends JPanel implements ScaleFigure
 	
 	
 	public AbstractScaleFigure() {
-		this.dpi = Prefs.getDPI();
+		this.dpi = GUIUtil.getDPI();
 		this.scaling = 1.0;
 		this.scale = dpi / 0.0254 * scaling;
 		
diff --git a/src/net/sf/openrocket/gui/util/GUIUtil.java b/src/net/sf/openrocket/gui/util/GUIUtil.java
index 34258d58..1123e652 100644
--- a/src/net/sf/openrocket/gui/util/GUIUtil.java
+++ b/src/net/sf/openrocket/gui/util/GUIUtil.java
@@ -7,6 +7,7 @@ import java.awt.Font;
 import java.awt.Image;
 import java.awt.KeyboardFocusManager;
 import java.awt.Point;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -108,7 +109,26 @@ public class GUIUtil {
 		}
 	}
 	
+	/**
+	 * Return the DPI setting of the monitor.  This is either the setting provided
+	 * by the system or a user-specified DPI setting.
+	 * 
+	 * @return    the DPI setting to use.
+	 */
+	public static double getDPI() {
+		int dpi = Prefs.getInt("DPI", 0); // Tenths of a dpi
+		
+		if (dpi < 10) {
+			dpi = Toolkit.getDefaultToolkit().getScreenResolution() * 10;
+		}
+		if (dpi < 10)
+			dpi = 960;
+		
+		return (dpi) / 10.0;
+	}
 	
+	
+
 
 	/**
 	 * Set suitable options for a single-use disposable dialog.  This includes
diff --git a/src/net/sf/openrocket/util/Prefs.java b/src/net/sf/openrocket/util/Prefs.java
index dfe05a1d..88822fa7 100644
--- a/src/net/sf/openrocket/util/Prefs.java
+++ b/src/net/sf/openrocket/util/Prefs.java
@@ -3,7 +3,6 @@ package net.sf.openrocket.util;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Point;
-import java.awt.Toolkit;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -591,31 +590,14 @@ public class Prefs {
 	}
 	
 	
-	/**
-	 * Return the DPI setting of the monitor.  This is either the setting provided
-	 * by the system or a user-specified DPI setting.
-	 * 
-	 * @return    the DPI setting to use.
-	 */
-	public static double getDPI() {
-		int dpi = PREFNODE.getInt("DPI", 0); // Tenths of a dpi
-		
-		if (dpi < 10) {
-			dpi = Toolkit.getDefaultToolkit().getScreenResolution() * 10;
-		}
-		if (dpi < 10)
-			dpi = 960;
-		
-		return (dpi) / 10.0;
-	}
-	
-	
 	public static double getDefaultMach() {
 		// TODO: HIGH: implement custom default mach number
 		return 0.3;
 	}
 	
-	
+	public static int getInt( String key, int defaultValue ) {
+		return PREFNODE.getInt(key, defaultValue);
+	}
 
 
 	public static Material getDefaultComponentMaterial(