Permalink
Browse files

converted to arc; fixed some bugs; performance improvements; support …

…for starred items
  • Loading branch information...
1 parent 1a79800 commit 2a1c150f94d45b59eb78718562fb375961557266 @gummyavenger gummyavenger committed Jan 25, 2012
Showing with 4,625 additions and 1,689 deletions.
  1. BIN .DS_Store
  2. +100 −61 PSGoogleReader.xcodeproj/project.pbxproj
  3. BIN ...der.xcodeproj/project.xcworkspace/xcuserdata/isenhower.xcuserdatad/UserInterfaceState.xcuserstate
  4. +10 −0 ...eader.xcodeproj/project.xcworkspace/xcuserdata/isenhower.xcuserdatad/WorkspaceSettings.xcsettings
  5. +5 −0 PSGoogleReader.xcodeproj/xcuserdata/isenhower.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  6. +84 −0 PSGoogleReader.xcodeproj/xcuserdata/isenhower.xcuserdatad/xcschemes/PSGoogleReader.xcscheme
  7. +22 −0 PSGoogleReader.xcodeproj/xcuserdata/isenhower.xcuserdatad/xcschemes/xcschememanagement.plist
  8. +2 −14 PSGoogleReader/DetailViewController.m
  9. +0 −15 PSGoogleReader/EntitiesConverter.h
  10. +0 −41 PSGoogleReader/EntitiesConverter.m
  11. +418 −0 PSGoogleReader/GTMDefines.h
  12. +66 −0 PSGoogleReader/GTMNSString+HTML.h
  13. +522 −0 PSGoogleReader/GTMNSString+HTML.m
  14. +0 −50 PSGoogleReader/JSON/JSON.h
  15. +0 −68 PSGoogleReader/JSON/NSObject+SBJSON.h
  16. +0 −75 PSGoogleReader/JSON/SBJSON.h
  17. +0 −212 PSGoogleReader/JSON/SBJSON.m
  18. +0 −87 PSGoogleReader/JSON/SBJsonParser.h
  19. +0 −475 PSGoogleReader/JSON/SBJsonParser.m
  20. +0 −237 PSGoogleReader/JSON/SBJsonWriter.m
  21. +2 −2 PSGoogleReader/PSGoogleReader-Info.plist
  22. +21 −12 PSGoogleReader/PSGoogleReader.h
  23. +371 −132 PSGoogleReader/PSGoogleReader.m
  24. +5 −5 PSGoogleReader/PSGoogleReaderAppDelegate.h
  25. +8 −14 PSGoogleReader/PSGoogleReaderAppDelegate.m
  26. +1 −1 PSGoogleReader/RootViewController.h
  27. +1 −7 PSGoogleReader/RootViewController.m
  28. 0 PSGoogleReader/{JSON → SBJSON}/.svn/all-wcprops
  29. 0 PSGoogleReader/{JSON → SBJSON}/.svn/entries
  30. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/JSON.h.svn-base
  31. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/NSObject+SBJSON.h.svn-base
  32. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/NSObject+SBJSON.m.svn-base
  33. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/NSString+SBJSON.h.svn-base
  34. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/NSString+SBJSON.m.svn-base
  35. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJSON.h.svn-base
  36. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJSON.m.svn-base
  37. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJsonBase.h.svn-base
  38. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJsonBase.m.svn-base
  39. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJsonParser.h.svn-base
  40. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJsonParser.m.svn-base
  41. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJsonWriter.h.svn-base
  42. 0 PSGoogleReader/{JSON → SBJSON}/.svn/text-base/SBJsonWriter.m.svn-base
  43. +23 −14 PSGoogleReader/{JSON/NSString+SBJSON.h → SBJSON/NSObject+SBJson.h}
  44. +19 −14 PSGoogleReader/{JSON/NSObject+SBJSON.m → SBJSON/NSObject+SBJson.m}
  45. +83 −0 PSGoogleReader/SBJSON/SBJson.h
  46. +54 −39 PSGoogleReader/{JSON/SBJsonBase.h → SBJSON/SBJsonParser.h}
  47. +49 −31 PSGoogleReader/{JSON/SBJsonBase.m → SBJSON/SBJsonParser.m}
  48. +210 −0 PSGoogleReader/SBJSON/SBJsonStreamParser.h
  49. +342 −0 PSGoogleReader/SBJSON/SBJsonStreamParser.m
  50. +37 −0 PSGoogleReader/SBJSON/SBJsonStreamParserAccumulator.h
  51. +12 −20 PSGoogleReader/{JSON/NSString+SBJSON.m → SBJSON/SBJsonStreamParserAccumulator.m}
  52. +83 −0 PSGoogleReader/SBJSON/SBJsonStreamParserState.h
  53. +355 −0 PSGoogleReader/SBJSON/SBJsonStreamParserState.m
  54. +188 −0 PSGoogleReader/SBJSON/SBJsonStreamWriter.h
  55. +366 −0 PSGoogleReader/SBJSON/SBJsonStreamWriter.m
  56. +36 −0 PSGoogleReader/SBJSON/SBJsonStreamWriterAccumulator.h
  57. +52 −0 PSGoogleReader/SBJSON/SBJsonStreamWriterAccumulator.m
  58. +69 −0 PSGoogleReader/SBJSON/SBJsonStreamWriterState.h
  59. +139 −0 PSGoogleReader/SBJSON/SBJsonStreamWriterState.m
  60. +67 −0 PSGoogleReader/SBJSON/SBJsonTokeniser.h
  61. +452 −0 PSGoogleReader/SBJSON/SBJsonTokeniser.m
  62. +58 −0 PSGoogleReader/SBJSON/SBJsonUTF8Stream.h
  63. +139 −0 PSGoogleReader/SBJSON/SBJsonUTF8Stream.m
  64. +40 −59 PSGoogleReader/{JSON → SBJSON}/SBJsonWriter.h
  65. +109 −0 PSGoogleReader/SBJSON/SBJsonWriter.m
  66. +5 −4 PSGoogleReader/main.m
