Changeset 941

Show
Ignore:
Timestamp:
08/08/06 16:58:40
Author:
douglm
Message:

Dave Brondsema patches to fix my rfc mistypes, add some extra exception info and sort admin group memebers

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AdminGroupsDbImpl.java

    r661 r941  
    6464import java.util.Collection; 
    6565import java.util.Iterator; 
     66import java.util.Set; 
    6667import java.util.TreeSet; 
    6768 
    …… 
    103104    } 
    104105 
    105     Collection gs = sess.getList(); 
     106    Set gs = new TreeSet(sess.getList()); 
    106107 
    107108    if (val instanceof BwUser) { 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDateTime.java

    r862 r941  
    7070import net.fortuna.ical4j.model.property.DtStart; 
    7171 
    72 /** Class to represent an RFC2554 date and datetime type. These are not stored 
     72/** Class to represent an RFC2445 date and datetime type. These are not stored 
    7373 * in separate tables but as components of the including class. 
    7474 * 
    …… 
    9090  private String tzid; 
    9191 
    92   private String dtval; // rfc2554 date or datetime value 
     92  private String dtval; // rfc2445 date or datetime value 
    9393 
    9494  /**   */ 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/BwRecurrenceId.java

    r2 r941  
    5454package org.bedework.calfacade; 
    5555 
    56 /** Class to represent an RFC2554 recurrence id type. These are not stored 
     56/** Class to represent an RFC2445 recurrence id type. These are not stored 
    5757 * in separate tables but as components of the including class. 
    5858 * 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/BwTimeZone.java

    r678 r941  
    5858 
    5959/** Represents a stored timezone. This whole area is somewhat problematical, 
    60  * RFC2554 refers to timezones by tzid but thereis as yet not statndard 
     60 * RFC2445 refers to timezones by tzid but thereis as yet not statndard 
    6161 * source for timezones, nor any standard way of naming them. 
    6262 * 
    …… 
    7676  private String tzid; 
    7777 
    78   private String vtimezone; // rfc2554 representation 
     78  private String vtimezone; // rfc2445 representation 
    7979 
    8080  /** This is the corresponding java.util.TimeZone id. 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeException.java

    r507 r941  
    179179    return extra; 
    180180  } 
     181 
     182  /** 
     183   * Overrides parent 
     184   * @return String message and 'extra' 
     185   */ 
     186  public String getMessage() { 
     187    if (getExtra() != null) { 
     188      return super.getMessage() + "\t" + getExtra(); 
     189    } 
     190 
     191    return super.getMessage(); 
     192  } 
    181193} 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwPreferences.java

    r678 r941  
    323323    Collection c = getSubscriptions(); 
    324324    if (c.contains(val)) { 
    325       throw new CalFacadeException(CalFacadeException.duplicateSubscription); 
     325      throw new CalFacadeException(CalFacadeException.duplicateSubscription, 
     326                                   val.toString()); 
    326327    } 
    327328    c.add(val);