lukeredpath · March 22, 2020 08:21 · Aug 9, 2013 · Sep 2, 2010 · Sep 2, 2010 · Feb 19, 2010
diff --git a/LRIndexedCollationWithSearch.h b/LRIndexedCollationWithSearch.h
@@ -1,31 +1,65 @@
 //
-//  LRSearchableIndexCollation.m
+//  FRSearchableIndexCollation.m
 //  
 //
 //  Copyright (c) 2010 Luke Redpath
 //  Licensed under the MIT License
 //
 
-#import <UIKit/UIKit.h>
+#import "LRIndexedCollationWithSearch.h"
 
-/*
- A simple decorator around UILocalizedIndexedCollation that inserts the
- {{search}} magnifying glass icon into the section index titles and adjusts
- the section index as necessary to account for the extra index item.
- 
- Use as a direct replacement for UILocalizedIndexedCollation in indexed
- table views that have a search interface.
-*/
-@interface LRIndexedCollationWithSearch : NSObject {
-  UILocalizedIndexedCollation *collation;
+@implementation LRIndexedCollationWithSearch {
+  UILocalizedIndexedCollation *_collation;
 }
-@property(nonatomic, readonly) NSArray *sectionTitles;
-@property(nonatomic, readonly) NSArray *sectionIndexTitles;
+
+@dynamic sectionTitles;
+@dynamic sectionIndexTitles;
 
 + (id)currentCollation;
-- (id)initWithCollation:(UILocalizedIndexedCollation *)_collation;
+{
+  UILocalizedIndexedCollation *collation = [UILocalizedIndexedCollation currentCollation];
+  return [[self alloc] initWithCollation:collation];
+}
+
+- (id)initWithCollation:(UILocalizedIndexedCollation *)collation;
+{
+  if (self = [super init]) {
+    _collation = collation;
+  }
+  return self;
+}
+
+#pragma mark -
+
+- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector
+{
+  return [_collation sectionForObject:object collationStringSelector:selector];
+}
+
+- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex
+{
+  if(indexTitleIndex == 0) { 
+    return NSNotFound;
+  }
+  return [_collation sectionForSectionIndexTitleAtIndex:indexTitleIndex-1];
+}
+
+- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector
+{
+  return [_collation sortedArrayFromArray:array collationStringSelector:selector];
+}
+
+#pragma mark -
+#pragma mark Accessors
+
+- (NSArray *)sectionTitles;
+{
+  return [_collation sectionTitles];
+}
+
+- (NSArray *)sectionIndexTitles;
+{
+  return [[NSArray arrayWithObject:UITableViewIndexSearch] arrayByAddingObjectsFromArray:[_collation sectionIndexTitles]];
+}
 
-- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector;
-- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex;
-- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector;
 @end
diff --git a/LRIndexedCollationWithSearch.m b/LRIndexedCollationWithSearch.m
@@ -1,70 +1,31 @@
 //
-//  FRSearchableIndexCollation.m
+//  LRSearchableIndexCollation.m
 //  
 //
 //  Copyright (c) 2010 Luke Redpath
 //  Licensed under the MIT License
 //
 
-#import "LRIndexedCollationWithSearch"
+#import <UIKit/UIKit.h>
 
+/*
+ A simple decorator around UILocalizedIndexedCollation that inserts the
+ {{search}} magnifying glass icon into the section index titles and adjusts
+ the section index as necessary to account for the extra index item.
+ 
+ Use as a direct replacement for UILocalizedIndexedCollation in indexed
+ table views that have a search interface.
+*/
+@interface LRIndexedCollationWithSearch : NSObject
 
-@implementation LRIndexedCollationWithSearch
-
-@dynamic sectionTitles;
-@dynamic sectionIndexTitles;
+@property(nonatomic, readonly) NSArray *sectionTitles;
+@property(nonatomic, readonly) NSArray *sectionIndexTitles;
 
 + (id)currentCollation;
-{
-  UILocalizedIndexedCollation *collation = [UILocalizedIndexedCollation currentCollation];
-  return [[[self alloc] initWithCollation:collation] autorelease];
-}
-
-- (id)initWithCollation:(UILocalizedIndexedCollation *)_collation;
-{
-  if (self = [super init]) {
-    collation = [_collation retain];
-  }
-  return self;
-}
-
-- (void)dealloc;
-{
-  [collation release];
-  [super dealloc];
-}
-
-#pragma mark -
-
-- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector
-{
-  return [collation sectionForObject:object collationStringSelector:selector];
-}
-
-- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex
-{
-  if(indexTitleIndex == 0) { 
-    return NSNotFound;
-  }
-  return [collation sectionForSectionIndexTitleAtIndex:indexTitleIndex-1];
-}
-
-- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector
-{
-  return [collation sortedArrayFromArray:array collationStringSelector:selector];
-}
-
-#pragma mark -
-#pragma mark Accessors
-
-- (NSArray *)sectionTitles;
-{
-  return [collation sectionTitles];
-}
+- (id)initWithCollation:(UILocalizedIndexedCollation *)collation;
 
-- (NSArray *)sectionIndexTitles;
-{
-  return [[NSArray arrayWithObject:UITableViewIndexSearch] arrayByAddingObjectsFromArray:[collation sectionIndexTitles]];
-}
+- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector;
+- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex;
+- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector;
 
 @end
diff --git a/FRSearchableIndexCollation.h → LRIndexedCollationWithSearch.h b/FRSearchableIndexCollation.h → LRIndexedCollationWithSearch.h
diff --git a/FRSearchableIndexCollation.m → LRIndexedCollationWithSearch.m b/FRSearchableIndexCollation.m → LRIndexedCollationWithSearch.m
diff --git a/FRSearchableIndexCollation.h b/FRSearchableIndexCollation.h
@@ -1,5 +1,5 @@
 //
-//  FRSearchableIndexCollation.m
+//  LRSearchableIndexCollation.m
 //  
 //
 //  Copyright (c) 2010 Luke Redpath
@@ -16,7 +16,7 @@
  Use as a direct replacement for UILocalizedIndexedCollation in indexed
  table views that have a search interface.
 */
-@interface FRIndexedCollationWithSearch : NSObject {
+@interface LRIndexedCollationWithSearch : NSObject {
   UILocalizedIndexedCollation *collation;
 }
 @property(nonatomic, readonly) NSArray *sectionTitles;

diff --git a/FRSearchableIndexCollation.m b/FRSearchableIndexCollation.m
@@ -6,10 +6,10 @@
 //  Licensed under the MIT License
 //
 
-#import "FRIndexedCollationWithSearch.h"
+#import "LRIndexedCollationWithSearch"
 
 
-@implementation FRIndexedCollationWithSearch
+@implementation LRIndexedCollationWithSearch
 
 @dynamic sectionTitles;
 @dynamic sectionIndexTitles;

diff --git a/MyTableViewController.m b/MyTableViewController.m
@@ -1,20 +1,20 @@
-// example usage of FRIndexedCollationWithSearch within your UITableView delegate methods
+// example usage of LRIndexedCollationWithSearch within your UITableView delegate methods
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-  return [[[FRIndexedCollationWithSearch currentCollation] sectionTitles] count];
+  return [[[LRIndexedCollationWithSearch currentCollation] sectionTitles] count];
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
 {
-  return [[[FRIndexedCollationWithSearch currentCollation] sectionTitles] objectAtIndex:section];
+  return [[[LRIndexedCollationWithSearch currentCollation] sectionTitles] objectAtIndex:section];
 }
 
 - (NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView
 {
-  return [[FRIndexedCollationWithSearch currentCollation] sectionIndexTitles];
+  return [[LRIndexedCollationWithSearch currentCollation] sectionIndexTitles];
 }
 
 - (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index
 {
-  return [[FRIndexedCollationWithSearch currentCollation] sectionForSectionIndexTitleAtIndex:index];
+  return [[LRIndexedCollationWithSearch currentCollation] sectionForSectionIndexTitleAtIndex:index];
 }
diff --git a/MyTableViewController.m b/MyTableViewController.m
@@ -0,0 +1,20 @@
+// example usage of FRIndexedCollationWithSearch within your UITableView delegate methods
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+  return [[[FRIndexedCollationWithSearch currentCollation] sectionTitles] count];
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+  return [[[FRIndexedCollationWithSearch currentCollation] sectionTitles] objectAtIndex:section];
+}
+
+- (NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView
+{
+  return [[FRIndexedCollationWithSearch currentCollation] sectionIndexTitles];
+}
+
+- (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index
+{
+  return [[FRIndexedCollationWithSearch currentCollation] sectionForSectionIndexTitleAtIndex:index];
+}
diff --git a/FRSearchableIndexCollation.h b/FRSearchableIndexCollation.h
@@ -1,9 +1,9 @@
 //
-//  LJSearchableIndexCollation.h
+//  FRSearchableIndexCollation.m
 //  
 //
-//  Created by Luke Redpath on 16/02/2010.
-//  Copyright 2010 LJR Software Limited. All rights reserved.
+//  Copyright (c) 2010 Luke Redpath
+//  Licensed under the MIT License
 //
 
 #import <UIKit/UIKit.h>

diff --git a/FRSearchableIndexCollation.m b/FRSearchableIndexCollation.m
@@ -1,9 +1,9 @@
 //
-//  LJSearchableIndexCollation.m
+//  FRSearchableIndexCollation.m
 //  
 //
-//  Created by Luke Redpath on 16/02/2010.
-//  Copyright 2010 LJR Software Limited. All rights reserved.
+//  Copyright (c) 2010 Luke Redpath
+//  Licensed under the MIT License
 //
 
 #import "FRIndexedCollationWithSearch.h"

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2010 Luke Redpath
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/FRSearchableIndexCollation.h b/FRSearchableIndexCollation.h
@@ -1,5 +1,5 @@
 //
-//  FRSearchableIndexCollation.h
+//  LJSearchableIndexCollation.h
 //  
 //
 //  Created by Luke Redpath on 16/02/2010.
@@ -25,7 +25,7 @@
 + (id)currentCollation;
 - (id)initWithCollation:(UILocalizedIndexedCollation *)_collation;
 
-- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector
-- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex
-- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector
+- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector;
+- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex;
+- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector;
 @end
diff --git a/FRSearchableIndexCollation.m b/FRSearchableIndexCollation.m
@@ -1,5 +1,5 @@
 //
-//  FRSearchableIndexCollation.m
+//  LJSearchableIndexCollation.m
 //  
 //
 //  Created by Luke Redpath on 16/02/2010.
@@ -51,7 +51,7 @@ - (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex
 
 - (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector
 {
-  [collation sortedArrayFromArray:array collationStringSelector:selector];
+  return [collation sortedArrayFromArray:array collationStringSelector:selector];
 }
 
 #pragma mark -

diff --git a/FRSearchableIndexCollation.h b/FRSearchableIndexCollation.h
@@ -1,5 +1,5 @@
 //
-//  LJSearchableIndexCollation.h
+//  FRSearchableIndexCollation.h
 //  
 //
 //  Created by Luke Redpath on 16/02/2010.

diff --git a/FRSearchableIndexCollation.m b/FRSearchableIndexCollation.m
@@ -1,5 +1,5 @@
 //
-//  LJSearchableIndexCollation.m
+//  FRSearchableIndexCollation.m
 //  
 //
 //  Created by Luke Redpath on 16/02/2010.

diff --git a/FRSearchableIndexCollation.h b/FRSearchableIndexCollation.h
@@ -6,7 +6,7 @@
 //  Copyright 2010 LJR Software Limited. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 /*
  A simple decorator around UILocalizedIndexedCollation that inserts the
@@ -16,7 +16,7 @@
  Use as a direct replacement for UILocalizedIndexedCollation in indexed
  table views that have a search interface.
 */
-@interface FRSearchableIndexCollation : NSObject {
+@interface FRIndexedCollationWithSearch : NSObject {
   UILocalizedIndexedCollation *collation;
 }
 @property(nonatomic, readonly) NSArray *sectionTitles;

diff --git a/FRSearchableIndexCollation.m b/FRSearchableIndexCollation.m
@@ -6,10 +6,10 @@
 //  Copyright 2010 LJR Software Limited. All rights reserved.
 //
 
-#import "FRSearchableIndexCollation.h"
+#import "FRIndexedCollationWithSearch.h"
 
 
-@implementation FRSearchableIndexCollation
+@implementation FRIndexedCollationWithSearch
 
 @dynamic sectionTitles;
 @dynamic sectionIndexTitles;

diff --git a/FRSearchableIndexCollation.h b/FRSearchableIndexCollation.h
@@ -0,0 +1,31 @@
+//
+//  LJSearchableIndexCollation.h
+//  
+//
+//  Created by Luke Redpath on 16/02/2010.
+//  Copyright 2010 LJR Software Limited. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/*
+ A simple decorator around UILocalizedIndexedCollation that inserts the
+ {{search}} magnifying glass icon into the section index titles and adjusts
+ the section index as necessary to account for the extra index item.
+ 
+ Use as a direct replacement for UILocalizedIndexedCollation in indexed
+ table views that have a search interface.
+*/
+@interface FRSearchableIndexCollation : NSObject {
+  UILocalizedIndexedCollation *collation;
+}
+@property(nonatomic, readonly) NSArray *sectionTitles;
+@property(nonatomic, readonly) NSArray *sectionIndexTitles;
+
++ (id)currentCollation;
+- (id)initWithCollation:(UILocalizedIndexedCollation *)_collation;
+
+- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector
+- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex
+- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector
+@end
diff --git a/FRSearchableIndexCollation.m b/FRSearchableIndexCollation.m
@@ -0,0 +1,70 @@
+//
+//  LJSearchableIndexCollation.m
+//  
+//
+//  Created by Luke Redpath on 16/02/2010.
+//  Copyright 2010 LJR Software Limited. All rights reserved.
+//
+
+#import "FRSearchableIndexCollation.h"
+
+
+@implementation FRSearchableIndexCollation
+
+@dynamic sectionTitles;
+@dynamic sectionIndexTitles;
+
++ (id)currentCollation;
+{
+  UILocalizedIndexedCollation *collation = [UILocalizedIndexedCollation currentCollation];
+  return [[[self alloc] initWithCollation:collation] autorelease];
+}
+
+- (id)initWithCollation:(UILocalizedIndexedCollation *)_collation;
+{
+  if (self = [super init]) {
+    collation = [_collation retain];
+  }
+  return self;
+}
+
+- (void)dealloc;
+{
+  [collation release];
+  [super dealloc];
+}
+
+#pragma mark -
+
+- (NSInteger)sectionForObject:(id)object collationStringSelector:(SEL)selector
+{
+  return [collation sectionForObject:object collationStringSelector:selector];
+}
+
+- (NSInteger)sectionForSectionIndexTitleAtIndex:(NSInteger)indexTitleIndex
+{
+  if(indexTitleIndex == 0) { 
+    return NSNotFound;
+  }
+  return [collation sectionForSectionIndexTitleAtIndex:indexTitleIndex-1];
+}
+
+- (NSArray *)sortedArrayFromArray:(NSArray *)array collationStringSelector:(SEL)selector
+{
+  [collation sortedArrayFromArray:array collationStringSelector:selector];
+}
+
+#pragma mark -
+#pragma mark Accessors
+
+- (NSArray *)sectionTitles;
+{
+  return [collation sectionTitles];
+}
+
+- (NSArray *)sectionIndexTitles;
+{
+  return [[NSArray arrayWithObject:UITableViewIndexSearch] arrayByAddingObjectsFromArray:[collation sectionIndexTitles]];
+}
+
+@end