Changeset 24

Show
Ignore:
Timestamp:
01/23/06 22:15:47
Author:
douglm
Message:

Update error and message property names
Fix prefs update

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/config/src/org/bedework/webconfig/AbstractAction.java

    r2 r24  
    110110      forward = doAction(request, response, form); 
    111111    } catch (Throwable t) { 
    112       form.getErr().emit("org.bedework.error.exc", t.getMessage()); 
     112      form.getErr().emit("org.bedework.client.error.exc", t.getMessage()); 
    113113      form.getErr().emit(t); 
    114114    } 
    …… 
    221221                          ActionForm form) throws Throwable { 
    222222    /* use the following if checkboxes are employed */ 
    223     /*  
     223    /* 
    224224    Collection colls = form.getPropertyCollections(); 
    225225 

  • trunk/calendar3/config/src/org/bedework/webconfig/props/BooleanProperty.java

    r2 r24  
    170170        booleanVal = true; 
    171171      } else { 
    172         err.emit("org.bedework.config.badvalue", getName(), getValue()); 
     172        err.emit("org.bedework.config.error.badvalue", getName(), getValue()); 
    173173      } 
    174174    } 

  • trunk/calendar3/config/src/org/bedework/webconfig/props/IntProperty.java

    r2 r24  
    132132      setIntVal(Integer.parseInt(getValue())); 
    133133    } catch (Throwable t) { 
    134       err.emit("org.bedework.config.badvalue", getName(), getValue()); 
     134      err.emit("org.bedework.config.error.badvalue", getName(), getValue()); 
    135135      goodValue = false; 
    136136    } 

  • trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl

    r23 r24  
    20022002          <td> 
    20032003            <xsl:variable name="preferredView" select="/bedeworkadmin/prefs/preferredView"/> 
    2004             <input type="text" name="view" value="{$preferredView}" size="40"/> 
     2004            <input type="text" name="preferredView" value="{$preferredView}" size="40"/> 
    20052005          </td> 
    20062006        </tr> 

  • trunk/calendar3/docs/todo.txt

    r18 r24  
    44-------------------------------------------------------------------------------- 
    55-------------------------------------------------------------------------------- 
     6org.bedework.client.error.exc               message text 
     7org.bedework.client.error.missingfield      name of field 
     8 
     9org.bedework.client.error.noaccess 
     10 
     11org.bedework.client.error.missingsubscriptionid 
     12org.bedework.client.error.nosuchsubscription    name 
     13 
     14org.bedework.client.error.viewnotfound          name of view 
     15org.bedework.client.error.viewnotadded 
     16 
     17org.bedework.client.error.nosuchuserid       id 
     18org.bedework.client.error.usernotfound       userid 
     19 
     20org.bedework.client.error.missingcategory    id 
     21org.bedework.client.error.nosuchcategory     key 
     22org.bedework.client.error.category.referenced 
     23 
     24org.bedework.client.error.location.referenced 
     25org.bedework.client.error.nosuchlocation     id 
     26org.bedework.client.error.location.alreadyexists 
     27 
     28org.bedework.client.error.nosuchsponsor      sponsor 
     29org.bedework.client.error.sponsor.referenced 
     30org.bedework.client.error.sponsor.alreadyexists 
     31 
     32org.bedework.client.error.nosuchevent       guids 
     33org.bedework.client.error.eventnotfound 
     34org.bedework.client.error.badentityid 
     35org.bedework.client.error.noentityid 
     36 
     37org.bedework.client.error.nosuchcalendar     id 
     38org.bedework.client.error.calendar.referenced 
     39 
     40org.bedework.client.error.unimplemented 
     41org.bedework.client.error.badhow 
     42org.bedework.client.error.badwhotype 
     43 
     44org.bedework.client.error.badinterval 
     45org.bedework.client.error.badintervalunit 
     46 
     47org.bedework.client.error.mail.norecipient 
     48 
     49org.bedework.client.error.choosegroupsuppressed 
     50 
     51 
     52org.bedework.validation.error.toolong.description      max length 
     53org.bedework.validation.error.notitle 
     54org.bedework.validation.error.nodescription 
     55org.bedework.validation.error.event.startafterend 
     56org.bedework.validation.error.invalid.endtype 
     57org.bedework.validation.error.nosponsorname 
     58org.bedework.validation.error.nolocationaddress 
     59org.bedework.validation.error.missingfield            field name 
     60org.bedework.validation.error.forbidden.calmode (folder<->calendar disallowed) 
     61 
     62 
     63org.bedework.client.message.cancelled 
     64org.bedework.client.message.category.deleted 
     65org.bedework.client.message.category.added 
     66org.bedework.client.message.category.updated 
     67org.bedework.client.message.sponsor.deleted 
     68org.bedework.client.message.sponsor.added 
     69org.bedework.client.message.sponsor.updated 
     70org.bedework.client.message.calendar.deleted 
     71org.bedework.client.message.calendar.added 
     72org.bedework.client.message.calendar.updated 
     73org.bedework.client.message.event.deleted 
     74org.bedework.client.message.event.added 
     75org.bedework.client.message.event.updated 
     76org.bedework.client.message.deleted.events      num 
     77org.bedework.client.message.location.deleted 
     78org.bedework.client.message.deleted.locations   num 
     79org.bedework.client.message.added.locations     num 
     80org.bedework.client.message.locations.added 
     81org.bedework.client.message.location.updated 
     82org.bedework.client.message.event.mailed 
     83org.bedework.client.message.eventalarmset 
     84org.bedework.client.message.authuser.removed 
     85org.bedework.client.message.authuser.updated 
     86org.bedework.client.message.timezones.imported 
     87org.bedework.client.message.userinfo.updated 
     88org.bedework.client.message.added.eventrefs    num 
     89 
     90org.bedework.config.error.loaderror    (Unable to load properties file) 
     91org.bedework.config.error.badvalue            name + value 
     92org.bedework.config.error.missingvalue  groupname + property name 
    693-------------------------------------------------------------------------------- 
    794svn 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/PEAbstractAction.java

    r2 r24  
    125125    if (reqpar != null) { 
    126126      / ** Set the objects to null so we get new ones. 
    127        * /  
     127       * / 
    128128      form.initFields(); 
    129129      form.setEvent(null); 
    130130 
    131       form.getMsg().emit("org.bedework.message.cancelled"); 
     131      form.getMsg().emit("org.bedework.client.message.cancelled"); 
    132132      return "cancelled"; 
    133133    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/PEActionForm.java

    r2 r24  
    11361136      } 
    11371137 
    1138       err.emit("org.bedework.pubevents.error.missingfield", 
    1139                "Category"); 
     1138      err.emit("org.bedework.client.error.missingfield", "Category"); 
    11401139      return false; 
    11411140    } 
    …… 
    11451144 
    11461145      if (k == null) { 
    1147         err.emit("org.bedework.pubevents.error.missingcategory", id); 
     1146        err.emit("org.bedework.client.error.missingcategory", id); 
    11481147        return false; 
    11491148      } 
    …… 
    11941193 
    11951194      if (event.getSponsor() == null) { 
    1196         err.emit("org.bedework.pubevents.error.missingfield", 
    1197                  "Sponsor"); 
     1195        err.emit("org.bedework.client.error.missingfield", "Sponsor"); 
    11981196        return false; 
    11991197      } 
    …… 
    12101208        // Somebody's faking 
    12111209        setSponsor(null); 
    1212         err.emit("org.bedework.pubevents.error.missingfield", 
    1213                  "Sponsor"); 
     1210        err.emit("org.bedework.client.error.missingfield", "Sponsor"); 
    12141211        return false; 
    12151212      } 
    …… 
    12501247 
    12511248      if (event.getLocation() == null) { 
    1252         err.emit("org.bedework.pubevents.error.missingfield", 
    1253                  "Location"); 
     1249        err.emit("org.bedework.client.error.missingfield", "Location"); 
    12541250        return false; 
    12551251      } 
    …… 
    12671263        // Somebody's faking 
    12681264        setLocation(null); 
    1269         err.emit("org.bedework.pubevents.error.missingfield", 
    1270                  "Location"); 
     1265        err.emit("org.bedework.client.error.missingfield", "Location"); 
    12711266        return false; 
    12721267      } 
    …… 
    12921287    if (!calendarId.getChanged()) { 
    12931288      if (event.getCalendar() == null) { 
    1294         err.emit("org.bedework.pubevents.error.missingfield", 
    1295                  "Calendar"); 
     1289        err.emit("org.bedework.client.error.missingfield", "Calendar"); 
    12961290        return false; 
    12971291      } 
    …… 
    13101304        // Somebody's faking 
    13111305        setCalendar(null); 
    1312         err.emit("org.bedework.pubevents.error.missingfield", 
    1313                  "Calendar"); 
     1306        err.emit("org.bedework.client.error.missingfield", "Calendar"); 
    13141307        return false; 
    13151308      } 
    …… 
    13381331 
    13391332    if (k.getWord() == null) { 
    1340       err.emit("org.bedework.pubevents.error.missingfield", 
    1341                "Category"); 
     1333      err.emit("org.bedework.client.error.missingfield", "Category"); 
    13421334      ok = false; 
    13431335    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PESwitchAGAction.java

    r2 r24  
    9090    String temp = checkGroup(request, form, false); 
    9191    if (temp == null) { 
    92       form.getErr().emit("org.bedework.pubevents.error.choosegroupsuppressed"); 
     92      form.getErr().emit("org.bedework.client.error.choosegroupsuppressed"); 
    9393      return "error"; 
    9494    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java

    r2 r24  
    196196 
    197197    if (updAdminGroup.getAccount() == null) { 
    198       form.getErr().emit("org.bedework.pubevents.error.missingfield", 
    199                "Name"); 
     198      form.getErr().emit("org.bedework.client.error.missingfield", "Name"); 
    200199      ok = false; 
    201200    } 
    …… 
    204203 
    205204    if (updAdminGroup.getDescription() == null) { 
    206       form.getErr().emit("org.bedework.pubevents.error.missingfield", 
     205      form.getErr().emit("org.bedework.client.error.missingfield", 
    207206               "description"); 
    208207      ok = false; 
    …… 
    211210    String adminGroupGroupOwner = Util.checkNull(form.getAdminGroupGroupOwner()); 
    212211    if (adminGroupGroupOwner == null) { 
    213       form.getErr().emit("org.bedework.pubevents.error.missingfield", 
     212      form.getErr().emit("org.bedework.client.error.missingfield", 
    214213               "groupOwnerid"); 
    215214      ok = false; 
    …… 
    223222    } 
    224223    if (adminGroupEventOwner == null) { 
    225       form.getErr().emit("org.bedework.pubevents.error.missingfield", 
     224      form.getErr().emit("org.bedework.client.error.missingfield", 
    226225               "eventOwnerid"); 
    227226      ok = false; 
    …… 
    255254 
    256255    if (updAdminGroup.getDescription() == null) { 
    257       form.getErr().emit("org.bedework.pubevents.error.missingfield", 
     256      form.getErr().emit("org.bedework.client.error.missingfield", 
    258257               "description"); 
    259258      ok = false; 
    …… 
    266265 
    267266      if (aggo == null) { 
    268         form.getErr().emit("org.bedework.pubevents.error.notfound", 
     267        form.getErr().emit("org.bedework.client.error.usernotfound", 
    269268                           adminGroupGroupOwner); 
    270269        return false; 
    …… 
    295294 
    296295      if (ageo == null) { 
    297         form.getErr().emit("org.bedework.pubevents.error.notfound", 
     296        form.getErr().emit("org.bedework.client.error.usernotfound", 
    298297                           adminGroupEventOwner); 
    299298        return false; 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/authuser/PEDeleteAuthAction.java

    r2 r24  
    8989    svci.getUserAuth().removeAuth(getAuthUser(form)); 
    9090 
    91     form.getMsg().emit("org.bedework.pubevents.message.authuser.removed"); 
     91    form.getMsg().emit("org.bedework.client.message.authuser.removed"); 
    9292 
    9393    return "continue"; 
    9494  } 
    9595} 
    96  

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/authuser/PEUpdateAuthAction.java

    r2 r24  
    101101    svci.getUserAuth().updateUser(au); 
    102102 
    103     form.getMsg().emit("org.bedework.pubevents.message.authuser.updated"); 
     103    form.getMsg().emit("org.bedework.client.message.authuser.updated"); 
    104104 
    105105    return "continue"; 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEDeleteCategoryAction.java

    r2 r24  
    9191 
    9292    if (delResult == 2) { 
    93       form.getMsg().emit("org.bedework.pubevents.message.category.referenced"); 
     93      form.getErr().emit("org.bedework.client.error.category.referenced"); 
    9494      return "inUse"; 
    9595    } 
    9696 
    9797    if (delResult == 1) { 
    98        form.getErr().emit("org.bedework.pubevents.error.nosuchcategory", key); 
     98       form.getErr().emit("org.bedework.client.error.nosuchcategory", key); 
    9999      return "notFound"; 
    100100    } 
    101101 
    102     form.getMsg().emit("org.bedework.pubevents.message.category.deleted"); 
     102    form.getMsg().emit("org.bedework.client.message.category.deleted"); 
    103103 
    104104    return "continue"; 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEFetchCategoryAction.java

    r2 r24  
    107107    form.setCategory(category); 
    108108    if (category == null) { 
    109       form.getErr().emit("org.bedework.pubevents.error.nosuchcategory", id); 
     109      form.getErr().emit("org.bedework.client.error.nosuchcategory", id); 
    110110      return "notFound"; 
    111111    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEUpdateCategoryAction.java

    r2 r24  
    120120 
    121121    if (add) { 
    122       form.getMsg().emit("org.bedework.pubevents.message.category.added"); 
     122      form.getMsg().emit("org.bedework.client.message.category.added"); 
    123123    } else { 
    124       form.getMsg().emit("org.bedework.pubevents.message.category.updated"); 
     124      form.getMsg().emit("org.bedework.client.message.category.updated"); 
    125125    } 
    126126 

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

    r2 r24  
    103103    BwWebUtil.deleteEvent(form, svci.getEvent(eventid).getEvent()); 
    104104 
    105     form.getMsg().emit("org.bedework.pubevents.message.event.deleted"); 
     105    form.getMsg().emit("org.bedework.client.message.event.deleted"); 
    106106 
    107107    return "continue"; 

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

    r2 r24  
    125125    form.setEventInfo(einf); 
    126126    if (einf == null) { 
    127       form.getErr().emit("org.bedework.pubevents.error.nosuchevent", id); 
     127      form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    128128      return "notFound"; 
    129129    } 

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

    r2 r24  
    149149 
    150150    if (form.getAddingEvent()) { 
    151       form.getMsg().emit("org.bedework.pubevents.message.event.added"); 
     151      form.getMsg().emit("org.bedework.client.message.event.added"); 
    152152    } else { 
    153       form.getMsg().emit("org.bedework.pubevents.message.event.updated"); 
     153      form.getMsg().emit("org.bedework.client.message.event.updated"); 
    154154    } 
    155155    return "continue"; 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEDeleteLocationAction.java

    r2 r24  
    9191 
    9292    if (delResult == 2) { 
    93       form.getMsg().emit("org.bedework.client.message.location.referenced"); 
     93      form.getErr().emit("org.bedework.client.error.location.referenced"); 
    9494      return "inUse"; 
    9595    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEFetchLocationAction.java

    r2 r24  
    108108    form.setLocation(location); 
    109109    if (location == null) { 
    110       form.getErr().emit("org.bedework.pubevents.error.nosuchlocation", id); 
     110      form.getErr().emit("org.bedework.client.error.nosuchlocation", id); 
    111111      return "notFound"; 
    112112    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEUpdateLocationAction.java

    r2 r24  
    133133        form.getMsg().emit("org.bedework.client.message.locations.added", 1); 
    134134      } else { 
    135         form.getMsg().emit("org.bedework.client.message.location.alreadyexists"); 
     135        form.getErr().emit("org.bedework.client.error.location.alreadyexists"); 
    136136      } 
    137137    } else { 
    …… 
    142142  } 
    143143} 
    144  

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEDeleteSponsorAction.java

    r2 r24  
    9191 
    9292    if (delResult == 2) { 
    93       form.getMsg().emit("org.bedework.client.message.sponsor.referenced"); 
     93      form.getErr().emit("org.bedework.client.error.sponsor.referenced"); 
    9494      return "inUse"; 
    9595    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEFetchSponsorAction.java

    r2 r24  
    108108    form.setSponsor(sponsor); 
    109109    if (sponsor == null) { 
    110       form.getErr().emit("org.bedework.pubevents.error.nosuchsponsor", id); 
     110      form.getErr().emit("org.bedework.client.error.nosuchsponsor", id); 
    111111      return "notFound"; 
    112112    } 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEUpdateSponsorAction.java

    r2 r24  
    133133        form.getMsg().emit("org.bedework.client.message.sponsor.added"); 
    134134      } else { 
    135         form.getMsg().emit("org.bedework.client.message.sponsor.alreadyexists"); 
     135        form.getErr().emit("org.bedework.client.error.sponsor.alreadyexists"); 
    136136      } 
    137137    } else { 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/timezones/PEUploadTimezonesAction.java

    r18 r24  
    110110    } 
    111111 
    112     form.getMsg().emit("org.bedework.pubevents.message.timezones.imported"); 
     112    form.getMsg().emit("org.bedework.client.message.timezones.imported"); 
    113113 
    114114    return "success"; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwAccessAction.java

    r2 r24  
    106106    } 
    107107 
    108     String idstr = request.getParameter("cal"); 
     108    String idstr = getReqPar(request, "cal"); 
    109109    boolean calid = idstr != null; 
    110110 
    111111    if (!calid) { 
    112       idstr = request.getParameter("event"); 
     112      idstr = getReqPar(request, "event"); 
    113113    } 
    114114 
    115115    if (idstr == null) { 
    116       form.getErr().emit("org.bedework.error.noentityid"); 
     116      form.getErr().emit("org.bedework.client.error.noentityid"); 
    117117      return "error"; 
    118118    } 
    …… 
    123123      id = Integer.parseInt(idstr); 
    124124    } catch (Throwable t) { 
    125       form.getErr().emit("org.bedework.error.badentityid"); 
     125      form.getErr().emit("org.bedework.client.error.badentityid"); 
    126126      return "error"; 
    127127    } 
    …… 
    136136      if (cal == null) { 
    137137        // Do nothing 
    138         form.getErr().emit("org.bedework.error.nosuchcalendar", id); 
     138        form.getErr().emit("org.bedework.client.error.nosuchcalendar", id); 
    139139        return "doNothing"; 
    140140      } 
    …… 
    144144      if (ei == null) { 
    145145        // Do nothing 
    146         form.getErr().emit("org.bedework.error.nosuchevent", id); 
     146        form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    147147        return "doNothing"; 
    148148      } 
    …… 
    154154 
    155155    if (how == null) { 
    156       form.getErr().emit("org.bedework.error.noentityid"); 
     156      form.getErr().emit("org.bedework.client.error.noentityid"); 
    157157      return "error"; 
    158158    } 
    …… 
    169169    } else if (how.equals("d")) { 
    170170      //defaultAccess = true; 
    171       form.getErr().emit("org.bedework.error.unimplemented"); 
    172       return "error"; 
    173     } else { 
    174       form.getErr().emit("org.bedework.error.badhow"); 
     171      form.getErr().emit("org.bedework.client.error.unimplemented"); 
     172      return "error"; 
     173    } else { 
     174      form.getErr().emit("org.bedework.client.error.badhow"); 
    175175      return "error"; 
    176176    } 
    …… 
    185185    } else if (whoTypeStr.equals("group")) { 
    186186      whoType = Ace.whoTypeGroup; 
    187       form.getErr().emit("org.bedework.error.unimplemented"); 
     187      form.getErr().emit("org.bedework.client.error.unimplemented"); 
    188188      return "error"; 
    189189    } else if (whoTypeStr.equals("unauth")) { 
    …… 
    192192      whoType = Ace.whoTypeOther; 
    193193    } else { 
    194       form.getErr().emit("org.bedework.error.badwhotype"); 
     194      form.getErr().emit("org.bedework.client.error.badwhotype"); 
    195195      return "error"; 
    196196    } 
    …… 
    201201      BwUser user = svci.findUser(who); 
    202202      if (user == null) { 
    203         form.getErr().emit("org.bedework.error.usernotfound"); 
     203        form.getErr().emit("org.bedework.client.error.usernotfound"); 
    204204        return "notFound"; 
    205205      } 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwAddEventRefAction.java

    r2 r24  
    8787    if (id < 0) { 
    8888      // Do nothing 
    89       form.getErr().emit("org.bedework.error.nosuchevent", id); 
     89      form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    9090      return "doNothing"; 
    9191    } 
    …… 
    9797    if (ei == null) { 
    9898      // Do nothing 
    99       form.getErr().emit("org.bedework.error.nosuchevent", id); 
     99      form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    100100      return "doNothing"; 
    101101    } 
    …… 
    109109    svci.addEvent(proxy, null); 
    110110 
    111     form.getMsg().emit("org.bedework.message.added.eventrefs", 1); 
     111    form.getMsg().emit("org.bedework.client.message.added.eventrefs", 1); 
    112112 
    113113    BwGoToAction.gotoDateView(this, form, 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwAddLocationAction.java

    r2 r24  
    8686    form.getCalSvcI().addLocation(l); 
    8787 
    88     form.getMsg().emit("org.bedework.message.added.locations", 1); 
     88    form.getMsg().emit("org.bedework.client.message.added.locations", 1); 
    8989 
    9090    return "success"; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwCalAbstractAction.java

    r2 r24  
    103103       * / 
    104104 
    105       form.getMsg().emit("org.bedework.message.cancelled"); 
     105      form.getMsg().emit("org.bedework.client.message.cancelled"); 
    106106      return "cancelled"; 
    107107    }*/ 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwDelEventAction.java

    r2 r24  
    9191    if (id < 0) { 
    9292      // Do nothing 
    93       form.getErr().emit("org.bedework.error.nosuchevent", id); 
     93      form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    9494      return "doNothing"; 
    9595    } 
    …… 
    101101    if (ei == null) { 
    102102      // Do nothing 
    103       form.getErr().emit("org.bedework.error.nosuchevent", id); 
     103      form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    104104      return "doNothing"; 
    105105    } 
    …… 
    108108 
    109109    if (!delResult.eventDeleted) { 
    110       form.getMsg().emit("org.bedework.message.nosuchevent", id); 
     110      form.getErr().emit("org.bedework.client.error.nosuchevent", id); 
    111111      return "doNothing"; 
    112112    } 
    113113 
    114114    if (delResult.locationDeleted) { 
    115       form.getMsg().emit("org.bedework.message.deleted.locations", 1); 
     115      form.getMsg().emit("org.bedework.client.message.deleted.locations", 1); 
    116116    } 
    117117 
    118     form.getMsg().emit("org.bedework.message.deleted.events", 1); 
     118    form.getMsg().emit("org.bedework.client.message.deleted.events", 1); 
    119119    form.refreshIsNeeded(); 
    120120 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwDelLocationAction.java

    r2 r24  
    106106 
    107107    if (delResult == 2) { 
    108       form.getErr().emit("org.bedework.error.location.referenced"); 
     108      form.getErr().emit("org.bedework.client.error.location.referenced"); 
    109109      return "referenced"; 
    110110    } 
    111111 
    112112    if (delResult == 1) { 
    113       form.getErr().emit("org.bedework.error.nosuchlocation", id); 
     113      form.getErr().emit("org.bedework.client.error.nosuchlocation", id); 
    114114      return "doNothing"; 
    115115    } 
    116116 
    117     form.getMsg().emit("org.bedework.message.deleted.locations", 1); 
     117    form.getMsg().emit("org.bedework.client.message.deleted.locations", 1); 
    118118 
    119119    return "success"; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwEditEventAction.java

    r2 r24  
    117117    /* XXX Remove when we're happy with access control */ 
    118118    if (ev.getPublick()) { 
    119       form.getErr().emit("org.bedework.error.noaccess", "for that action"); 
     119      form.getErr().emit("org.bedework.client.error.noaccess", "for that action"); 
    120120      return "doNothing"; 
    121121    } 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwEditLocationAction.java

    r2 r24  
    111111 
    112112    if (loc.getPublick()) { 
    113       form.getErr().emit("org.bedework.error.noaccess", "for that action"); 
     113      form.getErr().emit("org.bedework.client.error.noaccess", "for that action"); 
    114114      return "doNothing"; 
    115115    } 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwFetchEventAction.java

    r2 r24  
    9595 
    9696    if (ei == null) { 
    97       form.getErr().emit("org.bedework.error.eventnotfound"); 
     97      form.getErr().emit("org.bedework.client.error.eventnotfound"); 
    9898      return "notFound"; 
    9999    } 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java

    r2 r24  
    103103      user = svci.findUser(userId); 
    104104      if (user == null) { 
    105         form.getErr().emit("org.bedework.error.usernotfound"); 
     105        form.getErr().emit("org.bedework.client.error.usernotfound"); 
    106106        return "notFound"; 
    107107      } 
    …… 
    123123        interval = Integer.parseInt(intstr); 
    124124      } catch (Throwable t) { 
    125         form.getErr().emit("org.bedework.error.badinterval"); 
     125        form.getErr().emit("org.bedework.client.error.badinterval"); 
    126126        return "error"; 
    127127      } 
    …… 
    129129 
    130130    if (interval <= 0) { 
    131       form.getErr().emit("org.bedework.error.badinterval"); 
     131      form.getErr().emit("org.bedework.client.error.badinterval"); 
    132132      return "error"; 
    133133    } 
    …… 
    148148        intunit = Calendar.MONTH; 
    149149      } else { 
    150         form.getErr().emit("org.bedework.error.badintervalunit"); 
     150        form.getErr().emit("org.bedework.client.error.badintervalunit"); 
    151151        return "error"; 
    152152      } 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwMailEventAction.java

    r2 r24  
    8888    String recipient = form.getLastEmail(); 
    8989    if (recipient == null) { 
    90       form.getErr().emit("org.bedework.error.mail.norecipient", 1); 
     90      form.getErr().emit("org.bedework.client.error.mail.norecipient", 1); 
    9191      return "retry"; 
    9292    } 
    …… 
    109109    mailMessage(emsg, trans.toStringIcal(ev), "event.ics", "text/calendar", form); 
    110110 
    111     form.getMsg().emit("org.bedework.message.event.mailed"); 
     111    form.getMsg().emit("org.bedework.client.message.event.mailed"); 
    112112 
    113113    return "success"; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwSetAlarmAction.java

    r2 r24  
    117117    String recipient = form.getLastEmail(); 
    118118    if (!Util.present(recipient)) { 
    119       form.getErr().emit("org.bedework.error.mail.norecipient", 1); 
     119      form.getErr().emit("org.bedework.client.error.mail.norecipient", 1); 
    120120      return "retry"; 
    121121    } 
    …… 
    140140    svci.setAlarm(ev, alarm); 
    141141 
    142     form.getMsg().emit("org.bedework.message.eventalarmset"); 
     142    form.getMsg().emit("org.bedework.client.message.eventalarmset"); 
    143143 
    144144    return "success"; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwSubscribeAction.java

    r2 r24  
    7575  public String doAction(HttpServletRequest request, 
    7676                         BwActionForm form) throws Throwable { 
    77        /* 
     77    /* 
    7878    CalSvcI svci = form.getCalSvcI(); 
    7979    if (form.getGuest()) { 
    8080      return "doNothing"; 
    8181    } 
    82      
     82 
    8383    boolean subscribe = false; 
    8484    String reqpar = request.getParameter("subscribe"); 
    …… 
    9595        calid = Integer.parseInt(reqpar); 
    9696      } catch (Throwable t) { 
    97         form.getErr().emit("org.bedework.error.badcalendarid"); 
     97        form.getErr().emit("org.bedework.client.error.badcalendarid"); 
    9898        return "error"; 
    9999      } 
    …… 
    102102 
    103103      if (cal == null) { 
    104         form.getErr().emit("org.bedework.error.badcalendarid"); 
     104        form.getErr().emit("org.bedework.client.error.badcalendarid"); 
    105105        return "error"; 
    106106      } 

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

    r2 r24  
    239239      form.initFields(); 
    240240 
    241       form.getMsg().emit("org.bedework.message.cancelled"); 
     241      form.getMsg().emit("org.bedework.client.message.cancelled"); 
    242242      return "cancelled"; 
    243243    } 
    …… 
    252252      } 
    253253    } catch (CalFacadeAccessException cfae) { 
    254       form.getErr().emit("org.bedework.error.noaccess", "for that action"); 
     254      form.getErr().emit("org.bedework.client.error.noaccess", "for that action"); 
    255255      forward="noaccess"; 
    256256    } catch (Throwable t) { 
    257       form.getErr().emit("org.bedework.error.exc", t.getMessage()); 
     257      form.getErr().emit("org.bedework.client.error.exc", t.getMessage()); 
    258258      form.getErr().emit(t); 
    259259    } 
    …… 
    284284    int subid = getIntReqPar(request, "subid", -1); 
    285285    if (subid < 0) { 
    286       form.getErr().emit("org.bedework.error.missingsubscriptionid"); 
     286      form.getErr().emit("org.bedework.client.error.missingsubscriptionid"); 
    287287      return null; 
    288288    } 
    …… 
    293293 
    294294    if (sub == null) { 
    295       form.getErr().emit("org.bedework.error.missingsubscriptionid"); 
     295      form.getErr().emit("org.bedework.client.error.missingsubscriptionid"); 
    296296      return null; 
    297297    } 
    …… 
    317317 
    318318    if (ev == null) { 
    319       form.getErr().emit("org.bedework.error.nosuchevent", /*eid*/guid); 
     319      form.getErr().emit("org.bedework.client.error.nosuchevent", /*eid*/guid); 
    320320      return null; 
    321321    } else if (debug) { 
    …… 
    679679    try { 
    680680      ua = form.getCalSvcI().getUserAuth(s.getUser(), par); 
     681 
     682      form.assignAuthorisedUser(ua.getUsertype() != UserAuth.noPrivileges); 
     683 
     684      if (debug) { 
     685        debugMsg("UserAuth says that current user has the type: " + 
     686                 ua.getUsertype()); 
     687      } 
    681688    } catch (Throwable t) { 
    682       form.getErr().emit("org.bedework.error.exc", t.getMessage()); 
     689      form.getErr().emit("org.bedework.client.error.exc", t.getMessage()); 
    683690      form.getErr().emit(t); 
    684691      return null; 
    685     } 
    686  
    687     form.assignAuthorisedUser(ua.getUsertype() != UserAuth.noPrivileges); 
    688  
    689     if (debug) { 
    690       try { 
    691         debugMsg("UserAuth says that current user has the type: " + 
    692                  ua.getUsertype()); 
    693       } catch (Throwable t) { 
    694         form.getErr().emit("org.bedework.error.exc", t.getMessage()); 
    695         form.getErr().emit(t); 
    696         return null; 
    697       } 
    698692    } 
    699693 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/DeleteCalendarAction.java

    r2 r24  
    8686 
    8787    if (delResult == 2) { 
    88       form.getMsg().emit("org.bedework.client.message.calendar.referenced"); 
     88      form.getErr().emit("org.bedework.client.error.calendar.referenced"); 
    8989      return "inUse"; 
    9090    } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java

    r2 r24  
    162162          if ((cal.getChildren().size() != 0) || 
    163163              form.getCalSvcI().getCalendarInuse(cal)) { 
    164             form.getErr().emit("org.bedework.validation.error.forbidden"); 
     164            form.getErr().emit("org.bedework.validation.error.forbidden.calmode"); 
    165165            return false; 
    166166          } 

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

    r2 r24  
    109109    //svci.getUserAuth().updateUser(au); 
    110110 
    111     form.getMsg().emit("org.bedework.message.userinfo.updated"); 
     111    form.getMsg().emit("org.bedework.client.message.userinfo.updated"); 
    112112 
    113113    return "continue"; 

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

    r2 r24  
    128128    } 
    129129 
    130     form.getMsg().emit("org.bedework.message.event.added"); 
     130    form.getMsg().emit("org.bedework.client.message.event.added"); 
    131131 
    132132    return "success"; 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java

    r22 r24  
    101101    String str = getReqPar(request, "user"); 
    102102    if (str == null) { 
    103       form.getErr().emit("org.bedework.client.notfound", str); 
     103      form.getErr().emit("org.bedework.client.error.usernotfound", str); 
    104104      return "notFound"; 
    105105    } 
    …… 
    107107    BwUser user = svc.findUser(str); 
    108108    if (user == null) { 
    109       form.getErr().emit("org.bedework.client.notfound", str); 
     109      form.getErr().emit("org.bedework.client.error.usernotfound", str); 
    110110      return "notFound"; 
    111111    } 
    …… 
    113113    BwPreferences prefs = svc.getUserPrefs(user); 
    114114 
    115     str = getReqPar(request, "view"); 
     115    str = getReqPar(request, "preferredView"); 
    116116    if (str != null) { 
    117117      if (svc.findView(str) == null) { 
    118         form.getErr().emit("org.bedework.client.notfound", str); 
     118        form.getErr().emit("org.bedework.client.error.viewnotfound", str); 
    119119        return "notFound"; 
    120120      } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java

    r2 r24  
    112112      if (cal == null) { 
    113113        // Assume no access 
    114         form.getErr().emit("org.bedework.client.noaccess"); 
     114        form.getErr().emit("org.bedework.client.error.noaccess"); 
    115115        return "noAccess"; 
    116116      } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/UnsubscribeAction.java

    r2 r24  
    9696    if (name == null) { 
    9797      // Assume no access 
    98       form.getErr().emit("org.bedework.client.missingfield", "name"); 
     98      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    9999      return "error"; 
    100100    } 
    …… 
    103103 
    104104    if (sub == null) { 
    105       form.getErr().emit("org.bedework.client.notfound", name); 
     105      form.getErr().emit("org.bedework.client.error.nosuchsubscription", name); 
    106106      return "notFound"; 
    107107    } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/AddViewAction.java

    r2 r24  
    9595 
    9696    if (name == null) { 
    97       form.getErr().emit("org.bedework.client.missingfield", "name"); 
     97      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    9898      return "error"; 
    9999    } 
    …… 
    110110 
    111111    if (!svc.addView(view, makeDefaultView)) { 
    112       form.getErr().emit("org.bedework.client.notadded"); 
     112      form.getErr().emit("org.bedework.client.error.viewnotadded"); 
    113113      return "notAdded"; 
    114114    } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/DeleteViewAction.java

    r2 r24  
    9595 
    9696    if (name == null) { 
    97       form.getErr().emit("org.bedework.client.missingfield", "name"); 
     97      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    9898      return "error"; 
    9999    } 
    …… 
    102102 
    103103    if (view == null) { 
    104       form.getErr().emit("org.bedework.client.notfound", name); 
     104      form.getErr().emit("org.bedework.client.error.viewnotfound", name); 
    105105      return "notFound"; 
    106106    } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/FetchViewAction.java

    r2 r24  
    9191 
    9292    if (name == null) { 
    93       form.getErr().emit("org.bedework.client.missingfield", "name"); 
     93      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    9494      return "error"; 
    9595    } 
    …… 
    9898 
    9999    if (view == null) { 
    100       form.getErr().emit("org.bedework.client.notfound", name); 
     100      form.getErr().emit("org.bedework.client.error.notfound", name); 
    101101      return "notFound"; 
    102102    } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/views/UpdateViewAction.java

    r2 r24  
    9999    String name = Util.checkNull(request.getParameter("name")); 
    100100    if (name == null) { 
    101       form.getErr().emit("org.bedework.client.missingfield", "name"); 
     101      form.getErr().emit("org.bedework.client.error.missingfield", "name"); 
    102102      return "error"; 
    103103    } 
    …… 
    110110 
    111111      if (sub == null) { 
    112         form.getErr().emit("org.bedework.client.notfound", add); 
     112        form.getErr().emit("org.bedework.client.error.nosuchsubscription", add); 
    113113        return "notFound"; 
    114114      } 
    115115 
    116116      if (!svc.addViewSubscription(name, sub)) { 
    117         form.getErr().emit("org.bedework.client.notfound", name); 
     117        form.getErr().emit("org.bedework.client.error.viewnotfound", name); 
    118118        return "notFound"; 
    119119      } 
    …… 
    124124 
    125125      if (sub == null) { 
    126         form.getErr().emit("org.bedework.client.notfound", remove); 
     126        form.getErr().emit("org.bedework.client.error.nosuchsubscription", remove); 
    127127        return "notFound"; 
    128128      } 
    …… 
    130130 
    131131      if (!svc.removeViewSubscription(name, sub)) { 
    132         form.getErr().emit("org.bedework.client.notfound", name); 
     132        form.getErr().emit("org.bedework.client.error.viewnotfound", name); 
    133133        return "notFound"; 
    134134      } 
    …… 
    154154 
    155155    if (view == null) { 
    156       form.getErr().emit("org.bedework.client.notfound", name); 
     156      form.getErr().emit("org.bedework.client.error.viewnotfound", name); 
    157157      return "notFound"; 
    158158    } 

  • trunk/calendar3/webgroups/src/org/bedework/webclient/groups/UpdateAction.java

    r2 r24  
    193193 
    194194    if (updgrp.getAccount() == null) { 
    195       err.emit("org.bedework.pubevents.error.missingfield", 
    196                "Name"); 
     195      err.emit("org.bedework.validation.error.missingfield", "Name"); 
    197196      ok = false; 
    198197    }