Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosuilib / AltosUIPreferences.java

diff --git a/altosuilib/AltosUIPreferences.java b/altosuilib/AltosUIPreferences.java
index 9760494c74f7bea6193611f8a70d7c650493d526..e93784429929bb36393353b686704d532d8ca53f 100644 (file)
--- a/altosuilib/AltosUIPreferences.java
+++ b/altosuilib/AltosUIPreferences.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_6;
+package org.altusmetrum.altosuilib_7;
 
 import java.io.*;
 import java.util.*;
 import java.awt.Component;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_7.*;
 
 public class AltosUIPreferences extends AltosPreferences {
 
@@ -55,10 +55,6 @@ public class AltosUIPreferences extends AltosPreferences {
 
        public static int position = AltosUILib.position_top_left;
 
-       static LinkedList<AltosUIMapCacheListener> map_cache_listeners;
-
-       public static int map_cache = 9;
-
        public static void init() {
                AltosPreferences.init(new AltosUIPreferencesBackend());
 
@@ -75,9 +71,6 @@ public class AltosUIPreferences extends AltosPreferences {
 
                position = backend.getInt(positionPreference, AltosUILib.position_top_left);
                position_listeners = new LinkedList<AltosPositionListener>();
-
-               map_cache = backend.getInt(mapCachePreference, 9);
-               map_cache_listeners = new LinkedList<AltosUIMapCacheListener>();
        }
 
        static { init(); }
@@ -225,32 +218,4 @@ public class AltosUIPreferences extends AltosPreferences {
                        return position;
                }
        }
-
-       public static void register_map_cache_listener(AltosUIMapCacheListener l) {
-               synchronized(backend) {
-                       map_cache_listeners.add(l);
-               }
-       }
-
-       public static void unregister_map_cache_listener(AltosUIMapCacheListener l) {
-               synchronized (backend) {
-                       map_cache_listeners.remove(l);
-               }
-       }
-
-       public static void set_map_cache(int new_map_cache) {
-               synchronized(backend) {
-                       map_cache = new_map_cache;
-                       backend.putInt(mapCachePreference, map_cache);
-                       flush_preferences();
-                       for (AltosUIMapCacheListener l: map_cache_listeners)
-                               l.map_cache_changed(map_cache);
-               }
-       }
-
-       public static int map_cache() {
-               synchronized(backend) {
-                       return map_cache;
-               }
-       }
 }