renaming JSON classes to be frank specific

moredip · Aug 28, 2012 · 465366f · 465366f
1 parent 13534c6
commit 465366f
Show file tree

Hide file tree

Showing 18 changed files with 93 additions and 135 deletions.
diff --git a/Frank.xcodeproj/project.pbxproj b/Frank.xcodeproj/project.pbxproj
diff --git a/gem/frank-skeleton/libCocoaHTTPServer.a b/gem/frank-skeleton/libCocoaHTTPServer.a
diff --git a/gem/frank-skeleton/libFrank.a b/gem/frank-skeleton/libFrank.a
diff --git a/gem/frank-skeleton/libShelley.a b/gem/frank-skeleton/libShelley.a
diff --git a/lib/JSON/SBJSON.h → lib/JSON/Franks_SBJSON.h b/lib/JSON/SBJSON.h → lib/JSON/Franks_SBJSON.h
@@ -28,22 +28,19 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "SBJsonParser.h"
-#import "SBJsonWriter.h"
-
-@class Franks_SBJSON;
-@compatibility_alias SBJSON Franks_SBJSON;
+#import "Franks_SBJsonParser.h"
+#import "Franks_SBJsonWriter.h"
 
 /**
- @brief Facade for SBJsonWriter/SBJsonParser.
+ @brief Facade for Franks_SBJsonWriter/Franks_SBJsonParser.
 
- Requests are forwarded to instances of SBJsonWriter and SBJsonParser.
+ Requests are forwarded to instances of Franks_SBJsonWriter and Franks_SBJsonParser.
  */
