[LJKit CVS] LJKit LJServer.h,1.3,1.4 LJServer.m,1.5,1.6 LJHttpURLs.m,1.4,1.5

[Benjamin R. <be...@us...>]

Update of /cvsroot/ljkit/LJKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296

Modified Files:
	LJServer.h LJServer.m LJHttpURLs.m 
Log Message:
Renamed -url to -URL to make LJServer KVC compliant.

Index: LJHttpURLs.m
===================================================================
RCS file: /cvsroot/ljkit/LJKit/LJHttpURLs.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LJHttpURLs.m	24 Feb 2004 23:53:54 -0000	1.4
--- LJHttpURLs.m	16 Mar 2004 02:54:35 -0000	1.5
***************
*** 28,32 ****
      NSString *s;
      s = [NSString stringWithFormat:@"/userinfo.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[_server url]] absoluteURL];
  }
  
--- 28,32 ----
      NSString *s;
      s = [NSString stringWithFormat:@"/userinfo.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[_server URL]] absoluteURL];
  }
  
***************
*** 34,38 ****
  {
      NSString *s = [NSString stringWithFormat:@"/tools/memories.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[_server url]] absoluteURL];
  }
  
--- 34,38 ----
  {
      NSString *s = [NSString stringWithFormat:@"/tools/memories.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[_server URL]] absoluteURL];
  }
  
***************
*** 40,44 ****
  {
      NSString *s = [NSString stringWithFormat:@"/todo/?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[_server url]] absoluteURL];
  }
  
--- 40,44 ----
  {
      NSString *s = [NSString stringWithFormat:@"/todo/?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[_server URL]] absoluteURL];
  }
  
***************
*** 51,55 ****
      NSString *s;
      s = [NSString stringWithFormat:@"/users/%@/", _name];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 51,55 ----
      NSString *s;
      s = [NSString stringWithFormat:@"/users/%@/", _name];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  
***************
*** 105,109 ****
  {
      if (_itemID) {
!         NSURL *baseURL = [[[_journal account] server] url];
          NSString *s = [NSString stringWithFormat:@"tools/memadd.bml?journal=%@&itemid=%u",
              [_journal name], [self webItemID]];
--- 105,109 ----
  {
      if (_itemID) {
!         NSURL *baseURL = [[[_journal account] server] URL];
          NSString *s = [NSString stringWithFormat:@"tools/memadd.bml?journal=%@&itemid=%u",
              [_journal name], [self webItemID]];
***************
*** 130,134 ****
  {
      NSString *s = [NSString stringWithFormat:@"/userinfo.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 130,134 ----
  {
      NSString *s = [NSString stringWithFormat:@"/userinfo.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  
***************
*** 136,140 ****
  {
      NSString *s = [NSString stringWithFormat:@"/tools/memories.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 136,140 ----
  {
      NSString *s = [NSString stringWithFormat:@"/tools/memories.bml?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  
***************
*** 142,146 ****
  {
      NSString *s = [NSString stringWithFormat:@"/todo/?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 142,146 ----
  {
      NSString *s = [NSString stringWithFormat:@"/todo/?user=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  
***************
*** 148,152 ****
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/data/rss", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];	
  }
  
--- 148,152 ----
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/data/rss", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];	
  }
  
***************
*** 154,158 ****
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/data/atom", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];		
  }
  
--- 154,158 ----
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/data/atom", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];		
  }
  
***************
*** 160,164 ****
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/data/foaf", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];		
  }
  
--- 160,164 ----
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/data/foaf", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];		
  }
  
***************
*** 166,170 ****
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 166,170 ----
  {
      NSString *s = [NSString stringWithFormat:@"/users/%@/", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  
***************
*** 172,176 ****
  {
      NSString *s = [NSString stringWithFormat:@"/community/join.bml?comm=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 172,176 ----
  {
      NSString *s = [NSString stringWithFormat:@"/community/join.bml?comm=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  
***************
*** 178,182 ****
  {
      NSString *s = [NSString stringWithFormat:@"/community/leave.bml?comm=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] url]] absoluteURL];
  }
  
--- 178,182 ----
  {
      NSString *s = [NSString stringWithFormat:@"/community/leave.bml?comm=%@", _username];
!     return [[NSURL URLWithString:s relativeToURL:[[_account server] URL]] absoluteURL];
  }
  

Index: LJServer.h
===================================================================
RCS file: /cvsroot/ljkit/LJKit/LJServer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LJServer.h	27 Feb 2004 09:21:20 -0000	1.3
--- LJServer.h	16 Mar 2004 02:54:35 -0000	1.4
***************
*** 91,98 ****
  
  /*!
!  @method url
!  @abstract Obtain the url of host the receiver communicates with.
   */
! - (NSURL *)url;
  
  /*!
--- 91,98 ----
  
  /*!
!  @method URL
!  @abstract Obtain the URL of host the receiver communicates with.
   */
! - (NSURL *)URL;
  
  /*!

Index: LJServer.m
===================================================================
RCS file: /cvsroot/ljkit/LJKit/LJServer.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LJServer.m	27 Feb 2004 09:21:20 -0000	1.5
--- LJServer.m	16 Mar 2004 02:54:35 -0000	1.6
***************
*** 129,133 ****
  }
  
! - (NSURL *)url
  {
      return _serverURL;
--- 129,133 ----
  }
  
! - (NSURL *)URL
  {
      return _serverURL;
***************
*** 212,216 ****
  {
      NSAssert(flags != NULL, @"Flags must not be NULL.");
!     return SCNetworkCheckReachabilityByName([[[self url] host] UTF8String], flags);
  }
  
--- 212,216 ----
  {
      NSAssert(flags != NULL, @"Flags must not be NULL.");
!     return SCNetworkCheckReachabilityByName([[[self URL] host] UTF8String], flags);
  }