From 925b645993e3db048315b3af79ff96436770c8f7 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeri@users.sourceforge.net>
Date: Thu, 18 Aug 2011 02:37:29 +0200
Subject: [PATCH] Switch to view based tables

---
 Medianno.xcodeproj/project.pbxproj |  23 +-
 Medianno/MADocWindow.h             |   2 -
 Medianno/MADocWindow.mm            |   7 -
 Medianno/MATokenFieldCell.mm       |  19 +-
 Medianno/en.lproj/MADocument.xib   | 508 +++++++++++++++++++++--------
 5 files changed, 390 insertions(+), 169 deletions(-)

diff --git a/Medianno.xcodeproj/project.pbxproj b/Medianno.xcodeproj/project.pbxproj
index a070e73..66ac7d3 100644
--- a/Medianno.xcodeproj/project.pbxproj
+++ b/Medianno.xcodeproj/project.pbxproj
@@ -25,11 +25,11 @@
 		950BB7A713F467A400D8E669 /* MAAddMedia.xib in Resources */ = {isa = PBXBuildFile; fileRef = 950BB7A513F467A400D8E669 /* MAAddMedia.xib */; };
 		950BB7AA13F46BAF00D8E669 /* MAAddMediaSheet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 950BB7A913F46BAF00D8E669 /* MAAddMediaSheet.mm */; };
 		950BB7AD13F46ECF00D8E669 /* MAAppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 950BB7AC13F46ECF00D8E669 /* MAAppController.mm */; };
-		95B3748713F87B17009BB79A /* MATokenFieldCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95B3748613F87B17009BB79A /* MATokenFieldCell.mm */; };
 		95BCFA2113F76A04000F650F /* app.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95BCFA1F13F76A04000F650F /* app.icns */; };
 		95BCFA2213F76A04000F650F /* doc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95BCFA2013F76A04000F650F /* doc.icns */; };
 		95BCFA2E13F8A3AD000F650F /* MAShortenQTTime.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95BCFA2D13F8A3AD000F650F /* MAShortenQTTime.mm */; };
 		95C534E013F732A200A07932 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 95C534DE13F732A200A07932 /* Localizable.strings */; };
+		95CA841113FC149B00AE5AC4 /* MATokenFieldCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95CA841013FC149B00AE5AC4 /* MATokenFieldCell.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -62,13 +62,13 @@
 		950BB7A913F46BAF00D8E669 /* MAAddMediaSheet.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAAddMediaSheet.mm; sourceTree = "<group>"; };
 		950BB7AB13F46ECF00D8E669 /* MAAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAAppController.h; sourceTree = "<group>"; };
 		950BB7AC13F46ECF00D8E669 /* MAAppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAAppController.mm; sourceTree = "<group>"; };
-		95B3748513F87B17009BB79A /* MATokenFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MATokenFieldCell.h; sourceTree = "<group>"; };
-		95B3748613F87B17009BB79A /* MATokenFieldCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MATokenFieldCell.mm; sourceTree = "<group>"; };
 		95BCFA1F13F76A04000F650F /* app.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = app.icns; path = Resources/app.icns; sourceTree = "<group>"; };
 		95BCFA2013F76A04000F650F /* doc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = doc.icns; path = Resources/doc.icns; sourceTree = "<group>"; };
 		95BCFA2C13F8A3AD000F650F /* MAShortenQTTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAShortenQTTime.h; sourceTree = "<group>"; };
 		95BCFA2D13F8A3AD000F650F /* MAShortenQTTime.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAShortenQTTime.mm; sourceTree = "<group>"; };
 		95C534DF13F732A200A07932 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		95CA840F13FC149B00AE5AC4 /* MATokenFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MATokenFieldCell.h; sourceTree = "<group>"; };
+		95CA841013FC149B00AE5AC4 /* MATokenFieldCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MATokenFieldCell.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -168,6 +168,8 @@
 		950BB7B013F4803500D8E669 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				95CA840F13FC149B00AE5AC4 /* MATokenFieldCell.h */,
+				95CA841013FC149B00AE5AC4 /* MATokenFieldCell.mm */,
 				950BB67C13F1F26200D8E669 /* MADocument.h */,
 				950BB67D13F1F26200D8E669 /* MADocument.mm */,
 				950BB7A813F46BAF00D8E669 /* MAAddMediaSheet.h */,
