X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FTypeInfo.java;h=c172996bdb64e939a1718787ac48111a3e4aa87c;hb=aecb3399b756d2ba04223bc6f553999fce73f9fb;hp=a1cc306d64d33a692aec043f6cc068f05be71fa2;hpb=e253bd50bb05519f4a16fed4fb95d5b3340128ea;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/TypeInfo.java b/src/be/nikiroo/jvcard/TypeInfo.java
index a1cc306..c172996 100644
--- a/src/be/nikiroo/jvcard/TypeInfo.java
+++ b/src/be/nikiroo/jvcard/TypeInfo.java
@@ -6,24 +6,49 @@ package be.nikiroo.jvcard;
  * @author niki
  *
  */
-@SuppressWarnings("rawtypes")
-public class TypeInfo extends BaseClass {
+public class TypeInfo extends BaseClass<TypeInfo> {
 	private String name;
 	private String value;
 
-	@SuppressWarnings("unchecked")
+	/**
+	 * Create a new {@link TypeInfo}.
+	 * 
+	 * @param name
+	 *            the name of this {@link TypeInfo} (<b>MUST NOT</b> be NULL)
+	 * @param value
+	 *            its value (<b>MUST NOT</b> be NULL)
+	 */
 	public TypeInfo(String name, String value) {
 		super(null);
 
-		this.name = name;
-		this.value = value;
+		this.name = name.toUpperCase();
+		this.value = escape(value.toString()); // crash NOW if null
 	}
 
+	/**
+	 * Return the name.
+	 * 
+	 * @return the name
+	 */
 	public String getName() {
 		return name;
 	}
 
+	/**
+	 * Return the value.
+	 * 
+	 * @return the value
+	 */
 	public String getValue() {
+		return unescape(value);
+	}
+
+	/**
+	 * Return the RAW value
+	 * 
+	 * @return the RAW value
+	 */
+	public String getRawValue() {
 		return value;
 	}
 
@@ -34,6 +59,6 @@ public class TypeInfo extends BaseClass {
 
 	@Override
 	public String getState() {
-		return "" + name + value;
+		return ("" + name + value).replace(' ', '_');
 	}
-}
\ No newline at end of file
+}