Changeset 300

Show
Ignore:
Timestamp:
03/24/06 10:34:44
Author:
douglm
Message:

More Vector -> ArrayList?
Fix bug in admin event update which added events even with validation errors.
Unblock access to locations/sponsors owned by others

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2 r300  
    7878                           (currentMode == publicAdminMode); 
    7979 
    80     boolean all = (currentMode == guestMode) || ignoreCreator; 
     80    //boolean all = (currentMode == guestMode) || ignoreCreator; 
     81    boolean all = publicEvents || ignoreCreator; 
    8182    boolean setUser = false; 
    8283 

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

    r278 r300  
    6969import java.sql.Connection; 
    7070import java.text.SimpleDateFormat; 
     71import java.util.ArrayList; 
    7172import java.util.Date; 
    7273import java.util.List; 
    73 import java.util.Vector; 
    7474 
    7575import org.apache.log4j.Logger; 
    …… 
    623623 
    624624      if (l == null) { 
    625         return new Vector(); 
     625        return new ArrayList(); 
    626626      } 
    627627 

  • trunk/calendar3/calEnv/src/org/bedework/calenv/CalEnv.java

    r295 r300  
    7777 
    7878  private static Properties getPr() throws CalEnvException { 
    79     if (pr != null) { 
    80       return pr; 
    81     } 
    82  
    8379    synchronized (lockit) { 
    8480      if (pr != null) { 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java

    r293 r300  
    208208    if (!form.getEventDates().updateEvent(event, svci.getTimezones())) { 
    209209      ok = false; 
    210     } else { 
    211       ok = BwWebUtil.validateEvent(svci, event, true, // ENUM  descriptionRequired 
    212                                    err); 
     210    } else if (!BwWebUtil.validateEvent(svci, event, true, // ENUM  descriptionRequired 
     211                                        err)) { 
     212      ok = false; 
    213213    } 
    214214 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java

    r293 r300  
    8989 
    9090import java.text.Collator; 
     91import java.util.ArrayList; 
    9192import java.util.Collection; 
    9293import java.util.Date; 
    …… 
    9596import java.util.Locale; 
    9697import java.util.TreeMap; 
    97 import java.util.Vector; 
    9898import javax.servlet.http.HttpServletRequest; 
    9999import org.apache.struts.action.ActionMapping; 
    …… 
    420420  public Collection getSysStats() { 
    421421    if (sysStats == null) { 
    422       sysStats = new Vector(); 
     422      sysStats = new ArrayList(); 
    423423    } 
    424424     
    …… 
    462462    } catch (Throwable t) { 
    463463      err.emit(t); 
    464       return new Vector(); 
     464      return new ArrayList(); 
    465465    } 
    466466  } 
    …… 
    12151215  public Collection getSubscriptions() { 
    12161216    if (subscriptions == null) { 
    1217       subscriptions = new Vector(); 
     1217      subscriptions = new ArrayList(); 
    12181218    } 
    12191219    return subscriptions; 
    …… 
    12811281  public Collection getCurrentSubscriptions() { 
    12821282    if (currentSubscriptions == null) { 
    1283       currentSubscriptions = new Vector(); 
     1283      currentSubscriptions = new ArrayList(); 
    12841284    } 
    12851285    return currentSubscriptions; 
    …… 
    20872087      } 
    20882088      err.emit(t); 
    2089       return new Vector(); 
     2089      return new ArrayList(); 
    20902090    } 
    20912091  } 
    …… 
    21122112      } 
    21132113      err.emit(t); 
    2114       return new Vector(); 
     2114      return new ArrayList(); 
    21152115    } 
    21162116  } 
    …… 
    21372137      } 
    21382138      err.emit(t); 
    2139       return new Vector(); 
     2139      return new ArrayList(); 
    21402140    } 
    21412141  } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/SetSelectionAction.java

    r272 r300  
    6363import org.bedework.webcommon.BwSession; 
    6464 
     65import java.util.ArrayList; 
    6566import java.util.Collection; 
    66 import java.util.Vector; 
    6767 
    6868import javax.servlet.http.HttpServletRequest; 
    …… 
    121121    } 
    122122 
    123     Collection c = new Vector(); 
     123    Collection c = new ArrayList(); 
    124124    c.add(sub.clone()); 
    125125    svci.setCurrentSubscriptions(c); 
    …… 
    151151    BwSubscription sub = BwSubscription.makeSubscription(cal); 
    152152 
    153     Collection c = new Vector(); 
     153    Collection c = new ArrayList(); 
    154154    c.add(sub); 
    155155    svci.setCurrentSubscriptions(c);