[freenet-cvs] r13776 - trunk/freenet/src/freenet/support

[sback at freenetproject.org]

Author: sback
Date: 2007-06-27 12:22:42 +0000 (Wed, 27 Jun 2007)
New Revision: 13776

Modified:
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Added a few methods to respect put-get consistency

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java	2007-06-27 10:12:44 UTC (rev 13775)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java	2007-06-27 12:22:42 UTC (rev 13776)
@@ -674,6 +674,16 @@
 		}
 	}
 
+	public double getDouble(String key) throws FSParseException {
+		String s = get(key);
+		if(s == null) throw new FSParseException("No key "+key);
+		try {
+			return Double.parseDouble(s);
+		} catch (NumberFormatException e) {
+			throw new FSParseException("Cannot parse "+s+" for integer "+key);
+		}
+	}
+	
 	public long getLong(String key, long def) {
 		String s = get(key);
 		if(s == null) return def;
@@ -693,6 +703,44 @@
 			throw new FSParseException("Cannot parse "+s+" for long "+key);
 		}
 	}
+	
+	public short getShort(String key) throws FSParseException {
+		String s = get(key);
+		if(s == null) throw new FSParseException("No key "+key);
+		try {
+			return Short.parseShort(s);
+		} catch (NumberFormatException e) {
+			throw new FSParseException("Cannot parse "+s+" for short "+key);
+		}
+	}
+	
+	public short getShort(String key, short def) {
+		String s = get(key);
+		if(s == null) return def;
+		try {
+			return Short.parseShort(s);
+		} catch (NumberFormatException e) {
+			return def;
+		}
+	}
+	
+	public char getChar(String key) throws FSParseException {
+		String s = get(key);
+		if(s == null) throw new FSParseException("No key "+key);
+			if (s.length() == 1)
+				return s.charAt(0);
+			else
+				throw new FSParseException("Cannot parse "+s+" for char "+key);
+	} 
+	
+	public char getChar(String key, char def) {
+		String s = get(key);
+		if(s == null) return def;
+			if (s.length() == 1)
+				return s.charAt(0);
+			else
+				return def;
+	} 
 
 	public boolean getBoolean(String key, boolean def) {
 		return Fields.stringToBool(get(key), def);