View
BIN .DS_Store
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+ <true/>
+ <key>IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges</key>
+ <true/>
+</dict>
+</plist>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+ type = "1"
+ version = "1.0">
+</Bucket>
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "34295800138BB27D00F8352F"
+ BuildableName = "PSGoogleReader.app"
+ BlueprintName = "PSGoogleReader"
+ ReferencedContainer = "container:PSGoogleReader.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "34295800138BB27D00F8352F"
+ BuildableName = "PSGoogleReader.app"
+ BlueprintName = "PSGoogleReader"
+ ReferencedContainer = "container:PSGoogleReader.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "34295800138BB27D00F8352F"
+ BuildableName = "PSGoogleReader.app"
+ BlueprintName = "PSGoogleReader"
+ ReferencedContainer = "container:PSGoogleReader.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "34295800138BB27D00F8352F"
+ BuildableName = "PSGoogleReader.app"
+ BlueprintName = "PSGoogleReader"
+ ReferencedContainer = "container:PSGoogleReader.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>PSGoogleReader.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>34295800138BB27D00F8352F</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
@@ -11,7 +11,7 @@
#import "RootViewController.h"
@interface DetailViewController ()
-@property (nonatomic, retain) UIPopoverController *popoverController;
+@property (nonatomic, strong) UIPopoverController *popoverController;
- (void)configureView;
@end
@@ -33,8 +33,7 @@ @implementation DetailViewController
- (void)setDetailItem:(id)newDetailItem
{
if (_detailItem != newDetailItem) {
- [_detailItem release];
- _detailItem = [newDetailItem retain];
+ _detailItem = newDetailItem;
// Update the view.
[self configureView];
@@ -84,7 +83,6 @@ - (void)splitViewController:(UISplitViewController *)svc willHideViewController:
NSMutableArray *items = [[self.toolbar items] mutableCopy];
[items insertObject:barButtonItem atIndex:0];
[self.toolbar setItems:items animated:YES];
- [items release];
self.popoverController = pc;
}
@@ -94,7 +92,6 @@ - (void)splitViewController:(UISplitViewController *)svc willShowViewController:
NSMutableArray *items = [[self.toolbar items] mutableCopy];
[items removeObjectAtIndex:0];
[self.toolbar setItems:items animated:YES];
- [items release];
self.popoverController = nil;
}
@@ -125,13 +122,4 @@ - (void)didReceiveMemoryWarning
// Release any cached data, images, etc that aren't in use.
}
-- (void)dealloc
-{
- [_myPopoverController release];
- [_toolbar release];
- [_detailItem release];
- [_detailDescriptionLabel release];
- [super dealloc];
-}
-
@end
@@ -1,15 +0,0 @@
-//
-// EntitiesConverter.h
-//
-
-#import <Foundation/Foundation.h>
-
-
-@interface EntitiesConverter : NSObject <NSXMLParserDelegate> {
- NSMutableString *resultString;
-}
-
-@property (nonatomic, retain) NSMutableString *resultString;
-
-- (NSString *)convertEntiesInString:(NSString *)string;
-@end
@@ -1,41 +0,0 @@
-//
-// EntitiesConverter.m
-//
-
-#import "EntitiesConverter.h"
-
-
-@implementation EntitiesConverter
-
-@synthesize resultString;
-
-- (id)init {
- if (([super init])) {
- resultString = [[NSMutableString alloc] init];
- }
-
- return self;
-}
-
-- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string {
- [self.resultString appendString:string];
-}
-
-- (NSString *)convertEntiesInString:(NSString *)string {
- [self.resultString setString:@""];
- if (string == nil) {
- NSLog(@"ERROR : Parameter string is nil");
- }
- NSString *xmlString = [NSString stringWithFormat:@"<d>%@</d>", string];
- NSData *data = [xmlString dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
- NSXMLParser *xmlParser = [[[NSXMLParser alloc] initWithData:data] autorelease];
- [xmlParser setDelegate:self];
- [xmlParser parse];
- return [NSString stringWithFormat:@"%@", resultString];
-}
-
-- (void)dealloc {
- [resultString release];
- [super dealloc];
-}
-@end
Oops, something went wrong.

0 comments on commit 2a1c150

Please sign in to comment.