Merge pull request #252 from cearley/master

Fix for issue #219
escoz · Aug 3, 2012 · 7d59204 · 7d59204
2 parents 1cc41a0 + 0683fe0
commit 7d59204
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/QuickDialog.xcodeproj/project.pbxproj b/QuickDialog.xcodeproj/project.pbxproj
@@ -153,8 +153,8 @@
 		F2F23A22152DD48B00EB6685 /* QPickerTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = F2F23A1B152DD48B00EB6685 /* QPickerTableViewCell.h */; };
 		F2F23A23152DD48B00EB6685 /* QPickerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F2F23A1C152DD48B00EB6685 /* QPickerTableViewCell.m */; };
 		F2F23A24152DD48B00EB6685 /* QPickerValueParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F2F23A1D152DD48B00EB6685 /* QPickerValueParser.h */; };
-		F2F23A25152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F2F23A1E152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.h */; };
-		F2F23A26152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F2F23A1F152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.m */; };
+		F2F23A25152DD48B00EB6685 /* QPickerTabDelimitedStringParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F2F23A1E152DD48B00EB6685 /* QPickerTabDelimitedStringParser.h */; };
+		F2F23A26152DD48B00EB6685 /* QPickerTabDelimitedStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F2F23A1F152DD48B00EB6685 /* QPickerTabDelimitedStringParser.m */; };
 		F2F23A26152DD48B00EB6687 /* QuickDialogController+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = F2F23A26152DD48B00EB6686 /* QuickDialogController+Helpers.m */; };
 		F2F23A26152DD48B00EB6689 /* QuickDialogController+Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = F2F23A26152DD48B00EB6688 /* QuickDialogController+Helpers.h */; };
 /* End PBXBuildFile section */
@@ -331,8 +331,8 @@
 		F2F23A1B152DD48B00EB6685 /* QPickerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QPickerTableViewCell.h; path = quickdialog/QPickerTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		F2F23A1C152DD48B00EB6685 /* QPickerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QPickerTableViewCell.m; path = quickdialog/QPickerTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		F2F23A1D152DD48B00EB6685 /* QPickerValueParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QPickerValueParser.h; path = quickdialog/QPickerValueParser.h; sourceTree = SOURCE_ROOT; };
-		F2F23A1E152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QPickerWhitespaceDelimitedStringParser.h; path = quickdialog/QPickerWhitespaceDelimitedStringParser.h; sourceTree = SOURCE_ROOT; };
-		F2F23A1F152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QPickerWhitespaceDelimitedStringParser.m; path = quickdialog/QPickerWhitespaceDelimitedStringParser.m; sourceTree = SOURCE_ROOT; };
+		F2F23A1E152DD48B00EB6685 /* QPickerTabDelimitedStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QPickerTabDelimitedStringParser.h; path = quickdialog/QPickerTabDelimitedStringParser.h; sourceTree = SOURCE_ROOT; };
+		F2F23A1F152DD48B00EB6685 /* QPickerTabDelimitedStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QPickerTabDelimitedStringParser.m; path = quickdialog/QPickerTabDelimitedStringParser.m; sourceTree = SOURCE_ROOT; };
 		F2F23A26152DD48B00EB6686 /* QuickDialogController+Helpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "QuickDialogController+Helpers.m"; path = "quickdialog/QuickDialogController+Helpers.m"; sourceTree = SOURCE_ROOT; };
 		F2F23A26152DD48B00EB6688 /* QuickDialogController+Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "QuickDialogController+Helpers.h"; path = "quickdialog/QuickDialogController+Helpers.h"; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -612,8 +612,8 @@
 				F2F23A1B152DD48B00EB6685 /* QPickerTableViewCell.h */,
 				F2F23A1C152DD48B00EB6685 /* QPickerTableViewCell.m */,
 				F2F23A1D152DD48B00EB6685 /* QPickerValueParser.h */,
-				F2F23A1E152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.h */,
-				F2F23A1F152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.m */,
+				F2F23A1E152DD48B00EB6685 /* QPickerTabDelimitedStringParser.h */,
+				F2F23A1F152DD48B00EB6685 /* QPickerTabDelimitedStringParser.m */,
 			);
 			name = QPickerElement;
 			sourceTree = "<group>";
@@ -680,7 +680,7 @@
 				F2F23A20152DD48B00EB6685 /* QPickerElement.h in Headers */,
 				F2F23A22152DD48B00EB6685 /* QPickerTableViewCell.h in Headers */,
 				F2F23A24152DD48B00EB6685 /* QPickerValueParser.h in Headers */,