-@interface SBJSON : SBJsonBase <SBJsonParser, SBJsonWriter> {
+@interface Franks_SBJSON : Franks_SBJsonBase <Franks_SBJsonParser, Franks_SBJsonWriter> {
 
 @private    
-    SBJsonParser *jsonParser;
-    SBJsonWriter *jsonWriter;
+    Franks_SBJsonParser *jsonParser;
+    Franks_SBJsonWriter *jsonWriter;
 }
 
 

diff --git a/lib/JSON/SBJSON.m → lib/JSON/Franks_SBJSON.m b/lib/JSON/SBJSON.m → lib/JSON/Franks_SBJSON.m
@@ -27,15 +27,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SBJSON.h"
+#import "Franks_SBJSON.h"
 
-@implementation SBJSON
+@implementation Franks_SBJSON
 
 - (id)init {
     self = [super init];
     if (self) {
-        jsonWriter = [SBJsonWriter new];
-        jsonParser = [SBJsonParser new];
+        jsonWriter = [Franks_SBJsonWriter new];
+        jsonParser = [Franks_SBJsonParser new];
         [self setMaxDepth:512];
 
     }

diff --git a/lib/JSON/SBJsonBase.h → lib/JSON/Franks_SBJsonBase.h b/lib/JSON/SBJsonBase.h → lib/JSON/Franks_SBJsonBase.h
diff --git a/lib/JSON/SBJsonBase.m → lib/JSON/Franks_SBJsonBase.m b/lib/JSON/SBJsonBase.m → lib/JSON/Franks_SBJsonBase.m
@@ -27,11 +27,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SBJsonBase.h"
+#import "Franks_SBJsonBase.h"
 NSString * SBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
 
 
-@implementation SBJsonBase
+@implementation Franks_SBJsonBase
 
 @synthesize errorTrace;
 @synthesize maxDepth;

diff --git a/lib/JSON/SBJsonParser.h → lib/JSON/Franks_SBJsonParser.h b/lib/JSON/SBJsonParser.h → lib/JSON/Franks_SBJsonParser.h
@@ -28,14 +28,14 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "SBJsonBase.h"
+#import "Franks_SBJsonBase.h"
 
 /**
   @brief Options for the parser class.
  
  This exists so the SBJSON facade can implement the options in the parser without having to re-declare them.
  */
-@protocol SBJsonParser
+@protocol Franks_SBJsonParser
 
 /**
  @brief Return the object represented by the given string.
@@ -49,10 +49,6 @@
 
 @end
 
-@class Franks_SBJsonParser;
-@compatibility_alias SBJsonParser Franks_SBJsonParser;
-
-
 
 /**
  @brief The JSON parser class.
@@ -75,7 +71,7 @@
  as we can thus avoid any loss of precision. (JSON allows ridiculously large numbers.)
  
  */
-@interface SBJsonParser : SBJsonBase <SBJsonParser> {
+@interface Franks_SBJsonParser : Franks_SBJsonBase <Franks_SBJsonParser> {
 
 @private
     const char *c;
@@ -84,7 +80,7 @@
 @end
 
 // don't use - exists for backwards compatibility with 2.1.x only. Will be removed in 2.3.
-@interface SBJsonParser (Private)
+@interface Franks_SBJsonParser (Private)
 - (id)fragmentWithString:(id)repr;
 @end
 

diff --git a/lib/JSON/SBJsonParser.m → lib/JSON/Franks_SBJsonParser.m b/lib/JSON/SBJsonParser.m → lib/JSON/Franks_SBJsonParser.m
@@ -27,9 +27,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SBJsonParser.h"
+#import "Franks_SBJsonParser.h"
 
-@interface SBJsonParser ()
+@interface Franks_SBJsonParser ()
 
 - (BOOL)scanValue:(NSObject **)o;
 
@@ -54,7 +54,7 @@ - (BOOL)scanIsAtEnd;
 #define skipDigits(c) while (isdigit(*c)) c++
 
 
-@implementation SBJsonParser
+@implementation Franks_SBJsonParser
 
 static char ctrl[0x22];
 

diff --git a/lib/JSON/SBJsonWriter.h → lib/JSON/Franks_SBJsonWriter.h b/lib/JSON/SBJsonWriter.h → lib/JSON/Franks_SBJsonWriter.h
@@ -28,14 +28,14 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "SBJsonBase.h"
+#import "Franks_SBJsonBase.h"
 
 /**
  @brief Options for the writer class.
  
- This exists so the SBJSON facade can implement the options in the writer without having to re-declare them.
+ This exists so the Franks_SBJSON facade can implement the options in the writer without having to re-declare them.
  */
-@protocol SBJsonWriter
+@protocol Franks_SBJsonWriter
 
 /**
  @brief Whether we are generating human-readable (multiline) JSON.
@@ -68,10 +68,6 @@
 
 @end
 
-@class Franks_SBJsonWriter;
-@compatibility_alias SBJsonWriter Franks_SBJsonWriter;
-
-
 
 /**
  @brief The JSON writer class.
@@ -95,7 +91,7 @@
  way you would expect.
  
  */
-@interface SBJsonWriter : SBJsonBase <SBJsonWriter> {
+@interface Franks_SBJsonWriter : Franks_SBJsonBase <Franks_SBJsonWriter> {
 
 @private
     BOOL sortKeys, humanReadable;
@@ -104,7 +100,7 @@
 @end
 
 // don't use - exists for backwards compatibility. Will be removed in 2.3.
-@interface SBJsonWriter (Private)
+@interface Franks_SBJsonWriter (Private)
 - (NSString*)stringWithFragment:(id)value;
 @end
 

diff --git a/lib/JSON/SBJsonWriter.m → lib/JSON/Franks_SBJsonWriter.m b/lib/JSON/SBJsonWriter.m → lib/JSON/Franks_SBJsonWriter.m
@@ -27,9 +27,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SBJsonWriter.h"
+#import "Franks_SBJsonWriter.h"
 
-@interface SBJsonWriter ()
+@interface Franks_SBJsonWriter ()
 
 - (BOOL)appendValue:(id)fragment into:(NSMutableString*)json;
 - (BOOL)appendArray:(NSArray*)fragment into:(NSMutableString*)json;
@@ -40,7 +40,7 @@ - (NSString*)indent;
 
 @end
 
-@implementation SBJsonWriter
+@implementation Franks_SBJsonWriter
 
 static NSMutableCharacterSet *kEscapeChars;
 

diff --git a/lib/JSON/JSON.h b/lib/JSON/JSON.h
@@ -44,7 +44,7 @@
  
 */
 
-#import "SBJSON.h"
-#import "NSObject+SBJSON.h"
-#import "NSString+SBJSON.h"
+#import "Franks_SBJSON.h"
+#import "NSObject+Franks_SBJSON.h"
+#import "NSString+Franks_SBJSON.h"
 
diff --git a/lib/JSON/NSObject+SBJSON.h → lib/JSON/NSObject+Franks_SBJSON.h b/lib/JSON/NSObject+SBJSON.h → lib/JSON/NSObject+Franks_SBJSON.h
@@ -37,7 +37,7 @@
  of standard objects to the objects themselves. This means you can call the
  -JSONRepresentation method on an NSArray object and it'll do what you want.
  */
-@interface NSObject (NSObject_SBJSON)
+@interface NSObject (NSObject_Franks_SBJSON)
 
 /**
  @brief Returns a string containing the receiver encoded as a JSON fragment.

diff --git a/lib/JSON/NSObject+SBJSON.m → lib/JSON/NSObject+Franks_SBJSON.m b/lib/JSON/NSObject+SBJSON.m → lib/JSON/NSObject+Franks_SBJSON.m
@@ -27,13 +27,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "NSObject+SBJSON.h"
-#import "SBJsonWriter.h"
+#import "NSObject+Franks_SBJSON.h"
+#import "Franks_SBJsonWriter.h"
 
-@implementation NSObject (NSObject_SBJSON)
+@implementation NSObject (NSObject_Franks_SBJSON)
 
 - (NSString *)JSONFragment {
-    SBJsonWriter *jsonWriter = [SBJsonWriter new];
+    Franks_SBJsonWriter *jsonWriter = [Franks_SBJsonWriter new];
     NSString *json = [jsonWriter stringWithFragment:self];    
     if (!json)
         NSLog(@"-JSONFragment failed. Error trace is: %@", [jsonWriter errorTrace]);
@@ -42,7 +42,7 @@ - (NSString *)JSONFragment {
 }
 
 - (NSString *)JSONRepresentation {
-    SBJsonWriter *jsonWriter = [SBJsonWriter new];    
+    Franks_SBJsonWriter *jsonWriter = [Franks_SBJsonWriter new];    
     NSString *json = [jsonWriter stringWithObject:self];
     if (!json)
         NSLog(@"-JSONRepresentation failed. Error trace is: %@", [jsonWriter errorTrace]);

diff --git a/lib/JSON/NSString+SBJSON.h → lib/JSON/NSString+Franks_SBJSON.h b/lib/JSON/NSString+SBJSON.h → lib/JSON/NSString+Franks_SBJSON.h
@@ -34,7 +34,7 @@
  
 This is a category on NSString that adds methods for parsing the target string.
 */
-@interface NSString (NSString_SBJSON)
+@interface NSString (NSString_Franks_SBJSON)
 
 
 /**

diff --git a/lib/JSON/NSString+SBJSON.m → lib/JSON/NSString+Franks_SBJSON.m b/lib/JSON/NSString+SBJSON.m → lib/JSON/NSString+Franks_SBJSON.m
@@ -27,14 +27,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "NSString+SBJSON.h"
-#import "SBJsonParser.h"
+#import "NSString+Franks_SBJSON.h"
+#import "Franks_SBJsonParser.h"
 
-@implementation NSString (NSString_SBJSON)
+@implementation NSString (NSString_Franks_SBJSON)
 
 - (id)JSONFragmentValue
 {
-    SBJsonParser *jsonParser = [SBJsonParser new];    
+    Franks_SBJsonParser *jsonParser = [Franks_SBJsonParser new];    
     id repr = [jsonParser fragmentWithString:self];    
     if (!repr)
         NSLog(@"-JSONFragmentValue failed. Error trace is: %@", [jsonParser errorTrace]);
@@ -44,7 +44,7 @@ - (id)JSONFragmentValue
 
 - (id)JSONValue
 {
-    SBJsonParser *jsonParser = [SBJsonParser new];
+    Franks_SBJsonParser *jsonParser = [Franks_SBJsonParser new];
     id repr = [jsonParser objectWithString:self];
     if (!repr)
         NSLog(@"-JSONValue failed. Error trace is: %@", [jsonParser errorTrace]);

diff --git a/src/OrientationCommand.m b/src/OrientationCommand.m
@@ -7,7 +7,7 @@
 //
 
 #import "OrientationCommand.h"
-#import "NSObject+SBJSON.h"
+#import "NSObject+Franks_SBJSON.h"
 
 
 @implementation OrientationCommand