Changeset 761

Show
Ignore:
Timestamp:
07/13/06 09:57:50
Author:
douglm
Message:

Added a GetUser? action for freebusy aggregator
Renamed FBAttendeeInfo method xxxAttendee to xxxUser

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/AllUsers.java

    r756 r761  
    105105    } 
    106106 
    107     FBUserInfo ui = val.getAttendee(); 
     107    FBUserInfo ui = val.getUser(); 
    108108 
    109109    try { 
    …… 
    150150    } 
    151151 
    152     FBUserInfo ui = val.getAttendee(); 
     152    FBUserInfo ui = val.getUser(); 
    153153 
    154154    try { 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/EditUser.java

    r756 r761  
    5151    } 
    5252 
    53     FBUserInfo ui = ai.getAttendee(); 
     53    FBUserInfo ui = ai.getUser(); 
    5454 
    5555    String val = getReqPar(request, "authUser"); 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBAggAction.java

    r756 r761  
    204204    while (it.hasNext()) { 
    205205      FBAttendeeInfo ai = (FBAttendeeInfo)it.next(); 
    206       currentAttendees.add(ai.getAttendee().clone()); 
     206      currentAttendees.add(ai.getUser().clone()); 
    207207    } 
    208208 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBAttendeeInfo.java

    r735 r761  
    3030import java.io.Serializable; 
    3131 
    32 /** Maintain information about an attendees as a group member. 
     32/** Maintain information about a user as an attendee or group member. 
    3333 * 
    3434 * @author Mike Douglass 
    3535 */ 
    3636public class FBAttendeeInfo implements Comparable, Serializable { 
    37   private FBUserInfo attendee; 
     37  private FBUserInfo user; 
    3838 
    3939  private boolean ignore; 
    …… 
    4545  /** Constructor 
    4646   * 
    47    * @param attendee 
     47   * @param user 
    4848   */ 
    49   public FBAttendeeInfo(FBUserInfo attendee) { 
    50     this.attendee = attendee; 
     49  public FBAttendeeInfo(FBUserInfo user) { 
     50    this.user = user; 
    5151  } 
    5252 
    …… 
    5454   * @param val 
    5555   */ 
    56   public void setAttendee(FBUserInfo val) { 
    57     attendee = val; 
     56  public void setUser(FBUserInfo val) { 
     57    user = val; 
    5858  } 
    5959 
    …… 
    6161   * @return FBUserInfo 
    6262   */ 
    63   public FBUserInfo getAttendee() { 
    64     return attendee; 
     63  public FBUserInfo getUser() { 
     64    return user; 
    6565  } 
    6666 
    …… 
    125125    FBAttendeeInfo that = (FBAttendeeInfo)o; 
    126126 
    127     return getAttendee().compareTo(that.getAttendee()); 
     127    return getUser().compareTo(that.getUser()); 
    128128  } 
    129129 
    130130  public int hashCode() { 
    131     return getAttendee().hashCode(); 
     131    return getUser().hashCode(); 
    132132  } 
    133133 
    …… 
    143143 
    144144  public Object clone() { 
    145     FBAttendeeInfo nai = new FBAttendeeInfo(getAttendee()); 
     145    FBAttendeeInfo nai = new FBAttendeeInfo(getUser()); 
    146146 
    147147    nai.setIgnore(getIgnore()); 
    …… 
    155155    StringBuffer sb = new StringBuffer("FBAttendeeInfo["); 
    156156 
    157     sb.append(getAttendee()); 
     157    sb.append(getUser()); 
    158158    sb.append(", ignore="); 
    159159    sb.append(getIgnore()); 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBAttendeeSet.java

    r756 r761  
    9191    while (it.hasNext()) { 
    9292      FBAttendeeInfo info = (FBAttendeeInfo)it.next(); 
    93       if (account.equals(info.getAttendee().getAccount())) { 
     93      if (account.equals(info.getUser().getAccount())) { 
    9494        return info; 
    9595      } 
    …… 
    109109    while (it.hasNext()) { 
    110110      FBAttendeeInfo info = (FBAttendeeInfo)it.next(); 
    111       if (info.getAttendee().getAccount().startsWith(prefix)) { 
     111      if (info.getUser().getAccount().startsWith(prefix)) { 
    112112        atts.add(info); 
    113113      } 
    …… 
    127127    while (it.hasNext()) { 
    128128      FBAttendeeInfo info = (FBAttendeeInfo)it.next(); 
    129       if (info.getAttendee().getAccount().endsWith(suffix)) { 
     129      if (info.getUser().getAccount().endsWith(suffix)) { 
    130130        atts.add(info); 
    131131      } 
    …… 
    168168    } 
    169169 
    170     removeInfo(val.getAttendee().getAccount()); 
     170    removeInfo(val.getUser().getAccount()); 
    171171    addInfo(val); 
    172172  } 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/FbAggForm.java

    r737 r761  
    2727 
    2828import org.bedework.fbaggregator.FreeBusyAggregator.FbResponses; 
     29import org.bedework.fbclient.FBUserInfo; 
    2930 
    3031import edu.rpi.sss.util.jsp.UtilActionForm; 
    …… 
    3435 
    3536/** 
    36  * @author douglm 
    37  * 
    38  */ 
    39 /** 
    40  * @author douglm 
    41  * 
     37 * @author Mike Douglass   douglm to rpi.edu 
    4238 */ 
    4339public class FbAggForm extends UtilActionForm { 
    …… 
    8177  private String[] groupNames; 
    8278  private String currentGroup; 
     79 
     80  private FBUserInfo currentFBUser; 
    8381 
    8482  /** 
    …… 
    319317    return currentGroup; 
    320318  } 
     319 
     320  /** 
     321   * @param val 
     322   */ 
     323  public void setCurrentFBUser(FBUserInfo val) { 
     324    currentFBUser = val; 
     325  } 
     326 
     327  /** 
     328   * @return String 
     329   */ 
     330  public FBUserInfo getCurrentFBUser() { 
     331    return currentFBUser; 
     332  } 
    321333} 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/FreeBusyAggregator.java

    r756 r761  
    242242      FBAttendeeInfo ai = (FBAttendeeInfo)it.next(); 
    243243 
    244       resps.responses.add(getFreeBusy(ai.getAttendee(), start, end, cd, 
     244      resps.responses.add(getFreeBusy(ai.getUser(), start, end, cd, 
    245245                                      granularity)); 
    246246    } 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/GetFreeBusy.java

    r732 r761  
    8989 
    9090      if (account != null) { 
    91         ui = sess.getAllUsers().getInfo(account).getAttendee(); 
     91        ui = sess.getAllUsers().getInfo(account).getUser(); 
    9292        if (ui == null) { 
    9393          return forwardNotFound; 

  • freebusy/trunk/webclient/src/org/bedework/fbaggregator/SelectUsers.java

    r759 r761  
    6868      while (it.hasNext()) { 
    6969        FBAttendeeInfo ai = (FBAttendeeInfo)it.next(); 
    70         selectedAttendees.add(ai.getAttendee().clone()); 
     70        selectedAttendees.add(ai.getUser().clone()); 
    7171      } 
    7272 

  • freebusy/trunk/webclient/war/WEB-INF/struts-config.xml

    r757 r761  
    146146               validate="false"> 
    147147      <forward name="success" path="/showEditUser.rdo" redirect="true" /> 
     148      <forward name="noAction" path="/showMain.rdo" redirect="true"/> 
     149      <forward name="notFound" path="/showMain.rdo" redirect="true"/> 
     150    </action> 
     151 
     152    <action    path="/getUser" 
     153               type="org.bedework.fbaggregator.GetUser" 
     154               name="bwForm" 
     155               scope="session" 
     156               validate="false"> 
     157      <forward name="success" path="/showEditUser.rdo" redirect="true" /> 
     158      <forward name="noAction" path="/showMain.rdo" redirect="true"/> 
     159      <forward name="notFound" path="/showMain.rdo" redirect="true"/> 
    148160    </action> 
    149161  </action-mappings>