@@ -176,8 +178,6 @@
 				950BB7AC13F46ECF00D8E669 /* MAAppController.mm */,
 				950BB78413F2D95500D8E669 /* MADocWindow.h */,
 				950BB78513F2D95500D8E669 /* MADocWindow.mm */,
-				95B3748513F87B17009BB79A /* MATokenFieldCell.h */,
-				95B3748613F87B17009BB79A /* MATokenFieldCell.mm */,
 				95BCFA2C13F8A3AD000F650F /* MAShortenQTTime.h */,
 				95BCFA2D13F8A3AD000F650F /* MAShortenQTTime.mm */,
 			);
@@ -210,6 +210,7 @@
 		950BB65D13F1F26200D8E669 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0410;
 				ORGANIZATIONNAME = "Matthias Neeracher";
 			};
 			buildConfigurationList = 950BB66013F1F26200D8E669 /* Build configuration list for PBXProject "Medianno" */;
@@ -262,8 +263,8 @@
 				950BB78613F2D95500D8E669 /* MADocWindow.mm in Sources */,
 				950BB7AA13F46BAF00D8E669 /* MAAddMediaSheet.mm in Sources */,
 				950BB7AD13F46ECF00D8E669 /* MAAppController.mm in Sources */,
-				95B3748713F87B17009BB79A /* MATokenFieldCell.mm in Sources */,
 				95BCFA2E13F8A3AD000F650F /* MAShortenQTTime.mm in Sources */,
