[iCal4j-commit] ical4j-vcard/src/main/java/net/fortuna/ical4j/vcard Parameter.java, 1.15, 1.16

[Ben F. <fo...@us...>]

Update of /cvsroot/ical4j/ical4j-vcard/src/main/java/net/fortuna/ical4j/vcard
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10586/src/main/java/net/fortuna/ical4j/vcard

Modified Files:
	Parameter.java 
Log Message:
Updated parameters based on rev13

Index: Parameter.java
===================================================================
RCS file: /cvsroot/ical4j/ical4j-vcard/src/main/java/net/fortuna/ical4j/vcard/Parameter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Parameter.java	6 Mar 2010 12:49:50 -0000	1.15
--- Parameter.java	30 Oct 2010 09:39:32 -0000	1.16
***************
*** 32,35 ****
--- 32,37 ----
  package net.fortuna.ical4j.vcard;
  
+ import static org.apache.commons.lang.StringUtils.isNotEmpty;
+ 
  import java.io.Serializable;
  
***************
*** 53,56 ****
--- 55,60 ----
       */
      private static final long serialVersionUID = 6858428041113700722L;
+     
+ //    private static Map<String, Id> idFromPname = new HashMap<String, Id>();
  
      /**
***************
*** 69,73 ****
           */
          ENCODING,
-         
          /**
           * Value parameter identifier.
--- 73,76 ----
***************
*** 76,79 ****
--- 79,92 ----
          
          /**
+          * Pref parameter identifier.
+          */
+         PREF,
+         
+         /**
+          * Altid parameter identifier.
+          */
+         ALTID, 
+         
+         /**
           * PID parameter identifier.
           */
***************
*** 86,93 ****
          
          /**
!          * Pref parameter identifier.
           */
!         PREF,
          
          // 7.10. Extended Properties and Parameters
          
--- 99,131 ----
          
          /**
!          * Calscale parameter identifier.
           */
!         CALSCALE, 
!         
!         /**
!          * Sort-as parameter identifier.
!          */
!         SORT_AS("SORT-AS"), 
!         
!         /**
!          * Geo parameter identifier.
!          */
!         GEO, 
!         
!         /**
!          * Tz parameter identifier.
!          */
!         TZ, 
!         
!         /**
!          * Version parameter identifier.
!          */
!         VERSION, 
          
+         /**
+          * Fmttype parameter identifier.
+          */
+         FMTTYPE,
+ 
          // 7.10. Extended Properties and Parameters
          
***************
*** 95,99 ****
           * Non-standard parameter identifier.
           */
!         EXTENDED
      };
      
--- 133,158 ----
           * Non-standard parameter identifier.
           */
!         EXTENDED;
!         
!         private String pname;
! 
!         private Id() {
! //        	pname = this.name();
! //        	idFromPname.put(pname, this);
!         	this(null);
!         }
!         
!         private Id(String pname) {
!         	this.pname = pname;
! //        	idFromPname.put(pname, this);
!         }
!         
!         public String getPname() {
! //        	return pname;
!             if (isNotEmpty(pname)) {
!                 return pname;
!             }
!             return toString();
!         }
      };
      
***************
*** 102,105 ****
--- 161,168 ----
      String extendedName = "";
      
+     
+ //    public static Id getId(String pname) {
+ //    	return idFromPname.get(pname);
+ //    }
      /**
       * @param extendedName a non-standard parameter id
***************
*** 156,161 ****
          }
          else {
!             b.append(id);
          }
          if (getValue() != null) {
              b.append('=');
--- 219,250 ----
          }
          else {
!             b.append(id.getPname());
          }
+ /*
+         if (this instanceof MultiValued) {
+         	MultiValued mvp = (MultiValued)this;
+         	
+         	List<?> l = mvp.getValues();
+         	String delim = "";
+         	
+         	if (l != null) {
+     			b.append('=');
+         		for (Object o: l) {
+         			String v = String.valueOf(o);
+         			
+         			b.append(delim);
+         			addVal(b, v);
+         			delim=",";
+         		}
+         	}
+         } else {
+         	String v = getValue();
+         
+         	if (v != null) {
+         		b.append('=');
+         		addVal(b, v);
+             }
+         }
+ */
          if (getValue() != null) {
              b.append('=');
***************
*** 164,166 ****
--- 253,267 ----
          return b.toString();
      }
+ /*    
+     private void addVal(StringBuilder b, 
+     		String v) {
+         if (v.contains(";") || v.contains(":") || v.contains(",")) {
+             b.append('"');
+             b.append(v);
+             b.append('"');
+         } else {
+             b.append(v);
+         }
+     }
+ */
  }