X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosPreferencesBackend.java;h=559cff07a057412b2b98e19fd312769c61b3793b;hp=9131ad39b5d0c72190c5e7967bfa6a2814675a0f;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe

diff --git a/altoslib/AltosPreferencesBackend.java b/altoslib/AltosPreferencesBackend.java
index 9131ad39..559cff07 100644
--- a/altoslib/AltosPreferencesBackend.java
+++ b/altoslib/AltosPreferencesBackend.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
@@ -38,16 +39,20 @@ public abstract class AltosPreferencesBackend {
 	public abstract byte[]  getBytes(String key, byte[] def);
 	public abstract void    putBytes(String key, byte[] value);
 
-	public AltosHashSet	getHashSet(String key) {
+	public AltosJson	getJson(String key) {
 		String	value = getString(key, null);
 
 		if (value == null)
 			return null;
-		return AltosHashSet.fromString(value);
+		try {
+			return AltosJson.fromString(value);
+		} catch (IllegalArgumentException ie) {
+			return null;
+		}
 	}
 
-	public void	       	putHashSet(String key, AltosHashSet h) {
-		putString(key, h.toString());
+	public void	       	putJson(String key, AltosJson j) {
+		putString(key, j.toString());
 	}
 
 	public abstract boolean nodeExists(String key);