Changeset 239

Show
Ignore:
Timestamp:
03/01/06 11:19:54
Author:
douglm
Message:

Small fix to remove incorrect error message caused by remapping userid 0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java

    r54 r239  
    5454package org.bedework.dumprestore.restore.rules; 
    5555 
     56import org.bedework.calfacade.BwUser; 
    5657import org.bedework.calfacade.svc.BwPreferences; 
    5758import org.bedework.calfacade.svc.BwSubscription; 
    …… 
    108109      globals.curSub.setName(stringFld()); 
    109110    } else if (name.equals("sub-owner")) { 
    110       if (p.getOwner().getId() != intFld()) { 
     111      BwUser sowner = userFld(); 
     112       
     113      if (!p.getOwner().equals(sowner)) { 
    111114        error("Subscription owners don't match for " + globals.curSub); 
    112         error("  Found owner id " + intFld() + " expected " + p); 
     115        error("  Found owner " + sowner + " expected " + p.getOwner()); 
    113116      } 
    114117      globals.curSub.setOwner(p.getOwner()); 
    …… 
    143146      globals.curView.setName(stringFld()); 
    144147    } else if (name.equals("view-owner")) { 
    145       if (p.getOwner().getId() != intFld()) { 
    146         error("Viewowners don't match for " + globals.curView); 
    147         error("  Found owner id " + intFld() + " expected " + p.getOwner()); 
     148      BwUser vowner = userFld(); 
     149       
     150      if (!p.getOwner().equals(vowner)) { 
     151        error("View owners don't match for " + globals.curView); 
     152        error("  Found owner " + vowner + " expected " + p.getOwner()); 
    148153      } 
    149154      globals.curView.setOwner(p.getOwner());