+				95CA841113FC149B00AE5AC4 /* MATokenFieldCell.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -346,7 +347,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.7;
 			};
 			name = Debug;
 		};
@@ -365,7 +366,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.7;
 			};
 			name = Release;
 		};
@@ -376,8 +377,9 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch";
 				INFOPLIST_FILE = "Medianno/Medianno-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -389,8 +391,9 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch";
 				INFOPLIST_FILE = "Medianno/Medianno-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
diff --git a/Medianno/MADocWindow.h b/Medianno/MADocWindow.h
index 6e5a5f9..6cdf45b 100644
--- a/Medianno/MADocWindow.h
+++ b/Medianno/MADocWindow.h
@@ -12,10 +12,8 @@
     IBOutlet NSArrayController*     mediaController;
     IBOutlet NSArrayController*     annotationController;
     IBOutlet QTMovieView *          movieView;
-    IBOutlet NSTokenField *         tokenFieldProto;
     IBOutlet NSTableView *          mediaTable;
     IBOutlet NSTableView *          annotationTable;
-    IBOutlet NSTableColumn *        tokenColumn;
     QTTime                          lastMovieTime;
 }
 
diff --git a/Medianno/MADocWindow.mm b/Medianno/MADocWindow.mm
index de3d7a9..c8347ad 100644
--- a/Medianno/MADocWindow.mm
+++ b/Medianno/MADocWindow.mm
@@ -12,7 +12,6 @@
 #import "MAAddMediaSheet.h"
 #import "MADocument.h"
 #import "MAAnno.h"
-#import "MATokenFieldCell.h"
 
 @implementation MADocWindow
 
@@ -28,12 +27,6 @@
     [super windowDidLoad];
     [mediaController setSortDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"date" ascending:YES]]];
     [annotationController setSortDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"location" ascending:YES]]];
-    NSTokenFieldCell * tokenCellProto   = [tokenFieldProto cell];
-    NSTokenFieldCell * tokenCell        = [[MATokenFieldCell alloc] init];
-    [tokenCell setDelegate:self];
-    [tokenCell setFont:[tokenCellProto font]];
-    [tokenCell setTokenizingCharacterSet:[NSCharacterSet characterSetWithCharactersInString:@";"]];
-    [tokenColumn setDataCell:tokenCell];
     [NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(updateMovieTime:) userInfo:nil repeats:YES];
 }
 
diff --git a/Medianno/MATokenFieldCell.mm b/Medianno/MATokenFieldCell.mm
index dde3c07..c0585fa 100644
--- a/Medianno/MATokenFieldCell.mm
+++ b/Medianno/MATokenFieldCell.mm
@@ -8,16 +8,21 @@
 
 #import "MATokenFieldCell.h"
 
+static NSCharacterSet * sOverrideTokenizingCharacters;
+
 @implementation MATokenFieldCell
 
-- (void)updateTrackingAreaWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+- (NSCharacterSet *)tokenizingCharacterSet
 {
-    //
-    // Sorry for this horrible hack. We override this so our superclass doesn't get it. 
-    // If it does, and -[NSTableView updateTrackingAreas] is called while this cell is
-    // selected, it will set up a tracking area covering the entire table view, with 
-    // nasty consequences. Ignoring the call doesn't seem to have adverse consequences.
-    //
+    if (!sOverrideTokenizingCharacters)
+        sOverrideTokenizingCharacters = [[NSCharacterSet characterSetWithCharactersInString:@";"] retain];
+    
+    return sOverrideTokenizingCharacters;
+}
+
+- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+    [super drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 @end
diff --git a/Medianno/en.lproj/MADocument.xib b/Medianno/en.lproj/MADocument.xib
index 16691f1..d6a42ae 100644
--- a/Medianno/en.lproj/MADocument.xib
+++ b/Medianno/en.lproj/MADocument.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">11A511</string>
+		<string key="IBDocument.SystemVersion">11B26</string>
 		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
 		<string key="IBDocument.AppKitVersion">1138</string>
 		<string key="IBDocument.HIToolboxVersion">566.00</string>
@@ -21,25 +21,27 @@
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSScroller</string>
-			<string>NSSplitView</string>
+			<string>NSButton</string>
+			<string>NSCustomObject</string>
 			<string>NSArrayController</string>
-			<string>NSTableHeaderView</string>
-			<string>NSScrollView</string>
-			<string>QTMovieView</string>
-			<string>NSTextFieldCell</string>
-			<string>NSBox</string>
+			<string>NSSplitView</string>
 			<string>NSDateFormatter</string>
 			<string>NSTableView</string>
-			<string>NSTokenField</string>
-			<string>NSTokenFieldCell</string>
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSView</string>
+			<string>NSTableCellView</string>
+			<string>NSTextField</string>
 			<string>NSWindowTemplate</string>
-			<string>NSUserDefaultsController</string>
+			<string>NSTextFieldCell</string>
+			<string>NSButtonCell</string>
 			<string>NSTableColumn</string>
+			<string>NSBox</string>
+			<string>NSView</string>
+			<string>NSTokenFieldCell</string>
+			<string>NSScrollView</string>
+			<string>QTMovieView</string>
+			<string>NSUserDefaultsController</string>
+			<string>NSScroller</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTokenField</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -61,57 +63,6 @@
 			<object class="NSCustomObject" id="613418571">
 				<string key="NSClassName">FirstResponder</string>
 			</object>
-			<object class="NSTokenField" id="398992771">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">-2147483380</int>
-				<object class="NSMutableSet" key="NSDragTypes">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSArray" key="set.sortedObjects">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<string>NSStringPboardType</string>
-					</object>
-				</object>
-				<string key="NSFrameSize">{550, 22}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
-				<string key="NSReuseIdentifierKey">_NS:3123</string>
-				<bool key="NSEnabled">YES</bool>
-				<object class="NSTokenFieldCell" key="NSCell" id="194508126">
-					<int key="NSCellFlags">341966336</int>
-					<int key="NSCellFlags2">0</int>
-					<object class="NSFont" key="NSSupport">
-						<string key="NSName">LucidaGrande</string>
-						<double key="NSSize">12</double>
-						<int key="NSfFlags">16</int>
-					</object>
-					<string key="NSCellIdentifier">_NS:3123</string>
-					<reference key="NSControlView" ref="398992771"/>
-					<bool key="NSDrawsBackground">YES</bool>
-					<object class="NSColor" key="NSBackgroundColor" id="853682264">
-						<int key="NSColorSpace">6</int>
-						<string key="NSCatalogName">System</string>
-						<string key="NSColorName">textBackgroundColor</string>
-						<object class="NSColor" key="NSColor" id="436396164">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-						</object>
-					</object>
-					<object class="NSColor" key="NSTextColor" id="288648873">
-						<int key="NSColorSpace">6</int>
-						<string key="NSCatalogName">System</string>
-						<string key="NSColorName">controlTextColor</string>
-						<object class="NSColor" key="NSColor" id="1064784368">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
-						</object>
-					</object>
-					<reference key="NSDelegate" ref="398992771"/>
-					<double key="NSCompletionDelay">0.0</double>
-					<int key="NSTokenStyle">0</int>
-				</object>
-				<int key="NSTokenFieldVersion">2</int>
-			</object>
 			<object class="NSWindowTemplate" id="275939982">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
@@ -190,7 +141,10 @@
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">headerTextColor</string>
-																	<reference key="NSColor" ref="1064784368"/>
+																	<object class="NSColor" key="NSColor" id="1064784368">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MAA</bytes>
+																	</object>
 																</object>
 															</object>
 															<object class="NSTextFieldCell" key="NSDataCell" id="833593490">
@@ -207,12 +161,17 @@
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">controlBackgroundColor</string>
-																	<object class="NSColor" key="NSColor">
+																	<object class="NSColor" key="NSColor" id="604363581">
 																		<int key="NSColorSpace">3</int>
 																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 																	</object>
 																</object>
-																<reference key="NSTextColor" ref="288648873"/>
+																<object class="NSColor" key="NSTextColor" id="288648873">
+																	<int key="NSColorSpace">6</int>
+																	<string key="NSCatalogName">System</string>
+																	<string key="NSColorName">controlTextColor</string>
+																	<reference key="NSColor" ref="1064784368"/>
+																</object>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
@@ -258,7 +217,10 @@
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">headerColor</string>
-																	<reference key="NSColor" ref="436396164"/>
+																	<object class="NSColor" key="NSColor" id="436396164">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MQA</bytes>
+																	</object>
 																</object>
 																<reference key="NSTextColor" ref="284725230"/>
 															</object>
@@ -436,7 +398,7 @@
 																	<string key="NSFrameSize">{1278, 565}</string>
 																	<reference key="NSSuperview" ref="51131752"/>
 																	<reference key="NSWindow"/>
-																	<reference key="NSNextKeyView" ref="715872882"/>
+																	<reference key="NSNextKeyView" ref="742629842"/>
 																	<string key="NSReuseIdentifierKey">_NS:1197</string>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTableHeaderView" key="NSHeaderView" id="995480265">
@@ -543,7 +505,7 @@
 																	<double key="NSIntercellSpacingHeight">2</double>
 																	<reference key="NSBackgroundColor" ref="436396164"/>
 																	<reference key="NSGridColor" ref="837522117"/>
-																	<double key="NSRowHeight">19</double>
+																	<double key="NSRowHeight">17</double>
 																	<int key="NSTvFlags">-71270400</int>
 																	<reference key="NSDelegate"/>
 																	<reference key="NSDataSource"/>
@@ -616,12 +578,12 @@
 													<reference key="NSHScroller" ref="387598056"/>
 													<reference key="NSContentView" ref="51131752"/>
 													<reference key="NSHeaderClipView" ref="794153134"/>
-													<bytes key="NSScrollAmts">QSAAAEEgAABBqAAAQagAAA</bytes>
+													<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 												</object>
 												<object class="NSButton" id="777053201">
 													<reference key="NSNextResponder" ref="1058980817"/>
 													<int key="NSvFlags">268</int>
-													<string key="NSFrame">{{0, 582}, {103, 18}}</string>
+													<string key="NSFrame">{{0, 582}, {103, 20}}</string>
 													<reference key="NSSuperview" ref="1058980817"/>
 													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="56699403"/>
@@ -661,7 +623,12 @@
 										<int key="NSCellFlags2">0</int>
 										<string key="NSContents">Box</string>
 										<reference key="NSSupport" ref="26"/>
-										<reference key="NSBackgroundColor" ref="853682264"/>
+										<object class="NSColor" key="NSBackgroundColor">
+											<int key="NSColorSpace">6</int>
+											<string key="NSCatalogName">System</string>
+											<string key="NSColorName">textBackgroundColor</string>
+											<reference key="NSColor" ref="436396164"/>
+										</object>
 										<object class="NSColor" key="NSTextColor">
 											<int key="NSColorSpace">3</int>
 											<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
@@ -687,7 +654,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="196617426"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMinSize">{450, 422}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<int key="NSWindowCollectionBehavior">128</int>
@@ -703,7 +670,6 @@
 					<string key="NSEntityName">MAMedia</string>
 				</object>
 				<bool key="_NSIsUsingManagedProxy">YES</bool>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
 				<bool key="NSPreservesSelection">YES</bool>
 				<bool key="NSSelectsInsertedObjects">YES</bool>
 				<bool key="NSFilterRestrictsInsertion">YES</bool>
@@ -878,30 +844,6 @@
 					</object>
 					<int key="connectionID">100160</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tokenFieldProto</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="398992771"/>
-					</object>
-					<int key="connectionID">100173</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tokenColumn</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="995592652"/>
-					</object>
-					<int key="connectionID">100174</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="194508126"/>
-						<reference key="destination" ref="512844837"/>
-					</object>
-					<int key="connectionID">100175</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">annotationTable</string>
@@ -958,14 +900,6 @@
 					</object>
 					<int key="connectionID">100180</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="620291245"/>
-						<reference key="destination" ref="512844837"/>
-					</object>
-					<int key="connectionID">100181</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.location</string>
@@ -1045,6 +979,203 @@
 					</object>
 					<int key="connectionID">100201</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">textField</string>
+						<object class="NSTableCellView" key="source" id="742629842">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSTextField" id="404987295">
+									<reference key="NSNextResponder" ref="742629842"/>
+									<int key="NSvFlags">266</int>
+									<string key="NSFrameSize">{100, 17}</string>
+									<reference key="NSSuperview" ref="742629842"/>
+									<reference key="NSNextKeyView" ref="691721747"/>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="953787841">
+										<int key="NSCellFlags">67239488</int>
+										<int key="NSCellFlags2">71305216</int>
+										<string key="NSContents">Table View Cell</string>
+										<reference key="NSSupport" ref="23905036"/>
+										<reference key="NSControlView" ref="404987295"/>
+										<object class="NSColor" key="NSBackgroundColor" id="101210476">
+											<int key="NSColorSpace">6</int>
+											<string key="NSCatalogName">System</string>
+											<string key="NSColorName">controlColor</string>
+											<reference key="NSColor" ref="604363581"/>
+										</object>
+										<reference key="NSTextColor" ref="288648873"/>
+									</object>
+								</object>
+							</object>
+							<string key="NSFrame">{{1, 1}, {100, 17}}</string>
+							<reference key="NSNextKeyView" ref="404987295"/>
+						</object>
+						<reference key="destination" ref="404987295"/>
+					</object>
+					<int key="connectionID">100205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">textField</string>
+						<object class="NSTableCellView" key="source" id="852933600">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSTextField" id="116555558">
+									<reference key="NSNextResponder" ref="852933600"/>
+									<int key="NSvFlags">266</int>
+									<string key="NSFrameSize">{620, 17}</string>
+									<reference key="NSSuperview" ref="852933600"/>
+									<reference key="NSNextKeyView" ref="715872882"/>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="1032175568">
+										<int key="NSCellFlags">337772097</int>
+										<int key="NSCellFlags2">272631808</int>
+										<string key="NSContents">Table View Cell</string>
+										<reference key="NSSupport" ref="23905036"/>
+										<reference key="NSControlView" ref="116555558"/>
+										<reference key="NSBackgroundColor" ref="101210476"/>
+										<reference key="NSTextColor" ref="288648873"/>
+									</object>
+								</object>
+							</object>
+							<string key="NSFrame">{{656, 1}, {620, 17}}</string>
+							<reference key="NSNextKeyView" ref="116555558"/>
+						</object>
+						<reference key="destination" ref="116555558"/>
+					</object>
+					<int key="connectionID">100213</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="620291245"/>
+						<reference key="destination" ref="603895450"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="620291245"/>
+							<reference key="NSDestination" ref="603895450"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100217</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: objectValue.notes</string>
+						<reference key="source" ref="116555558"/>
+						<reference key="destination" ref="852933600"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="116555558"/>
+							<reference key="NSDestination" ref="852933600"/>
+							<string key="NSLabel">value: objectValue.notes</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">objectValue.notes</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100219</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: objectValue.location</string>
+						<reference key="source" ref="404987295"/>
+						<reference key="destination" ref="742629842"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="404987295"/>
+							<reference key="NSDestination" ref="742629842"/>
+							<string key="NSLabel">value: objectValue.location</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">objectValue.location</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">MAShortenQTTime</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100220</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<object class="NSTokenFieldCell" key="source" id="678542468">
+							<int key="NSCellFlags">337772032</int>
+							<int key="NSCellFlags2">4194304</int>
+							<object class="NSFont" key="NSSupport">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">12</double>
+								<int key="NSfFlags">16</int>
+							</object>
+							<string key="NSCellIdentifier">_NS:3123</string>
+							<reference key="NSControlView" ref="670804923"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="101210476"/>
+							<reference key="NSTextColor" ref="288648873"/>
+							<reference key="NSDelegate" ref="670804923"/>
+							<double key="NSCompletionDelay">0.0</double>
+							<int key="NSTokenStyle">0</int>
+						</object>
+						<reference key="destination" ref="512844837"/>
+					</object>
+					<int key="connectionID">100223</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: objectValue.tagDescriptions</string>
+						<object class="NSTokenField" key="source" id="670804923">
+							<reference key="NSNextResponder" ref="691721747"/>
+							<int key="NSvFlags">268</int>
+							<object class="NSMutableSet" key="NSDragTypes">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="set.sortedObjects">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSStringPboardType</string>
+								</object>
+							</object>
+							<string key="NSFrameSize">{549, 17}</string>
+							<reference key="NSSuperview" ref="691721747"/>
+							<reference key="NSNextKeyView" ref="852933600"/>
+							<string key="NSReuseIdentifierKey">_NS:3123</string>
+							<bool key="NSEnabled">YES</bool>
+							<reference key="NSCell" ref="678542468"/>
+							<int key="NSTokenFieldVersion">2</int>
+						</object>
+						<object class="NSTableCellView" key="destination" id="691721747">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<reference ref="670804923"/>
+							</object>
+							<string key="NSFrame">{{104, 1}, {549, 17}}</string>
+							<reference key="NSNextKeyView" ref="670804923"/>
+						</object>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="670804923"/>
+							<reference key="NSDestination" ref="691721747"/>
+							<string key="NSLabel">value: objectValue.tagDescriptions</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">objectValue.tagDescriptions</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100225</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="620291245"/>
+						<reference key="destination" ref="512844837"/>
+					</object>
+					<int key="connectionID">100228</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1187,6 +1318,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="288842735"/>
+							<reference ref="742629842"/>
 						</object>
 						<reference key="parent" ref="620291245"/>
 					</object>
@@ -1196,6 +1328,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="103524730"/>
+							<reference ref="691721747"/>
 						</object>
 						<reference key="parent" ref="620291245"/>
 					</object>
@@ -1205,6 +1338,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="358246992"/>
+							<reference ref="852933600"/>
 						</object>
 						<reference key="parent" ref="620291245"/>
 					</object>
@@ -1217,7 +1351,6 @@
 						<int key="objectID">100041</int>
 						<reference key="object" ref="103524730"/>
 						<reference key="parent" ref="995592652"/>
-						<string key="objectName">Token Field Cell - Text Cell</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100042</int>
@@ -1308,20 +1441,6 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">AnnotationController</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100161</int>
-						<reference key="object" ref="398992771"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="194508126"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100162</int>
-						<reference key="object" ref="194508126"/>
-						<reference key="parent" ref="398992771"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100197</int>
 						<reference key="object" ref="777053201"/>
@@ -1336,6 +1455,76 @@
 						<reference key="object" ref="9812246"/>
 						<reference key="parent" ref="777053201"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100202</int>
+						<reference key="object" ref="742629842"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="404987295"/>
+						</object>
+						<reference key="parent" ref="971688616"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100203</int>
+						<reference key="object" ref="404987295"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="953787841"/>
+						</object>
+						<reference key="parent" ref="742629842"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100204</int>
+						<reference key="object" ref="953787841"/>
+						<reference key="parent" ref="404987295"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100206</int>
+						<reference key="object" ref="691721747"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="670804923"/>
+						</object>
+						<reference key="parent" ref="995592652"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100210</int>
+						<reference key="object" ref="852933600"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="116555558"/>
+						</object>
+						<reference key="parent" ref="321610254"/>
+						<string key="objectName">Table Cell View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100211</int>
+						<reference key="object" ref="116555558"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1032175568"/>
+						</object>
+						<reference key="parent" ref="852933600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100212</int>
+						<reference key="object" ref="1032175568"/>
+						<reference key="parent" ref="116555558"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100221</int>
+						<reference key="object" ref="670804923"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="678542468"/>
+						</object>
+						<reference key="parent" ref="691721747"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100222</int>
+						<reference key="object" ref="678542468"/>
+						<reference key="parent" ref="670804923"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1364,11 +1553,18 @@
 					<string>100036.IBPluginDependency</string>
 					<string>100037.IBPluginDependency</string>
 					<string>100038.IBPluginDependency</string>
+					<string>100038.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight</string>
 					<string>100039.IBPluginDependency</string>
+					<string>100039.isInViewBasedMode</string>
+					<string>100039.prototypeCellViews</string>
 					<string>100040.IBPluginDependency</string>
+					<string>100040.isInViewBasedMode</string>
+					<string>100040.prototypeCellViews</string>
 					<string>100041.IBPluginDependency</string>
 					<string>100042.IBPluginDependency</string>
 					<string>100043.IBPluginDependency</string>
+					<string>100043.isInViewBasedMode</string>
+					<string>100043.prototypeCellViews</string>
 					<string>100044.IBPluginDependency</string>
 					<string>100086.IBPluginDependency</string>
 					<string>100086.ibExternalFetchPredicateFormat</string>
@@ -1376,10 +1572,18 @@
 					<string>100129.IBPluginDependency</string>
 					<string>100130.IBPluginDependency</string>
 					<string>100148.IBPluginDependency</string>
-					<string>100161.IBPluginDependency</string>
-					<string>100162.IBPluginDependency</string>
 					<string>100197.IBPluginDependency</string>
 					<string>100198.IBPluginDependency</string>
+					<string>100202.IBPluginDependency</string>
+					<string>100203.IBPluginDependency</string>
+					<string>100204.IBPluginDependency</string>
+					<string>100206.IBPluginDependency</string>
+					<string>100210.IBPluginDependency</string>
+					<string>100211.IBPluginDependency</string>
+					<string>100212.IBPluginDependency</string>
+					<string>100221.IBPluginDependency</string>
+					<string>100222.CustomClassName</string>
+					<string>100222.IBPluginDependency</string>
 					<string>5.IBNSWindowAutoPositionCentersHorizontal</string>
 					<string>5.IBNSWindowAutoPositionCentersVertical</string>
 					<string>5.IBPluginDependency</string>
@@ -1410,11 +1614,27 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
+					<object class="NSArray">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="742629842"/>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
+					<object class="NSArray">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="691721747"/>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
+					<object class="NSArray">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="852933600"/>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string/>
@@ -1426,6 +1646,14 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>MATokenFieldCell</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="NO"/>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1445,7 +1673,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">100201</int>
+			<int key="maxID">100228</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1522,8 +1750,6 @@
 							<string>mediaController</string>
 							<string>mediaTable</string>
 							<string>movieView</string>
-							<string>tokenColumn</string>
-							<string>tokenFieldProto</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1532,8 +1758,6 @@
 							<string>NSArrayController</string>
 							<string>NSTableView</string>
 							<string>QTMovieView</string>
-							<string>NSTableColumn</string>
-							<string>NSTokenField</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1545,8 +1769,6 @@
 							<string>mediaController</string>
 							<string>mediaTable</string>
 							<string>movieView</string>
-							<string>tokenColumn</string>
-							<string>tokenFieldProto</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1570,14 +1792,6 @@
 								<string key="name">movieView</string>
 								<string key="candidateClassName">QTMovieView</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tokenColumn</string>
-								<string key="candidateClassName">NSTableColumn</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tokenFieldProto</string>
-								<string key="candidateClassName">NSTokenField</string>
-							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1593,6 +1807,14 @@
 						<string key="minorKey">./Classes/MADocumentWindow.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MATokenFieldCell</string>
+					<string key="superclassName">NSTokenFieldCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MATokenFieldCell.h</string>
+					</object>
+				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>