-				F2F23A25152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.h in Headers */,
+				F2F23A25152DD48B00EB6685 /* QPickerTabDelimitedStringParser.h in Headers */,
 				F2F23A26152DD48B00EB6689 /* QuickDialogController+Helpers.h in Headers */,
 				D894F38A15559D34000E3C0F /* NSMutableArray+IMSExtensions.h in Headers */,
 				F2304357156CDFDD006D0A56 /* QTextField.h in Headers */,
@@ -837,7 +837,7 @@
 				F2E614A3151CA1A100F36976 /* QSelectItemElement.m in Sources */,
 				F2F23A21152DD48B00EB6685 /* QPickerElement.m in Sources */,
 				F2F23A23152DD48B00EB6685 /* QPickerTableViewCell.m in Sources */,
-				F2F23A26152DD48B00EB6685 /* QPickerWhitespaceDelimitedStringParser.m in Sources */,
+				F2F23A26152DD48B00EB6685 /* QPickerTabDelimitedStringParser.m in Sources */,
 				F2F23A26152DD48B00EB6687 /* QuickDialogController+Helpers.m in Sources */,
 				D894F38B15559D34000E3C0F /* NSMutableArray+IMSExtensions.m in Sources */,
 				F2304358156CDFDD006D0A56 /* QTextField.m in Sources */,

diff --git a/quickdialog/QPickerElement.m b/quickdialog/QPickerElement.m
@@ -1,6 +1,6 @@
 #import "QPickerElement.h"
 #import "QPickerTableViewCell.h"
-#import "QPickerWhitespaceDelimitedStringParser.h"
+#import "QPickerTabDelimitedStringParser.h"
 
 @implementation QPickerElement
 {
@@ -18,7 +18,7 @@ @implementation QPickerElement
 - (QPickerElement *)init
 {
     if (self = [super init]) {
-        self.valueParser = [QPickerWhitespaceDelimitedStringParser new];
+        self.valueParser = [QPickerTabDelimitedStringParser new];
     }
     return self;
 }
@@ -27,7 +27,7 @@ - (QPickerElement *)initWithTitle:(NSString *)title items:(NSArray *)items value
 {
     if ((self = [super initWithTitle:title Value:value])) {
         _items = items;
-        self.valueParser = [QPickerWhitespaceDelimitedStringParser new];
+        self.valueParser = [QPickerTabDelimitedStringParser new];
     }
     return self;
 }

diff --git a/.../QPickerWhitespaceDelimitedStringParser.h → ...kdialog/QPickerTabDelimitedStringParser.h b/.../QPickerWhitespaceDelimitedStringParser.h → ...kdialog/QPickerTabDelimitedStringParser.h
@@ -1,5 +1,5 @@
 //
-//  QPickerWhitespaceDelimitedStringParser.h
+//  QPickerTabDelimitedStringParser.h
 //  QuickDialog
 //
 //  Created by HiveHicks on 05.04.12.
@@ -8,6 +8,6 @@
 #import <Foundation/Foundation.h>
 #import "QPickerValueParser.h"
 
-@interface QPickerWhitespaceDelimitedStringParser : NSObject <QPickerValueParser>
+@interface QPickerTabDelimitedStringParser : NSObject <QPickerValueParser>
 
 @end
diff --git a/.../QPickerWhitespaceDelimitedStringParser.m → ...kdialog/QPickerTabDelimitedStringParser.m b/.../QPickerWhitespaceDelimitedStringParser.m → ...kdialog/QPickerTabDelimitedStringParser.m
@@ -1,24 +1,24 @@
 //
-//  QPickerWhitespaceDelimitedStringParser.m
+//  QPickerTabDelimitedStringParser.m
 //  QuickDialog
 //
 //  Created by HiveHicks on 05.04.12.
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
-#import "QPickerWhitespaceDelimitedStringParser.h"
+#import "QPickerTabDelimitedStringParser.h"
 
-@implementation QPickerWhitespaceDelimitedStringParser
+@implementation QPickerTabDelimitedStringParser
 
 - (id)objectFromComponentsValues:(NSArray *)componentsValues
 {
-    return [componentsValues componentsJoinedByString:@" "];
+    return [componentsValues componentsJoinedByString:@"\t"];
 }
 
 - (NSArray *)componentsValuesFromObject:(id)object
 {
     NSString *stringValue = [object isKindOfClass:[NSString class]] ? object : [object description];
-    return [stringValue componentsSeparatedByString:@" "];
+    return [stringValue componentsSeparatedByString:@"\t"];
 }
 
 @end