Changeset 297

Show
Ignore:
Timestamp:
03/22/06 15:46:41
Author:
douglm
Message:

Fixes to personal client.
Use ArrayList? instead of Vector

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/FormattedEvents.java

    r128 r297  
    5959 
    6060import java.util.AbstractCollection; 
     61import java.util.ArrayList; 
    6162import java.util.Collection; 
    6263import java.util.Iterator; 
    63 import java.util.Vector; 
    6464 
    6565/** Object to provide a Collection of formatted BwEvent. 
    …… 
    8181                         CalendarInfo calInfo, CalTimezones ctz) { 
    8282    if (events == null) { 
    83       this.events = new Vector(); 
     83      this.events = new ArrayList(); 
    8484    } else { 
    8585      this.events = events; 

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java

    r273 r297  
    6767 
    6868import java.io.Serializable; 
     69import java.util.ArrayList; 
    6970import java.util.Collection; 
    7071import java.util.Date; 
    7172import java.util.Iterator; 
    7273import java.util.Locale; 
    73 import java.util.Vector; 
    7474 
    7575/** This class represents a view of the calendar from a startDate to an 
    …… 
    271271   */ 
    272272  public Collection getDaysEvents(MyCalendarVO date) throws Throwable { 
    273     Vector v = new Vector(); 
     273    ArrayList al = new ArrayList(); 
    274274    CalTimezones tzcache = cal.getTimezones(); 
    275275//    Dur oneDay = new Dur(1, 0, 0, 0); 
    …… 
    332332                   ": " + ev.getSummary()); 
    333333        } 
    334         v.add(ei); 
    335       } 
    336     } 
    337  
    338     return v; 
     334        al.add(ei); 
     335      } 
     336    } 
     337 
     338    return al; 
    339339  } 
    340340 
    …… 
    426426      GtpiData gtpi = new GtpiData(); 
    427427 
    428       Vector months = new Vector(); 
    429       Vector weeks = new Vector(); 
     428      ArrayList months = new ArrayList(); 
     429      ArrayList weeks = new ArrayList(); 
    430430 
    431431      gtpi.first = getFirstDay(); 
    …… 
    467467 
    468468        weekTvdi.setEntries(getOneWeekTvdi(gtpi)); 
    469         weeks.addElement(weekTvdi); 
     469        weeks.add(weekTvdi); 
    470470 
    471471        if (getFirstDayOfWeek() == gtpi.currentDay.getDayOfWeek()) { 
    …… 
    484484             (TimeViewDailyInfo[])weeks.toArray(new TimeViewDailyInfo[ 
    485485                  weeks.size()])); 
    486           months.addElement(monthTvdi); 
     486          months.add(monthTvdi); 
    487487 
    488488          if (gtpi.isLast) { 
    …… 
    497497          monthTvdi = new TimeViewDailyInfo(calInfo); 
    498498          initTvdi(monthTvdi, gtpi); 
    499           weeks = new Vector(); 
     499          weeks = new ArrayList(); 
    500500        } 
    501501      } 
    …… 
    547547   */ 
    548548  private TimeViewDailyInfo[] getOneWeekTvdi(GtpiData gtpi) throws Throwable { 
    549     Vector days = new Vector(); 
     549    ArrayList days = new ArrayList(); 
    550550    TimeViewDailyInfo tvdi; 
    551551 
    …… 
    562562      tvdi.setFiller(true); 
    563563 
    564       days.addElement(tvdi); 
     564      days.add(tvdi); 
    565565      dayNum++; 
    566566 
    …… 
    610610      tvdi.setLastDayOfWeek(calInfo.getLastDayOfWeek() == dayOfWeek); 
    611611 
    612       days.addElement(tvdi); 
     612      days.add(tvdi); 
    613613      gtpi.isFirst = false; 
    614614 
    …… 
    633633      tvdi.setFiller(true); 
    634634 
    635       days.addElement(tvdi); 
     635      days.add(tvdi); 
    636636    } 
    637637 

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeViewDailyInfo.java

    r27 r297  
    5858 
    5959import java.io.Serializable; 
     60import java.util.ArrayList; 
    6061import java.util.Collection; 
    6162import java.util.Iterator; 
    62 import java.util.Vector; 
     63 
    6364import org.apache.log4j.Logger; 
    6465 
    …… 
    557558      if (eventFormatters == null) { 
    558559        if (events == null) { 
    559           return new Vector(); 
     560          return new ArrayList(); 
    560561        } 
    561562 
    562         eventFormatters = new Vector(); 
     563        eventFormatters = new ArrayList(); 
    563564        Iterator it = events.iterator(); 
    564565 

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeZonesParser.java

    r18 r297  
    7171import java.io.InputStream; 
    7272import java.io.InputStreamReader; 
     73import java.util.ArrayList; 
    7374import java.util.Collection; 
    7475import java.util.Iterator; 
    75 import java.util.Vector; 
    7676 
    7777import javax.xml.parsers.DocumentBuilder; 
    …… 
    138138    DirClass rootDir = parseTzDefs(new InputStreamReader(inStr)); 
    139139 
    140     Vector v = new Vector(); 
    141  
    142     doDir(v, rootDir, ""); 
    143  
    144     return v; 
    145   } 
    146  
    147   private String doDir(Vector v, DirClass dir, String indent) throws CalFacadeException { 
     140    ArrayList al = new ArrayList(); 
     141 
     142    doDir(al, rootDir, ""); 
     143 
     144    return al; 
     145  } 
     146 
     147  private String doDir(ArrayList al, DirClass dir, String indent) throws CalFacadeException { 
    148148    if (debug) { 
    149149      trace(indent + "Dir: " + dir.cal.getName()); 
    …… 
    152152    Iterator dit = dir.dirs.iterator(); 
    153153    while (dit.hasNext()) { 
    154       doDir(v, (DirClass)dit.next(), indent + "  "); 
     154      doDir(al, (DirClass)dit.next(), indent + "  "); 
    155155    } 
    156156 
    …… 
    177177      tzi.tzid = IcalUtil.getProperty(tzi.timezone, Property.TZID).getValue(); 
    178178 
    179       v.add(tzi); 
     179      al.add(tzi); 
    180180 
    181181      if (debug) { 
    …… 
    190190    BwCalendar cal; // The name will be set according to the dir/name 
    191191 
    192     Collection dirs = new Vector(); 
     192    Collection dirs = new ArrayList(); 
    193193 
    194194    /* Collection of Calendar obects 
    195195     */ 
    196     Collection tzs = new Vector(); 
     196    Collection tzs = new ArrayList(); 
    197197  } 
    198198 

  • trunk/calendar3/bldfiles/buildwar.xml

    r293 r297  
    386386    <replace file="${app.dest.webinf}/jboss-web.xml"> 
    387387      <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken> 
    388       <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host>> 
     388      <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host> 
    389389      ]]> 
    390390      </replacevalue> 

  • trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java

    r293 r297  
    5555package edu.rpi.cct.uwcal.caldav; 
    5656 
    57 import org.bedework.calenv.CalEnv; 
    5857import org.bedework.calfacade.BwCalendar; 
    5958import org.bedework.calfacade.BwEvent; 
    …… 
    8988import edu.rpi.cct.webdav.servlet.shared.WebdavTags; 
    9089 
    91 import edu.rpi.sss.util.jsp.JspUtil; 
    9290import edu.rpi.sss.util.xml.QName; 
    9391 
    …… 
    9795import java.net.URI; 
    9896import java.net.URLDecoder; 
     97import java.util.ArrayList; 
    9998import java.util.Collection; 
    10099import java.util.Enumeration; 
    …… 
    102101import java.util.Iterator; 
    103102import java.util.Properties; 
    104 import java.util.Vector; 
     103 
     104import javax.servlet.ServletContext; 
    105105import javax.servlet.http.HttpServletRequest; 
     106import javax.servlet.http.HttpSession; 
    106107 
    107108import org.w3c.dom.Element; 
    …… 
    177178    super.init(servlet, req, props, debug); 
    178179     
    179     String contextRoot = JspUtil.getContext(req); 
    180      
    181     if ((contextRoot != null) && (contextRoot.startsWith("/"))) { 
    182       contextRoot = contextRoot.substring(1); 
    183     } 
    184      
    185     if ((contextRoot == null) || (contextRoot.length() == 0)) { 
    186       contextRoot = "root"; 
    187     } 
    188      
    189     try { 
    190       envPrefix = CalEnv.getProperty("org.bedework.envprefix." + contextRoot); 
     180    try { 
     181      HttpSession session = req.getSession(); 
     182      ServletContext sc = session.getServletContext(); 
     183       
     184      String appName = sc.getInitParameter("bwappname"); 
     185       
     186      if ((appName == null) || (appName.length() == 0)) { 
     187        appName = "unknown-app-name"; 
     188      } 
     189       
     190      envPrefix = "org.bedework.app." + appName + "."; 
    191191       
    192192      namespacePrefix = WebdavUtils.getUrlPrefix(req); 
    …… 
    316316      CaldavBwNode uwnode = getBwnode(node); 
    317317 
    318       Vector v = new Vector(); 
     318      ArrayList al = new ArrayList(); 
    319319 
    320320      if (!uwnode.getCollection()) { 
    321321        // Don't think we should have been called 
    322         return v.iterator(); 
     322        return al.iterator(); 
    323323      } 
    324324 
    …… 
    362362          } 
    363363 
    364           v.addElement(new CaldavCalNode(wi, svci, trans, debug)); 
     364          al.add(new CaldavCalNode(wi, svci, trans, debug)); 
    365365        } else { 
    366366          if (debug) { 
    …… 
    370370          CaldavComponentNode cnode = new CaldavComponentNode(wi, svci, trans, debug); 
    371371          cnode.addEvent(ev); 
    372           v.addElement(cnode); 
    373         } 
    374       } 
    375  
    376       return v.iterator(); 
     372          al.add(cnode); 
     373        } 
     374      } 
     375 
     376      return al.iterator(); 
    377377    } catch (WebdavIntfException we) { 
    378378      throw we; 
    …… 
    713713    String who; 
    714714 
    715     Vector aces = new Vector(); 
     715    ArrayList aces = new ArrayList(); 
    716716  } 
    717717 
    …… 
    10651065     */ 
    10661066 
    1067     Collection evnodes = new Vector(); 
     1067    Collection evnodes = new ArrayList(); 
    10681068    HashMap evnodeMap = new HashMap(); 
    10691069 
    …… 
    11321132 
    11331133      Iterator it = freeBusy.getFreeBusy(svci, user).iterator(); 
    1134       Collection nodes = new Vector(); 
     1134      Collection nodes = new ArrayList(); 
    11351135 
    11361136      while (it.hasNext()) { 

  • trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

    r293 r297  
    9999import edu.rpi.cct.uwcal.resources.Resources; 
    100100 
     101import java.util.ArrayList; 
    101102import java.util.Collection; 
    102103import java.util.HashMap; 
    103104import java.util.Iterator; 
    104105import java.util.TreeSet; 
    105 import java.util.Vector; 
    106106 
    107107import net.fortuna.ical4j.model.component.VTimeZone; 
    …… 
    10061006      BwSubscription sub = BwSubscription.makeSubscription(cal); 
    10071007 
    1008       subs = new Vector(); 
     1008      subs = new ArrayList(); 
    10091009      subs.add(sub); 
    10101010    } else if (!currentUser().equals(who)) { 
    …… 
    19391939  private Collection postProcess(Collection evs, BwSubscription sub) 
    19401940          throws CalFacadeException { 
    1941     Vector v = new Vector(); 
     1941    ArrayList al = new ArrayList(); 
    19421942 
    19431943    Iterator it = evs.iterator(); 
    …… 
    19461946      BwEvent ev = (BwEvent)it.next(); 
    19471947      EventInfo ei = postProcess(ev, sub, null); 
    1948       v.addElement(ei); 
    1949     } 
    1950  
    1951     return v; 
     1948      al.add(ei); 
     1949    } 
     1950 
     1951    return al; 
    19521952  } 
    19531953 
    19541954  private Collection postProcess(Collection evs, HashMap sublookup) 
    19551955          throws CalFacadeException { 
    1956     Vector v = new Vector(); 
     1956    ArrayList al = new ArrayList(); 
    19571957 
    19581958    Iterator it = evs.iterator(); 
    …… 
    19611961      BwEvent ev = (BwEvent)it.next(); 
    19621962      EventInfo ei = postProcess(ev, null, sublookup); 
    1963       v.addElement(ei); 
    1964     } 
    1965  
    1966     return v; 
     1963      al.add(ei); 
     1964    } 
     1965 
     1966    return al; 
    19671967  } 
    19681968 

  • trunk/calendar3/config/configs/democal.properties

    r293 r297  
    8080org.bedework.app.bwconfig.display.name=Bedework Config 
    8181org.bedework.app.bwconfig.name=bwconfig 
    82 org.bedework.app.bwconfig.env.prefix=org.bedework.webconfig. 
    8382org.bedework.app.bwconfig.guestmode=true 
    8483org.bedework.app.bwconfig.publicadmin=false 

  • trunk/calendar3/deployment/dumprestore/shellscr/resources/log4j.xml

    r2 r297  
    2525   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> 
    2626      <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/> 
    27       <param name="File" value="/home/douglm/logs/test.log"/> 
     27      <param name="File" value="${user.home}/logs/test.log"/> 
    2828      <param name="Append" value="true"/> 
    2929 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r294 r297  
    707707                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    708708                  <a href="{$export}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    709                     <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
     709                    <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    710710                  </a> 
    711711                </td> 

  • trunk/calendar3/dumprestore/properties/log4j.xml

    r48 r297  
    2525   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> 
    2626      <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/> 
    27       <param name="File" value="/home/douglm/logs/test.log"/> 
     27      <param name="File" value="${user.home}/logs/test.log"/> 
    2828      <param name="Append" value="true"/> 
    2929 

  • trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java

    r260 r297  
    205205    } 
    206206     
    207     openSess(); 
    208  
    209     save(o); 
    210  
    211     closeSess(); 
     207    openHibSess(); 
     208 
     209    hibSave(o); 
     210 
     211    closeHibSess(); 
    212212  } 
    213213 

  • trunk/calendar3/webclient/war/docs/alarmOptions.jsp

    r292 r297  
    4545    <alarmTriggerSelectorDate> 
    4646      <html:radio name="calForm" property="alarmTriggerByDate" 
    47                    value="true" /></input> 
     47                   value="true" /> 
    4848    </alarmTriggerSelectorDate> 
    4949    <alarmTriggerSelectorDuration> 
    5050      <html:radio name="calForm" property="alarmTriggerByDate" 
    51                       value="false" /></input> 
     51                      value="false" /> 
    5252    </alarmTriggerSelectorDuration> 
    5353    <alarmduration> 
    54       <days><html:text size="5" maxlength="5" name="calForm" property="triggerDuration.daysStr"/></input></days> 
    55       <hours><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.hoursStr"/></input></hours> 
    56       <minutes><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.minutesStr"/></input></minutes> 
    57       <seconds><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.secondsStr"/></input></seconds> 
    58       <weeks><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.weeksStr"/></input></weeks> 
     54      <days><html:text size="5" maxlength="5" name="calForm" property="triggerDuration.daysStr"/></days> 
     55      <hours><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.hoursStr"/></hours> 
     56      <minutes><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.minutesStr"/></minutes> 
     57      <seconds><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.secondsStr"/></seconds> 
     58      <weeks><html:text size="3" maxlength="3" name="calForm" property="triggerDuration.weeksStr"/></weeks> 
    5959    </alarmduration> 
    6060    <alarmDurationBefore> 
    6161      <html:radio name="calForm" property="triggerDuration.negative" 
    62                       value="true" /></input> 
     62                      value="true" /> 
    6363    </alarmDurationBefore> 
    6464    <alarmDurationAfter> 
    6565      <html:radio name="calForm" property="triggerDuration.negative" 
    66                       value="false" /></input> 
     66                      value="false" /> 
    6767    </alarmDurationAfter> 
    6868    <alarmDurationRelStart> 
    6969      <html:radio name="calForm" property="alarmRelStart" 
    70                       value="true" /></input> 
     70                      value="true" /> 
    7171    </alarmDurationRelStart> 
    7272    <alarmDurationRelEnd> 
    7373      <html:radio name="calForm" property="alarmRelStart" 
    74                       value="false" /></input> 
     74                      value="false" /> 
    7575    </alarmDurationRelEnd> 
    76     <email><html:text name="calForm" property="lastEmail"/></input></email> 
    77     <subject><html:text name="calForm" property="lastSubject" /></input></subject> 
     76    <email><html:text name="calForm" property="lastEmail"/></email> 
     77    <subject><html:text name="calForm" property="lastSubject" /></subject> 
    7878  </genurl:form> 
    7979</alarmoptionsform> 

  • trunk/calendar3/webclient/war/docs/editEvent.jsp

    r292 r297  
    1616  <genurl:form action="editEvent"> 
    1717    <title> 
    18       <html:text property="editEvent.summary"/></input> 
     18      <html:text property="editEvent.summary"/> 
    1919    </title> 
    2020    <description> 
    …… 
    2222    </description> 
    2323    <link> 
    24       <html:text property="editEvent.link" /></input> 
     24      <html:text property="editEvent.link" /> 
    2525    </link> 
    2626    <location> 
    …… 
    3333      </locationmenu> 
    3434      <locationtext> 
    35         <html:text property="laddress" /></input> 
     35        <html:text property="laddress" /> 
    3636      </locationtext> 
    3737    </location> 

  • trunk/calendar3/webclient/war/docs/editLocation.jsp

    r292 r297  
    1414<locationform> 
    1515  <genurl:form action="editLoc"> 
    16     <address><html:text property="editLocation.address"/></input></address> 
     16    <address><html:text property="editLocation.address"/></address> 
    1717    <subaddress><html:textarea property="editLocation.subaddress" rows="8" cols="55"/></subaddress> 
    18     <link><html:text property="editLocation.link" /></input></link> 
     18    <link><html:text property="editLocation.link" /></link> 
    1919    <id><bean:write name="calForm" property="editLocation.id"/></id> 
    2020  </genurl:form> 

  • trunk/calendar3/webclient/war/docs/emailOptions.jsp

    r292 r297  
    1515<emailoptionsform> 
    1616  <genurl:form action="mailEvent"> 
    17     <email><html:text name="calForm" property="lastEmail"/></input></email> 
    18     <subject><html:text name="calForm" property="lastSubject" /></input></subject> 
     17    <email><html:text name="calForm" property="lastEmail"/></email> 
     18    <subject><html:text name="calForm" property="lastSubject" /></subject> 
    1919  </genurl:form> 
    2020</emailoptionsform>