altoslib: Use reflection JSON code for frequency preferences

[fw/altos] / altoslib / AltosPreferences.java

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 8e625674840c964ecf6335b1918d58a2e3347807..51fc4205e6b79fa987376ee068cb5b80a30d7ac3 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -135,23 +135,11 @@ public class AltosPreferences {
        public static AltosFrequency[] load_common_frequencies() {
                AltosFrequency[] frequencies = null;
 
-               AltosJson sets;
-
                try {
-                       sets = AltosJson.fromString(backend.getString(frequenciesPreference,null));
-
-                       if (sets != null) {
-                               ArrayList<AltosFrequency>       freqs = new ArrayList<AltosFrequency>();
-
-                               for (int i = 0; i < sets.size(); i++) {
-                                       AltosFrequency f = AltosFrequency.fromJson(sets.get(i), null);
-                                       if (f != null)
-                                               freqs.add(f);
-                               }
-                               frequencies = freqs.toArray(new AltosFrequency[0]);
-                       }
+                       AltosJson json = AltosJson.fromString(backend.getString(frequenciesPreference,
+                                                                               null));
+                       frequencies = (AltosFrequency[]) json.make(frequencies.getClass());
                } catch (Exception e) {
-                       sets = null;
                }
 
                if (frequencies == null) {