From 8df6afe843e184e98e5d965cee3af562dfa30a3b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 17 Jun 2016 00:01:15 -0700 Subject: [PATCH] altoslib: Use reflection JSON code for frequency preferences This replaces the non-reflective JSON code with reflective code, which is much shorter. Signed-off-by: Keith Packard --- altoslib/AltosPreferences.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index 8e625674..51fc4205 100644 --- 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 freqs = new ArrayList(); - - 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) { -- 2.30.2