Merge remote-tracking branch 'cappuccino/master'

2026-10-10 10:42:19 +00:00 · 2016-10-31 16:11:38 +01:00
commit e1bcf6c47e
@@ -26,11 +26,12 @@

 // Browser Engines
 CPUnknownBrowserEngine                  = 0;
-CPGeckoBrowserEngine                    = 1;
-CPInternetExplorerBrowserEngine         = 2;
-CPKHTMLBrowserEngine                    = 3;
-CPOperaBrowserEngine                    = 4;
-CPWebKitBrowserEngine                   = 5;
+CPGeckoBrowserEngine                    = 1 << 0;
+CPInternetExplorerBrowserEngine         = 1 << 1;
+CPKHTMLBrowserEngine                    = 1 << 2;
+CPOperaBrowserEngine                    = 1 << 3;
+CPWebKitBrowserEngine                   = 1 << 4;  // Safari + Chrome
+CPBlinkBrowserEngine                    = 1 << 5;  // Recent Chrome

 // Operating Systems
 CPMacOperatingSystem                    = 0;
@@ -84,14 +85,23 @@ CPAltEnterTextAreaFeature               = 32;

 /*
    When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
-*/
+ */
 CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;

 // The paste event is only sent if an input or textarea has focus.
-CPJavaScriptPasteRequiresEditableTarget   = 1 << 1;
+CPJavaScriptPasteRequiresEditableTarget = 1 << 1;
 // Redirecting the focus of the browser on keydown to an input for Cmd-V or Ctrl-V makes the paste fail.
 CPJavaScriptPasteCantRefocus            = 1 << 2;

+/*
+   Safari calculates incorrect text size unless you set the canvas font even if it is already set
+       You can see the bug after disabling the workaround and opening any panel while typing.
+       You can use the font panel in the manual test for CPTextView.
+       Look out for a displaced cursor, i.e. after typing letters of small width, such as the 'i'.
+       https://bugs.webkit.org/show_bug.cgi?id=150224
+ */
+CPTextSizingAlwaysNeedsSetFontBug       = 1 << 3;
+

 var USER_AGENT                          = "",
    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
@@ -110,7 +120,7 @@ if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
 // Opera
 if (typeof window !== "undefined" && window.opera)
 {
-    PLATFORM_ENGINE = CPOperaBrowserEngine;
+    PLATFORM_ENGINE |= CPOperaBrowserEngine;

    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
 }
@@ -118,7 +128,7 @@ if (typeof window !== "undefined" && window.opera)
 // Internet Explorer
 else if (typeof window !== "undefined" && (window.attachEvent || (!(window.ActiveXObject) && "ActiveXObject" in window))) // Must follow Opera check.
 {
-    PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;
+    PLATFORM_ENGINE |= CPInternetExplorerBrowserEngine;

    // Features we can only be sure of with IE (no known independent tests)
    PLATFORM_FEATURES[CPVMLFeature] = YES;
@@ -136,10 +146,10 @@ else if (typeof window !== "undefined" && (window.attachEvent || (!(window.Activ
    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
 }

-// WebKit
+// Safari + Chrome (WebKit and Blink)
 else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
 {
-    PLATFORM_ENGINE = CPWebKitBrowserEngine;
+    PLATFORM_ENGINE |= CPWebKitBrowserEngine;

    // Features we can only be sure of with WebKit (no known independent tests)
    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
@@ -179,7 +189,10 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
        // https://bugs.webkit.org/show_bug.cgi?id=39689
        PLATFORM_BUGS |= CPJavaScriptPasteCantRefocus;
+        PLATFORM_BUGS |= CPTextSizingAlwaysNeedsSetFontBug;
    }
+    else if ((window.chrome || (window.Intl && Intl.v8BreakIterator)) && 'CSS' in window)
+        PLATFORM_ENGINE |= CPBlinkBrowserEngine;

    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
    if (majorVersion > 533)
@@ -189,13 +202,13 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
 // KHTML
 else if (USER_AGENT.indexOf("KHTML") != -1) // Must follow WebKit check.
 {
-    PLATFORM_ENGINE = CPKHTMLBrowserEngine;
+    PLATFORM_ENGINE |= CPKHTMLBrowserEngine;
 }

 // Gecko
 else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
-    PLATFORM_ENGINE = CPGeckoBrowserEngine;
+    PLATFORM_ENGINE |= CPGeckoBrowserEngine;

    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;

@@ -286,7 +299,7 @@ function CPPlatformHasBug(aBug)

 function CPBrowserIsEngine(anEngine)
 {
-    return PLATFORM_ENGINE === anEngine;
+    return PLATFORM_ENGINE & anEngine;
 }

 function CPBrowserIsOperatingSystem(anOperatingSystem)
@@ -169,7 +169,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }

 /*!
-    Reverse set the binding iff the CPContinuouslyUpdatesValueBindingOption is set.
+    Reverse set the binding if the CPContinuouslyUpdatesValueBindingOption is set.
 */
 - (void)_continuouslyReverseSetBinding
 {
@@ -30,9 +30,7 @@

 var CPStringSizeWithFontInWidthCache = [],
    CPStringSizeWithFontHeightCache = [],
-    CPStringSizeMeasuringContext,
-    CPStringSizeIsCanvasSizingInvalid,
-    CPStringSizeDidTestCanvasSizingValid;
+    CPStringSizeMeasuringContext;

 CPStringSizeCachingEnabled = YES;

@@ -59,22 +57,14 @@ CPStringSizeCachingEnabled = YES;
    return [self sizeWithFont:aFont inWidth:NULL];
 }

- (void) _initializeStringSizing
+ (void) initialize
 {
+    if ([self class] != [CPString class])
+        return;
+
 #if PLATFORM(DOM)
-    CPStringSizeIsCanvasSizingInvalid = YES;
-
-    if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
-    {
-        var aFont = [CPFont systemFontOfSize:12.0];
-
-        if (!CPStringSizeMeasuringContext)
-            CPStringSizeMeasuringContext = CGBitmapGraphicsContextCreate();
-
-        CPStringSizeMeasuringContext.font = [aFont cssString];
-        var teststring = "0123456879abcdefghiklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ,.-()";
-        CPStringSizeIsCanvasSizingInvalid = ABS([CPPlatformString sizeOfString:teststring withFont:aFont forWidth:0].width - CPStringSizeMeasuringContext.measureText(teststring).width) > 2;
-    }
+    if (CPFeatureIsCompatible(CPHTMLCanvasFeature) && !CPStringSizeMeasuringContext)
+        CPStringSizeMeasuringContext = CGBitmapGraphicsContextCreate();
 #endif
 }

@@ -99,17 +89,11 @@ CPStringSizeCachingEnabled = YES;
    if (size !== undefined && sizeCacheForFont.hasOwnProperty(cacheKey))
        return CGSizeMakeCopy(size);

-    if (CPStringSizeDidTestCanvasSizingValid  === undefined)
-    {
-        [self _initializeStringSizing];
-        CPStringSizeDidTestCanvasSizingValid = YES;
-    }
-
-    if (CPStringSizeIsCanvasSizingInvalid || aWidth > 0)
+    if (!CPFeatureIsCompatible(CPHTMLCanvasFeature) || aWidth > 0)
        size = [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
    else
    {
-        if (CPStringSizeMeasuringContext.font !== cssString)
+        if (CPPlatformHasBug(CPTextSizingAlwaysNeedsSetFontBug) || CPStringSizeMeasuringContext.font !== cssString)
            CPStringSizeMeasuringContext.font = cssString;

        var fontHeight = CPStringSizeWithFontHeightCache[cssString];
@@ -136,6 +136,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,

 - (void)_insertTabViewItems:(CPArray)tabViewItems atIndexes:(CPIndexSet)indexes
 {
+    var prevItemsCount = [self numberOfTabViewItems];
+
    [_tabs insertSegments:tabViewItems atIndexes:indexes];
    [tabViewItems makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];

@@ -143,6 +145,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
    [self _reverseSetContent];

    [self _sendDelegateTabViewDidChangeNumberOfTabViewItems];
+
+    // Do not allow empty selection if selection bindings are not enabled.
+    if (prevItemsCount == 0 && [self numberOfTabViewItems] > 0 && ![self _isSelectionBinded])
+        [self _selectTabViewItemAtIndex:0];
 }

 /*!
@@ -169,7 +175,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 - (void)_didRemoveTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPInteger)idx
 {
    // If the selection is managed by bindings, let the binder do that.
-    if ([self binderForBinding:CPSelectionIndexesBinding] || [self binderForBinding:CPSelectedIndexBinding])
+    if ([self _isSelectionBinded])
        return;

    if (_selectedTabViewItem == aTabViewItem)
@@ -335,13 +341,40 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,

    [_tabs setSelectedSegment:anIndex];
    _selectedTabViewItem = aTabViewItem;
-    [self _displayItemView:[aTabViewItem view]];
+    [self _loadTabViewItem:aTabViewItem];

    [self _sendDelegateDidSelectTabViewItem:aTabViewItem];

    return YES;
 }

+- (void)_loadTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    var controller = [aTabViewItem viewController];
+
+    if (controller !== nil && ![controller isViewLoaded])
+    {
+        [controller loadViewWithCompletionHandler:function(view, error)
+        {
+            if (error !== nil)
+            {
+                CPLog.warn("Could not load the view for item " + aTabViewItem + ". " + error);
+            }
+            else if (view !== nil)
+            {
+                [aTabViewItem setView:view];
+
+                if ([self selectedTabViewItem] == aTabViewItem)
+                    [self _displayItemView:view];
+            }
+        }];
+    }
+    else
+    {
+        [self _displayItemView:[aTabViewItem view]];
+    }
+}
+
 /*!
    Returns the current item being displayed.
    @return the tab view item currenly being displayed by the receiver
@@ -588,6 +621,11 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
    return [cls getBinding:aBinding forObject:self];
 }

+- (BOOL)_isSelectionBinded
+{
+    return [self binderForBinding:CPSelectionIndexesBinding] || [self binderForBinding:CPSelectedIndexBinding];
+}
+
 - (void)setItems:(CPArray)tabViewItems
 {
    if ([tabViewItems isEqualToArray:[_tabs segments]])
@@ -848,4 +886,4 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
    return [super hitTest:aPoint];
 }

-@end
+@end
@@ -270,7 +270,7 @@ CPPressedTab    = 2;
        [self setLabel:title];

    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _displayItemView:[_viewController view]];
+        [_tabView _loadTabViewItem:self];
 }

@end
@@ -203,7 +203,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    @ingroup appkit
    @class CPTableView

-    CPTableView object displays record-oriented data in a table and
+    A table view control displays record-oriented data in a table and
    allows the user to edit values and resize and rearrange columns.
    A CPTableView requires you to either set a data source which implements
    @ref numberofrows "numberOfRowsInTableView:" and @ref objectValueForTable "tableView:objectValueForTableColumn:row:",
@@ -4,8 +4,7 @@
 *
 * TODOs:
 *  1. make browser-width for size smaller and fix columns
- *  2. sampleview is currently not shown
- *  3. add all the missing features from the MacOS X counterpart
+ *  2. add all the missing features from the MacOS X counterpart (sampleview)
 *
 *
 * Created by Daniel Boehringer on 2/JAN/2014.
@@ -68,54 +67,6 @@ var kTypefaceIndex_Normal = 0,
 var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
    _availableSizes = [@"9", @"10", @"11", @"12", @"13", @"14", @"18", @"24", @"36", @"48", @"72", @"96"];

-@implementation _CPFontPanelSampleView : CPView
-{
-    CPLayoutManager _layoutManager;
-    CPTextStorage   _textStorage;
-    CPTextContainer _textContainer;
-}
-
- (id)initWithFrame:(CGRect)rect
-{
-    if (self = [super initWithFrame:rect])
-    {
-        _textStorage = [[CPTextStorage alloc] init];
-        _layoutManager = [[CPLayoutManager alloc] init];
-
-        _textContainer = [[CPTextContainer alloc] init];
-        [_layoutManager addTextContainer:_textContainer];
-
-        [_textStorage addLayoutManager:_layoutManager];
-    }
-
-    return self;
-}
-
- (void)setAttributedString:(CPAttributedString)aSting
-{
-    [_textStorage replaceCharactersInRange:CPMakeRange(0, [_textStorage length])
-                  withAttributedString:aSting];
-
-    [self setNeedsDisplay:YES];
-}
-
- (void)drawRect:(CGRect)rect
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort],
-        glyphRange = [_layoutManager glyphRangeForTextContainer:_textContainer],
-        usedRect = [_layoutManager usedRectForTextContainer:_textContainer],
-        bounds = [self bounds],
-        pos = CGPointMake((bounds.size.width - usedRect.size.width) / 2.0, (bounds.size.height - usedRect.size.height) / 2.0);
-
-    CGContextSaveGState(ctx);
-    CGContextSetFillColor(ctx, [CPColor whiteColor]);
-    CGContextFillRect(ctx, bounds);
-    CGContextRestoreGState(ctx);
-
-    [_layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:pos];
-}
-
-@end

 /*!
    @ingroup appkit
@@ -132,8 +83,6 @@ var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
    int     _currentColorButtonTag;
    BOOL    _setupDone;
    int     _fontChanges;
-
-    _CPFontPanelSampleView _sampleView;
 }


@@ -187,8 +136,6 @@ var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
 /*! @ignore */
 - (void)_setupToolbarView
 {
-    var colorPanel = [CPColorPanel sharedColorPanel];
-
    _toolbarView = [[CPView alloc] initWithFrame:CGRectMake(0, kBorderSpacing, CGRectGetWidth([self frame]), kToolbarHeight)];
    [_toolbarView setAutoresizingMask:CPViewWidthSizable];

@@ -196,8 +143,6 @@ var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
    _textColorWell = [[CPColorWell alloc] initWithFrame:CGRectMake(10, 0, 25, 25)];
    [_textColorWell setColor:_textColor];
    [_toolbarView addSubview:_textColorWell];
-    [colorPanel setTarget:self];
-    [colorPanel setAction:@selector(changeColor:)];
 }

 - (void)_setupBrowser:(CPBrowser)aBrowser
@@ -425,10 +370,6 @@ var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
    if ([self currentTrait] != typefaceIndex)
        [self setCurrentTrait:typefaceIndex ];

-    [_sampleView setAttributedString: [[CPAttributedString alloc] initWithString:[font familyName]
-                                                                      attributes:[CPDictionary dictionaryWithObjects:[font, [CPColor blackColor]]
-                                                                         forKeys:[CPFontAttributeName, CPForegroundColorAttributeName]]]];
-
    _fontChanges = kNothingChanged;
 }

@@ -164,7 +164,7 @@ _oncontextmenuhandler = function () { return false; };
    if (![self numberOfGlyphs])
        return CGRectMake(0, 0, 1, 12);    // crude hack to give a cursor in an empty doc.

-    if (CPMaxRange(aRange) >= [self numberOfGlyphs])
+    if (CPMaxRange(aRange) > [self numberOfGlyphs])
        aRange = CPMakeRange([self numberOfGlyphs] - 1, 1);

    var fragments = _objectsInRange(_lineFragments, aRange),
@@ -1370,4 +1370,4 @@ var _objectsInRange = function(aList, aRange)
        "\n\t_attributes="+[_attributes description];
 }

-@end
+@end
@@ -122,7 +122,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
@implementation CPTextView : CPText
 {
    BOOL                        _allowsUndo                   @accessors(property=allowsUndo);
-    BOOL                        _isHorizontallyResizable      @accessors(getter=isHorizontallyResizable, setter=setHorinzontallyResizable:);
+    BOOL                        _isHorizontallyResizable      @accessors(getter=isHorizontallyResizable, setter=setHorizontallyResizable:);
    BOOL                        _isVerticallyResizable        @accessors(getter=isVerticallyResizable, setter=setVerticallyResizable:);
    BOOL                        _usesFontPanel                @accessors(property=usesFontPanel);
    CGPoint                     _textContainerOrigin          @accessors(getter=textContainerOrigin);
@@ -133,7 +133,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
    CPColor                     _textColor                    @accessors(property=textColor);
    CPDictionary                _selectedTextAttributes       @accessors(property=selectedTextAttributes);
    CPDictionary                _typingAttributes             @accessors(property=typingAttributes);
-    CPFont                      _font                         @accessors(property=font);
+    CPFont                      _font;
    CPLayoutManager             _layoutManager                @accessors(getter=layoutManager);
    CPRange                     _selectionRange               @accessors(getter=selectedRange);
    CPSelectionGranularity      _selectionGranularity         @accessors(property=selectionGranularity);
@@ -153,6 +153,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
    CPTimer                     _scrollingTimer;

    BOOL                        _scrollingDownward;
+    CPRange                     _movingSelection;

    int                         _stickyXLocation;

@@ -203,7 +204,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
        _typingAttributes = [[CPDictionary alloc] initWithObjects:[_font, _textColor] forKeys:[CPFontAttributeName, CPForegroundColorAttributeName]];
   }

-    [self registerForDraggedTypes:[CPColorDragType]];
+    [self registerForDraggedTypes:[CPColorDragType, CPRTFPboardType]];

    return self;
 }
@@ -606,7 +607,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
    _textContainer = aContainer;
    _layoutManager = [_textContainer layoutManager];
    _textStorage = [_layoutManager textStorage];
-    [_textStorage setFont:_font];
+    [_textStorage setFont:[self font]];
    [_textStorage setForegroundColor:_textColor];

    [self invalidateTextContainerOrigin];
@@ -899,6 +900,28 @@ var kDelegateRespondsTo_textShouldBeginEditing
                          }, 500);
 }

+- (CGPoint)_characterIndexFromRawPoint:(CGPoint)point
+{
+    var fraction = [],
+        point = [self convertPoint:point fromView:nil];
+    
+    // convert to container coordinate
+    point.x -= _textContainerOrigin.x;
+    point.y -= _textContainerOrigin.y;
+    
+    var index = [_layoutManager glyphIndexForPoint:point inTextContainer:_textContainer fractionOfDistanceThroughGlyph:fraction];
+    
+    if (index === CPNotFound)
+        index = [_layoutManager numberOfCharacters];
+    else if (fraction[0] > 0.5)
+        index++;
+    
+    return index;
+}
+- (CGPoint)_characterIndexFromEvent:(CPEvent)event
+{
+    return [self _characterIndexFromRawPoint:[event locationInWindow]];
+}

 #pragma mark -
 #pragma mark Mouse Events
@@ -906,28 +929,53 @@ var kDelegateRespondsTo_textShouldBeginEditing
 - (void)mouseDown:(CPEvent)event
 {
    [_CPNativeInputManager cancelCurrentInputSessionIfNeeded];
-
-    var fraction = [],
-        point = [self convertPoint:[event locationInWindow] fromView:nil],
-        granularities = [CPNotFound, CPSelectByCharacter, CPSelectByWord, CPSelectByParagraph];
-
    [_caret setVisibility:NO];
-
-    // convert to container coordinate
-    point.x -= _textContainerOrigin.x;
-    point.y -= _textContainerOrigin.y;
-
-    _startTrackingLocation = [_layoutManager glyphIndexForPoint:point inTextContainer:_textContainer fractionOfDistanceThroughGlyph:fraction];
-
-    if (_startTrackingLocation === CPNotFound)
-        _startTrackingLocation = [_layoutManager numberOfCharacters];
-    else if (fraction[0] > 0.5)
-        _startTrackingLocation++;
-
+    
+    _startTrackingLocation = [self _characterIndexFromEvent:event];
+    
+    var granularities = [CPNotFound, CPSelectByCharacter, CPSelectByWord, CPSelectByParagraph];
    [self setSelectionGranularity:granularities[[event clickCount]]];
-
+    
+    if ([self selectionGranularity] == CPSelectByCharacter && CPLocationInRange(_startTrackingLocation, _selectionRange))
+    {
+        var lineBeginningIndex = [_layoutManager _firstLineFragmentForLineFromLocation:_selectionRange.location]._range.location,
+            placeholderRange = _MakeRangeFromAbs(lineBeginningIndex, CPMaxRange(_selectionRange)),
+            placeholderString = [_textStorage attributedSubstringFromRange:placeholderRange],
+            placeholderFrame = CGRectIntersection([_layoutManager boundingRectForGlyphRange:placeholderRange inTextContainer:_textContainer], _frame),
+            rangeToHide = CPMakeRange(0, _selectionRange.location - lineBeginningIndex),
+            dragPlaceholder;
+        
+        // hide the left part of the first line of the selection that is not included
+        [placeholderString addAttribute:CPForegroundColorAttributeName
+                                  value:[CPColor colorWithRed:1 green:1 blue:1 alpha:0]
+                                  range:rangeToHide];
+        
+        _movingSelection = CPMakeRange(_startTrackingLocation, 0);
+        
+        dragPlaceholder = [[CPTextView alloc] initWithFrame:placeholderFrame];
+        [dragPlaceholder insertText:placeholderString];
+        [dragPlaceholder setBackgroundColor:[CPColor colorWithRed:1 green:1 blue:1 alpha:0]];
+        [dragPlaceholder setAlphaValue:0.5];
+        
+        var stringForPasting = [_textStorage attributedSubstringFromRange:CPMakeRangeCopy(_selectionRange)],
+            richData = [_CPRTFProducer produceRTF:stringForPasting documentAttributes:@{}],
+            draggingPasteboard = [CPPasteboard pasteboardWithName:CPDragPboard];
+        [draggingPasteboard declareTypes:[CPRTFPboardType] owner:nil];
+        [draggingPasteboard setString:richData forType:CPRTFPboardType];
+        
+        [self dragView:dragPlaceholder
+                    at:placeholderFrame.origin
+                offset:nil
+                 event:event
+            pasteboard:draggingPasteboard
+                source:self
+             slideBack:YES];
+        
+        return;
+    }
+    
    var setRange = CPMakeRange(_startTrackingLocation, 0);
-
+    
    if ([event modifierFlags] & CPShiftKeyMask)
        setRange = _MakeRangeFromAbs(_startTrackingLocation < _MidRange(_selectionRange) ? CPMaxRange(_selectionRange) : _selectionRange.location, _startTrackingLocation);
    else
@@ -943,22 +991,11 @@ var kDelegateRespondsTo_textShouldBeginEditing

 - (void)mouseDragged:(CPEvent)event
 {
-    var fraction = [],
-        point = [self convertPoint:[event locationInWindow] fromView:nil];
-
-    // convert to container coordinate
-    point.x -= _textContainerOrigin.x;
-    point.y -= _textContainerOrigin.y;
-
+    if (_movingSelection)
+        return;
+    
    var oldRange = [self selectedRange],
-        index = [_layoutManager glyphIndexForPoint:point
-                                   inTextContainer:_textContainer
-                    fractionOfDistanceThroughGlyph:fraction];
-
-    if (index === CPNotFound)
-        index = _scrollingDownward ? CPMaxRange(oldRange) : oldRange.location;
-    else if (fraction[0] > 0.5)
-        index++;
+        index = [self _characterIndexFromEvent:event];

    if (index > oldRange.location)
        _scrollingDownward = YES;
@@ -977,7 +1014,9 @@ var kDelegateRespondsTo_textShouldBeginEditing

 - (void)mouseUp:(CPEvent)event
 {
-    /* will post CPTextViewDidChangeSelectionNotification */
+    _movingSelection = nil;
+
+    // will post CPTextViewDidChangeSelectionNotification
    _previousSelectionGranularity = [self selectionGranularity];
    [self setSelectionGranularity:CPSelectByCharacter];
    [self setSelectedRange:[self selectedRange] affinity:0 stillSelecting:NO];
@@ -1547,6 +1586,11 @@ var kDelegateRespondsTo_textShouldBeginEditing
 #pragma mark -
 #pragma mark Font methods

+- (CPFont)font
+{
+    return _font || [CPFont systemFontOfSize:12.0];
+}
+
 - (void)setFont:(CPFont)font
 {
    _font = font;
@@ -1572,7 +1616,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
    var currentAttributes = [_textStorage attributesAtIndex:range.location effectiveRange:nil] || _typingAttributes;

    [[[[self window] undoManager] prepareWithInvocationTarget:self]
-                                                      setFont:[currentAttributes objectForKey:CPFontAttributeName] || _font
+                                                      setFont:[currentAttributes objectForKey:CPFontAttributeName] || [self font]
                                                        range:CPMakeRangeCopy(range)];

    [_textStorage addAttribute:CPFontAttributeName value:font range:CPMakeRangeCopy(range)];
@@ -1965,6 +2009,15 @@ var kDelegateRespondsTo_textShouldBeginEditing
        [_caret startBlinking];
 }

+- (void)draggingUpdated:(CPDraggingInfo)info
+{
+    var point = [info draggingLocation],
+        location = [self _characterIndexFromRawPoint:point];
+        
+    _movingSelection = CPMakeRange(location, 0);
+    [_caret _drawCaretAtLocation:_movingSelection.location];
+    [_caret setVisibility:YES];
+}

 #pragma mark -
 #pragma mark Dragging operation
@@ -1973,11 +2026,33 @@ var kDelegateRespondsTo_textShouldBeginEditing
 {
    var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
        pasteboard = [aSender draggingPasteboard];
+        
+    if ([pasteboard availableTypeFromArray:[CPRTFPboardType]])
+    {
+        [_caret setVisibility:NO];
+        
+        if (CPLocationInRange(_movingSelection.location, _selectionRange))
+        {
+            [self setSelectedRange:_movingSelection];
+            _movingSelection = nil;
+            return;
+        }

-    if (![pasteboard availableTypeFromArray:[CPColorDragType]])
-        return NO;
+        if (_movingSelection.location > CPMaxRange(_selectionRange))
+            _movingSelection.location -= _selectionRange.length;

-   [self setTextColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] range:_selectionRange];
+        [self _deleteForRange:_selectionRange];
+        [self setSelectedRange:_movingSelection];
+
+        var dataForPasting = [pasteboard stringForType:CPRTFPboardType];
+        //  setTimeout is to a work around a transaction issue with the undomanager
+        setTimeout(function(){
+            [self insertText:[[_CPRTFParser new] parseRTF:dataForPasting]];
+        }, 0);
+    }
+        
+    if ([pasteboard availableTypeFromArray:[CPColorDragType]])
+        [self setTextColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] range:_selectionRange];
 }

@end
@@ -2254,6 +2329,12 @@ var CPTextViewAllowsUndoKey = @"CPTextViewAllowsUndoKey",
        _caretTimer = nil;
    }
 }
+                              
+- (void)_drawCaretAtLocation:(int)aLoc
+{
+    var rect = [_textView._layoutManager boundingRectForGlyphRange:CPMakeRange(aLoc, 1) inTextContainer:_textView._textContainer];
+    [self setRect:rect];
+}

@end

@@ -2639,6 +2720,7 @@ var _CPCopyPlaceholder = '-';

 -(void) _setRegularExpression:(JSObject)re toFontTrait:(CPFontTrait)aTrait
 {
+    var match;
    while (match = re.exec(_string))
    {
        var attribs = [[self attributesAtIndex:match.index effectiveRange:nil] copy],
@@ -2650,6 +2732,7 @@ var _CPCopyPlaceholder = '-';

 -(void) _replaceEveryOccurenceOfRegularExpression:(JSObject)re withString:(CPString)aString
 {
+    var match;
    while (match = re.exec(_string))
        [self replaceCharactersInRange:CPMakeRange(match.index, match[0].length) withString:aString];
 }
@@ -2663,6 +2746,7 @@ var _CPCopyPlaceholder = '-';
    [self _replaceEveryOccurenceOfRegularExpression:/&lt;/i withString:'<'];
    [self _replaceEveryOccurenceOfRegularExpression:/&gt;/i withString:'>'];
    [self _replaceEveryOccurenceOfRegularExpression:/&amp;/i withString:'&'];
+    [self _replaceEveryOccurenceOfRegularExpression:/&nbsp;/i withString:' '];

    return self;
 }
@@ -514,6 +514,9 @@ var kRgsymRtf = {
                return [self _applyPropChange:sym parameter:param];

            case kRTFParserType_char:
+                if((param + '') !== 'NaN' && (param + '').length)
+                    _currentParseIndex -= (param + '').length;
+
                return [self _checkChar:sym parameter:param];

            case kRTFParserType_dest:
@@ -785,4 +788,4 @@ var kRgsymRtf = {
    return _result;
 }

-@end
+@end
@@ -416,7 +416,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setToolTip:(CPString)aToolTip
 {
-    if (_toolTip == aToolTip)
+    if (_toolTip === aToolTip)
        return;

    if (aToolTip && ![aToolTip isKindOfClass:CPString])
@@ -574,7 +574,7 @@ var CPViewHighDPIDrawingEnabled = YES;
    [[self window] _dirtyKeyViewLoop];

    // If this is already one of our subviews, remove it.
-    if (aSubview._superview == self)
+    if (aSubview._superview === self)
    {
        var index = [_subviews indexOfObjectIdenticalTo:aSubview];

@@ -863,7 +863,7 @@ var CPViewHighDPIDrawingEnabled = YES;

    do
    {
-        if (view == aView)
+        if (view === aView)
            return YES;
    } while(view = [view superview])

@@ -978,7 +978,7 @@ var CPViewHighDPIDrawingEnabled = YES;

 - (CPView)viewWithTag:(CPInteger)aTag
 {
-    if ([self tag] == aTag)
+    if ([self tag] === aTag)
        return self;

    var index = 0,
@@ -1030,7 +1030,7 @@ var CPViewHighDPIDrawingEnabled = YES;
        [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];

    if (!_inhibitUpdateTrackingAreas)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }

 /*!
@@ -1103,7 +1103,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 #endif

    if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }

 /*!
@@ -1257,7 +1257,7 @@ var CPViewHighDPIDrawingEnabled = YES;
        [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];

    if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:!_autoresizesSubviews];
 }

 /*!
@@ -1306,7 +1306,7 @@ var CPViewHighDPIDrawingEnabled = YES;
        [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];

    if (!_inhibitUpdateTrackingAreas)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }

 /*!
@@ -1374,7 +1374,7 @@ var CPViewHighDPIDrawingEnabled = YES;
        [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];

    if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }

 /*!
@@ -1418,7 +1418,7 @@ var CPViewHighDPIDrawingEnabled = YES;
        [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];

    if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }


@@ -1430,7 +1430,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 {
    var mask = [self autoresizingMask];

-    if (mask == CPViewNotSizable)
+    if (mask === CPViewNotSizable)
        return;

    var frame = _superview._frame,
@@ -1611,7 +1611,7 @@ var CPViewHighDPIDrawingEnabled = YES;
        {
            do
            {
-               if (self == view)
+               if (self === view)
               {
                  [_window makeFirstResponder:[self nextValidKeyView]];
                  break;
@@ -1737,7 +1737,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setAlphaValue:(float)anAlphaValue
 {
-    if (_opacity == anAlphaValue)
+    if (_opacity === anAlphaValue)
        return;

    _opacity = anAlphaValue;
@@ -1936,10 +1936,10 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setBackgroundColor:(CPColor)aColor
 {
-    if (_backgroundColor == aColor)
+    if (_backgroundColor === aColor)
        return;

-    if (aColor == [CPNull null])
+    if (aColor === [CPNull null])
        aColor = nil;

    _backgroundColor = aColor;
@@ -1982,7 +1982,7 @@ var CPViewHighDPIDrawingEnabled = YES;
            var image = slices[i],
                size = [image size];

-            if (!size || (size.width == 0 && size.height == 0))
+            if (!size || (size.width === 0 && size.height === 0))
                size = nil;

            _DOMImageSizes[i] = size;
@@ -2037,10 +2037,12 @@ var CPViewHighDPIDrawingEnabled = YES;
            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, size.height);
        }
        else
+        {
            _DOMElement.style.background = colorCSS;

            if (patternImage)
                CPDOMDisplayServerSetStyleBackgroundSize(_DOMElement, [patternImage size].width + "px", [patternImage size].height + "px");
+        }
    }
    else
    {
@@ -2074,7 +2076,7 @@ var CPViewHighDPIDrawingEnabled = YES;
            partIndex++;
        }

-        if (_backgroundType == BackgroundNinePartImage)
+        if (_backgroundType === BackgroundNinePartImage)
        {
            var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
                right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0,
@@ -2135,7 +2137,7 @@ var CPViewHighDPIDrawingEnabled = YES;
                CPDOMDisplayServerSetStyleRightBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
            }
        }
-        else if (_backgroundType == BackgroundVerticalThreePartImage)
+        else if (_backgroundType === BackgroundVerticalThreePartImage)
        {
            var top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
                bottom = _DOMImageSizes[2] ? _DOMImageSizes[2].height : 0;
@@ -2167,7 +2169,7 @@ var CPViewHighDPIDrawingEnabled = YES;
                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, bottom);
            }
        }
-        else if (_backgroundType == BackgroundHorizontalThreePartImage)
+        else if (_backgroundType === BackgroundHorizontalThreePartImage)
        {
            var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
                right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0;
@@ -3129,7 +3131,7 @@ setBoundsOrigin:
 */
 - (void)setLayer:(CALayer)aLayer
 {
-    if (_layer == aLayer)
+    if (_layer === aLayer)
        return;

    if (_layer)
@@ -3590,21 +3592,21 @@ setBoundsOrigin:
    [_trackingAreas removeObjectIdenticalTo:trackingArea];
 }

- (void)_updateTrackingAreas
+- (void)_updateTrackingAreasWithRecursion:(BOOL)shouldCallRecursively
 {
    _inhibitUpdateTrackingAreas = YES;

-    [self _recursivelyUpdateTrackingAreas];
-
-    _inhibitUpdateTrackingAreas = NO;
-}
-
- (void)_recursivelyUpdateTrackingAreas
-{
    [self _updateTrackingAreasForOwners:[self _calcTrackingAreaOwners]];

-    for (var i = 0; i < _subviews.length; i++)
-        [_subviews[i] _recursivelyUpdateTrackingAreas];
+    if (shouldCallRecursively)
+    {
+        // Now, call _updateTrackingAreasWithRecursion on subviews
+
+        for (var i = 0; i < _subviews.length; i++)
+            [_subviews[i] _updateTrackingAreasWithRecursion:YES];
+    }
+
+    _inhibitUpdateTrackingAreas = NO;
 }

 - (CPArray)_calcTrackingAreaOwners
@@ -4098,6 +4098,9 @@ var interpolate = function(fromValue, toValue, progress)
            [overlappingTrackingAreas addObject:aTrackingArea];
    }

+    if (overlappingTrackingAreas.length === 0)
+        return;
+
    var frontmostTrackingArea = overlappingTrackingAreas[0],
        frontmostView         = [frontmostTrackingArea view];

@@ -163,9 +163,13 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
    {
        if (needsFrameTimer)
            [self stopFrameUpdaterWithIdentifier:objectId];
-        else if (animationCompletion)
+
+        if (animationCompletion)
            animationCompletion();

+        if (needsFrameTimer || animationCompletion)
+            [[CPRunLoop currentRunLoop] performSelectors];
+
        if (_completionHandlerAgent)
            _completionHandlerAgent.decrement();
    };
@@ -289,7 +293,7 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
            cssAnimations.push(cssAnimation);
        }

-        var css_mapping = [[aTargetView class] cssPropertiesForKeyPath:keyPath];
+        var css_mapping = [[aTargetView class] _cssPropertiesForKeyPath:keyPath];

        [css_mapping enumerateObjectsUsingBlock:function(aDict, anIndex, stop)
        {
@@ -299,9 +303,6 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);

            cssAnimation.addPropertyAnimation(property, getter, duration, anAction.keytimes, anAction.values, timingFunctions, completionFunction);
        }];
-
-        if (needsFrameTimer)
-            cssAnimation.setRemoveAnimationPropertyOnCompletion(false);
    }

    if (needsFrameTimer)
@@ -611,46 +612,42 @@ CFRunLoopRemoveObserver = function(runloop, observer, mode)
 var FrameUpdater = function(anIdentifier)
 {
    this._identifier = anIdentifier;
+    this._requestId = null;
    this._duration = 0;
    this._stop = false;
    this._targets = [];
    this._callbacks = [];
+
    var frameUpdater = this;

    this._updateFunction = function(timestamp)
    {
+        if (frameUpdater._startDate == null)
+            frameUpdater._startDate = timestamp;
+
        if (frameUpdater._stop)
            return;

-        if (this._startDate == null)
-            this._startDate = timestamp;
-
        for (var i = 0; i < frameUpdater._callbacks.length; i++)
            frameUpdater._callbacks[i]();

-        if (timestamp - this._startDate < frameUpdater._duration * 1000)
+        if (timestamp - frameUpdater._startDate < frameUpdater._duration * 1000)
            window.requestAnimationFrame(frameUpdater._updateFunction);
    };
 };

 FrameUpdater.prototype.start = function()
 {
-    window.requestAnimationFrame(this._updateFunction);
+    this._requestId = window.requestAnimationFrame(this._updateFunction);
 };

 FrameUpdater.prototype.stop = function()
 {
-CPLog.debug("stop FrameUpdater with id " + this.identifier());
+    // window.cancelAnimationFrame support is Chrome 24, Firefox 23, IE 10, Opera 15, Safari 6.1
+    if (window.cancelAnimationFrame)
+        window.cancelAnimationFrame(this._requestId);

    this._stop = true;
-
-    var targets = this._targets;
-
-    for (var i = 0; i < targets.length; i++)
-    {
-        CPLog.debug(targets[i] + " Remove animation-name property");
-        targets[i]._DOMElement.style.removeProperty(CPBrowserCSSProperty("animation-name"));
-    }
 };

 FrameUpdater.prototype.updateFunction = function()
@@ -6,35 +6,6 @@
 {
 }

- (void)viewWillMoveToSuperview:(CPView)aSuperview
-{
-    var orderInAnim = [self animationForKey:@"CPAnimationTriggerOrderIn"];
-
-    if (orderInAnim && [orderInAnim isKindOfClass:[CAPropertyAnimation class]])
-    {
-        [_target setValue:[orderInAnim fromValue] forKeyPath:[orderInAnim keyPath]];
-    }
-
-    [_target viewWillMoveToSuperview:aSuperview];
-}
-
- (void)viewDidMoveToSuperview
-{
-    var orderInAnim = [self animationForKey:@"CPAnimationTriggerOrderIn"];
-
-    if (orderInAnim && [orderInAnim isKindOfClass:[CAPropertyAnimation class]])
-    {
-        [self _setTargetValue:YES withKeyPath:@"CPAnimationTriggerOrderIn" fallback:nil completion:function()
-        {
-            [_target setValue:[orderInAnim toValue] forKeyPath:[orderInAnim keyPath]];
-        }];
-    }
-    else
-    {
-        [_target viewDidMoveToSuperview];
-    }
-}
-
 - (void)removeFromSuperview
 {
    [self _setTargetValue:nil withKeyPath:@"CPAnimationTriggerOrderOut" setter:_cmd];
@@ -139,7 +110,7 @@ var DEFAULT_CSS_PROPERTIES = nil;

@implementation CPView (CPAnimatablePropertyContainer)

-+ (CPDictionary)defaultCSSProperties
+ (CPDictionary)_defaultCSSProperties
 {
    if (DEFAULT_CSS_PROPERTIES == nil)
    {
@@ -160,9 +131,9 @@ var DEFAULT_CSS_PROPERTIES = nil;
    return DEFAULT_CSS_PROPERTIES;
 }

-+ (CPArray)cssPropertiesForKeyPath:(CPString)aKeyPath
+ (CPArray)_cssPropertiesForKeyPath:(CPString)aKeyPath
 {
-    return [[self defaultCSSProperties] objectForKey:aKeyPath];
+    return [[self _defaultCSSProperties] objectForKey:aKeyPath];
 }

 + (Class)animatorClass
@@ -190,7 +161,14 @@ var DEFAULT_CSS_PROPERTIES = nil;

 + (CAAnimation)defaultAnimationForKey:(CPString)aKey
 {
-    if ([self cssPropertiesForKeyPath:aKey] !== nil)
+    // TODO: remove when supported.
+    if (aKey == @"CPAnimationTriggerOrderIn")
+    {
+        CPLog.warn("CPView animated key path CPAnimationTriggerOrderIn is not supported yet.");
+        return nil;
+    }
+
+    if ([self _cssPropertiesForKeyPath:aKey] !== nil)
        return [CAAnimation animation];

    return nil;
@@ -219,4 +197,4 @@ var DEFAULT_CSS_PROPERTIES = nil;
    _animationsDictionary = [animationsDict copy];
 }

-@end
+@end
@@ -51,7 +51,6 @@ CSSAnimation = function(aTarget/*DOM Element*/, anIdentifier)
        this.animationsdurations = [];
        this.islive = false;
        this.didBuildDOMElements = false;
-        this.removeAnimationPropertyOnCompletion = true;

        animation = this;
        CURRENT_ANIMATIONS[anIdentifier] = animation;
@@ -177,21 +176,21 @@ CSSAnimation.prototype.endEventListener = function()
            if (idx !== -1)
                inFlightAnimationsNames.splice(idx, 1);

-            if (inFlightAnimationsNames.length == 0)
+            if (inFlightAnimationsNames.length > 0)
+                return;
+
+            for (var i = 0; i < animationsNames.length; i++)
            {
-                for (var i = 0; i < animationsNames.length; i++)
-                {
-                    var completion = animation.completionFunctionForAnimationName(animationsNames[i]);
-                    if (completion)
-                        completion();
-                }
+                var completion = animation.completionFunctionForAnimationName(animationsNames[i]);
+                if (completion)
+                    completion();
+            }

-                var eventTarget = event.target,
-                    style = eventTarget.style;
-
-                if (animation.removeAnimationPropertyOnCompletion)
-                    style.removeProperty(ANIMATION_NAME_PROPERTY);
+            var eventTarget = event.target,
+                style = eventTarget.style;

+            try {
+                style.removeProperty(ANIMATION_NAME_PROPERTY);
                style.removeProperty(ANIMATION_DURATION_PROPERTY);
                style.removeProperty(ANIMATION_FILL_MODE_PROPERTY);
                style.removeProperty("-webkit-backface-visibility");
@@ -204,6 +203,8 @@ CSSAnimation.prototype.endEventListener = function()
                eventTarget.removeEventListener(ANIMATION_END_EVENT_NAME, AnimationEndListener);
                animation.listener = null;
                delete (CURRENT_ANIMATIONS[animation.identifier]);
+            } catch (err) {
+                CPLog.warn("CSSAnimation.j - " + err);
            }
        };

@@ -260,11 +261,6 @@ CSSAnimation.prototype.buildDOMElements = function()
    this.didBuildDOMElements = true;
 }

-CSSAnimation.prototype.setRemoveAnimationPropertyOnCompletion = function(flag)
-{
-    this.removeAnimationPropertyOnCompletion = flag;
-}
-
 CSSAnimation.prototype.start = function()
 {
    if (this.propertyanimations.length == 0 || this.islive)
@@ -64,7 +64,7 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 {
    CPDictionary            _items;
    int                     _currentPosition;
-    BOOL                    _totalCostCache;
+    int                     _totalCostCache;
    unsigned                _implementedDelegateMethods;

    CPString                _name               @accessors(property=name);
@@ -374,4 +374,4 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
    return cacheItem;
 }

-@end
+@end
@@ -138,4 +138,16 @@
    [self assert:[_tabView selectedTabViewItem] equals:_tabItem2];
 }

+- (void)testTabViewItemSelectionNotEmpty
+{
+    // after insertion from empty and no explicit selection.
+    [self assert:[_tabView numberOfTabViewItems] equals:2];
+    [self assert:[_tabView selectedTabViewItem] equals:_tabItem1];
+
+    // Removes selected Item.
+    [_tabView removeTabViewItem:_tabItem1];
+    [self assert:[_tabView numberOfTabViewItems] equals:1];
+    [self assert:[_tabView selectedTabViewItem] equals:_tabItem2];
+}
+
@end
@@ -0,0 +1,228 @@
+/*
+ * AppController.j
+ * AdvancedHelloWorld
+ *
+ * Created by You on December 8, 2011.
+ * Copyright 2011, Your Company All rights reserved.
+ */
+/*
+    This Cucapp tests the following:
+        • CPAnimationContext -setCompletionHandler: is called and the end value is correct when the frame of a view is animated.
+            Tested for a vanilla view (no drawing, no layout), a view with custom drawing, with custom layout, with both.
+        • CPAnimationContext CPView special keyPaths CPAnimationTriggerOrderIn and CPAnimationTriggerOrderOut.
+            Checks that adding or removing the animator to/from the superview does not throw an error and the superview final value is correct.
+*/
+
+@import <Foundation/CPObject.j>
+
+@import "CPResponder+Cucapp.j"
+
+@class ColorView
+
+var ANIMATION_DURATION = 0.9;
+
+@implementation AppController : CPObject
+{
+    /* this "outlet" is connected automatically by the Cib */
+    CPWindow    theWindow;
+
+    /* We create the outlets of the textfields here */
+    @outlet DrawView         drawView;
+    @outlet CustomLayoutView layoutView;
+    @outlet CustomLayoutDrawView layoutDrawView;
+
+    CPInteger testNumber;
+    CPString passed;
+}
+
+- (void)awakeFromCib
+{
+    [theWindow setFullPlatformWindow:YES];
+    [layoutView setNeedsLayout];
+    [layoutDrawView setNeedsLayout];
+    testNumber = 0;
+    passed = "";
+}
+
+- (void)testDidPass
+{
+    passed = "true";
+    testNumber++;
+}
+
+- (IBAction)test:(id)sender
+{
+    passed = "false";
+    [self performSelector:CPSelectorFromString("test" + testNumber)];
+}
+
+- (void)test0
+{
+    vanillaView = [[ColorView alloc] initWithFrame:CGRectMake(30,30,148,115)];
+    [vanillaView setBackgroundColor:[vanillaView color]];
+
+    var fadeOut = [CABasicAnimation animationWithKeyPath:@"alphaValue"];
+    [fadeOut setFromValue:1];
+    [fadeOut setToValue:0];
+    [fadeOut setDuration:ANIMATION_DURATION];
+
+    [vanillaView setAnimations:@{@"CPAnimationTriggerOrderOut":fadeOut}];
+
+    var ctx = [CPAnimationContext currentContext];
+    [ctx setCompletionHandler:function()
+    {
+        if ([vanillaView superview] == [theWindow contentView] && [vanillaView alphaValue] == 1)
+            [self testDidPass];
+    }];
+
+    [[theWindow contentView] addSubview:vanillaView];
+}
+
+- (void)test1
+{
+    [self move:vanillaView];
+}
+
+- (void)test2
+{
+    [self move:drawView];
+}
+
+- (void)test3
+{
+    [self move:layoutView];
+}
+
+- (void)test4
+{
+    [self move:layoutDrawView];
+}
+
+- (void)test5
+{
+    var ctx = [CPAnimationContext currentContext];
+    [ctx setCompletionHandler:function()
+    {
+        if ([vanillaView superview] == nil && [vanillaView alphaValue] == 1)
+            [self testDidPass];
+    }];
+
+    [[vanillaView animator] removeFromSuperview];
+}
+
+- (void)move:(CPView)view
+{
+    var destinationRect = CGRectMake(200 *testNumber,200,200,200);
+    var ctx = [CPAnimationContext currentContext];
+    [ctx setDuration:ANIMATION_DURATION];
+    [ctx setCompletionHandler:function()
+    {
+        if (CGRectEqualToRect([view frame], destinationRect))
+            [self testDidPass];
+    }];
+
+    [[view animator] setFrame:destinationRect];
+}
+
+@end
+
+
+@implementation ColorView : CPView
+{
+    CPColor color @accessors;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    color = [CPColor randomColor];
+
+    return self;
+}
+
+- (void)viewDidMoveToSuperview
+{
+    [self setBackgroundColor:color];
+}
+
+@end
+
+@implementation DrawView : CPView
+{
+    CPColor color;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    color = [CPColor randomColor];
+
+    return self;
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+
+    CGContextSetLineWidth(context, 2);
+    CGContextSetStrokeColor(context, [CPColor blackColor]);
+    CGContextSetFillColor(context, color);
+
+    CGContextBeginPath(context);
+    CGContextFillRect(context, bounds);
+
+    var height = CGRectGetHeight(bounds),
+        width = CGRectGetWidth(bounds);
+
+    CGContextStrokeLineSegments(context, [CGPointMake(10,0), CGPointMake(10, height),
+                                          CGPointMake(0, 10), CGPointMake(CGRectGetWidth(aRect), 10),
+                                          CGPointMake(width - 10, 0), CGPointMake(width - 10, height),
+                                          CGPointMake(0, height - 10), CGPointMake(width, height - 10)], 8);
+}
+
+@end
+
+@implementation CustomLayoutView : ColorView
+{
+}
+
+- (void)layoutSubviews
+{
+    [self setBackgroundColor:color];
+
+    var subviews = [self subviews],
+        count = [subviews count] - 1;
+
+    var dx = (CGRectGetWidth([self frame]) - 100) / count,
+        dy = (CGRectGetHeight([self frame]) - 26) / count
+
+    [subviews enumerateObjectsUsingBlock:function(view, idx, stop)
+    {
+        [view setFrameOrigin:CGPointMake(dx * idx, dy * idx)];
+    }];
+}
+
+@end
+
+@implementation CustomLayoutDrawView : DrawView
+{
+}
+
+- (void)layoutSubviews
+{
+    var subviews = [self subviews],
+        count = [subviews count] - 1;
+
+    var dx = (CGRectGetWidth([self frame]) - 100) / count,
+        dy = (CGRectGetHeight([self frame]) - 26) / count
+
+    [subviews enumerateObjectsUsingBlock:function(view, idx, stop)
+    {
+        [view setFrameOrigin:CGPointMake(dx * idx, dy * idx)];
+    }];
+}
+
+@end
@@ -0,0 +1,94 @@
+/*
+* Copyright (c) 2014 Nuage Networks
+*
+* 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.
+*/
+
+
+// Import this Categories from your application
+// You can now user -(void)setCucappIdentifier: and -(CPString)cucappIdentifier
+// to set and get your cucapp IDs.
+// Then from a test, you can use it as a selector like //CPView[cucappIdentifier="my-button"]
+
+@import <AppKit/CPResponder.j>
+@import <AppKit/CPMenuItem.j>
+
+@implementation CPResponder (cucappAdditions)
+
+- (void)setCucappIdentifier:(CPString)anIdentifier
+{
+    self.__cucappIdentifier = anIdentifier;
+}
+
+- (CPString)cucappIdentifier
+{
+    return self.__cucappIdentifier;
+}
+
+@end
+
+@implementation CPMenuItem (cucappAdditionsMenu)
+
+- (void)setCucappIdentifier:(CPString)anIdentifier
+{
+    [[self _menuItemView] setCucappIdentifier:anIdentifier];
+}
+
+- (CPString)cucappIdentifier
+{
+    [[self _menuItemView] cucappIdentifier];
+}
+
+@end
+
+function load_cucapp_CLI(path)
+{
+    if (!path)
+        path = "Cucapp/lib/Cucumber.j"
+
+    try {
+        objj_importFile(path, true, function() {
+            [Cucumber stopCucumber];
+            CPLog.debug("Cucapp CLI has been well loaded");
+            _addition_cpapplication_send_event_method();
+        });
+
+    }
+    catch(e)
+    {
+        [CPException raise:CPInvalidArgumentException reason:@"Invalid path for the lib Cucumber"];
+    }
+}
+
+
+function load_cucapp_record(path)
+{
+    if (!path)
+        path = "CuCapp+Record.j"
+
+    try {
+        objj_importFile(path, true, function() {
+            CPLog.debug("Cucapp record has been well loaded");
+        });
+    }
+    catch(e)
+    {
+        [CPException raise:CPInvalidArgumentException reason:@"Invalid path for the lib Cucapp+Record.j"];
+    }
+}
@@ -0,0 +1,591 @@
+@import <AppKit/CPApplication.j>
+
+function start_record(path)
+{
+    [CPWindow start_record];
+}
+
+function stop_record()
+{
+    [CPWindow stop_record];
+}
+
+function save_record(fileName)
+{
+    if (!fileName)
+        fileName = @"record"
+
+    var eventRecords =  [CPWindow eventRecords],
+        JSONEvents = [];
+
+    for (var i = 0; i < [eventRecords count]; i++)
+    {
+        var eventRecord = eventRecords[i];
+        [JSONEvents addObject:[eventRecord objectToJSON]];
+    }
+
+    var pom = document.createElement('a');
+    pom.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(JSONEvents, null, 4)));
+    pom.setAttribute('download', fileName + ".json");
+    pom.click();
+}
+
+function play_record(file_name, cucumber_path)
+{
+    if (!cucumber_path)
+        cucumber_path = path = "../../Cucapp/lib/Cucumber.j";
+
+    load_cucapp_CLI(cucumber_path);
+
+    setTimeout(function(){
+        _load_javascript_file(file_name)
+    },1000);
+}
+
+function _load_javascript_file(file_name)
+{
+    var AJAX_req = new XMLHttpRequest();
+    AJAX_req.open( "GET", file_name, true );
+    AJAX_req.setRequestHeader("Content-type", "application/json");
+
+    AJAX_req.onreadystatechange = function()
+    {
+        if (AJAX_req.readyState == 4)
+        {
+            var recordingEvents = JSON.parse(AJAX_req.responseText);
+
+            for (var i = 0; i < [recordingEvents count]; i++)
+            {
+                var recordingEvent = JSON.parse(recordingEvents[i]),
+                    type = recordingEvent["event"]["type"];
+
+                if (type == CPLeftMouseDown && i < [recordingEvents count] - 1)
+                {
+                    var nextRecordingEvent = JSON.parse(recordingEvents[i + 1]),
+                        nextType = nextRecordingEvent["event"]["type"];
+
+                    if (nextType == CPMouseMoved)
+                    {
+                        for (var j = i; j < [recordingEvents count]; j++)
+                        {
+                            var tmpRecordingEvent = JSON.parse(recordingEvents[j]),
+                                tmpType = tmpRecordingEvent["event"]["type"];
+
+                            if (tmpType == CPLeftMouseUp)
+                            {
+                                setTimeout(_simulate_drag_event, recordingEvent["event"]["timestamp"] * 1000, recordingEvent, tmpRecordingEvent);
+                                i = j;
+                                break;
+                            }
+                        }
+
+                        continue;
+                    }
+                }
+
+                setTimeout(_simulate_event, recordingEvent["event"]["timestamp"] * 1000, recordingEvent);
+            }
+        }
+    }
+
+    AJAX_req.send();
+}
+
+function _simulate_drag_event(event1, event2)
+{
+    var keyView1 = event1["keyView"],
+        valueView1 = event1["valueView"],
+        keyView2 = event2["keyView"],
+        valueView2 = event2["valueView"],
+        locationInWindow1 = CGPointMake(event1["event"]["locationInWindow"]["x"], event1["event"]["locationInWindow"]["y"]);
+        locationInWindow2 = CGPointMake(event2["event"]["locationInWindow"]["x"], event2["event"]["locationInWindow"]["y"]);
+
+        if (keyView1 && valueView1 && keyView2 && valueView2)
+            simulate_dragged_click_view_to_view(keyView1, valueView1, keyView2, valueView2);
+        else if (keyView1 && valueView1)
+            simulate_dragged_click_view_to_point(keyView1, valueView1, locationInWindow1.x, locationInWindow1.y);
+        else
+            simulate_dragged_click_point_to_point(locationInWindow1.x, locationInWindow1.y, locationInWindow2.x, locationInWindow2.y);
+}
+
+function _simulate_event(event)
+{
+    var type = event["event"]["type"],
+        keyView = event["keyView"],
+        valueView = event["valueView"],
+        characters = event["event"]["characters"],
+        deltaX = event["event"]["deltaX"],
+        deltaY = event["event"]["deltaY"],
+        deltaZ = event["event"]["deltaZ"],
+        deltaZ = event["event"]["deltaZ"],
+        locationInWindow = CGPointMake(event["event"]["locationInWindow"]["x"], event["event"]["locationInWindow"]["y"]);
+
+    switch (type)
+    {
+        case CPScrollWheel:
+
+            if (keyView && valueView)
+                simulate_scroll_wheel_on_view(keyView, valueView, deltaX, deltaY)
+
+            break;
+
+        case CPLeftMouseDown:
+
+            if (keyView && valueView)
+                simulate_left_click_on_view(keyView, valueView);
+            else
+                simulate_left_click_on_point(locationInWindow.x, locationInWindow.y)
+
+            break;
+
+        case CPRightMouseDown:
+
+            if (keyView && valueView)
+                simulate_right_click_on_view(keyView, valueView);
+            else
+                simulate_right_click_on_point(locationInWindow.x, locationInWindow.y)
+
+            break;
+
+        case CPKeyDown:
+            simulate_keyboard_event(characters);
+            break;
+    }
+}
+
+
+var eventRecords,
+    recording = NO;
+
+@implementation CPWindow (cucappRecord)
+
+ (CPArray)eventRecords
+{
+    return eventRecords;
+}
+
+ (void)start_record
+{
+    eventRecords = [];
+    recording = YES;
+}
+
+ (void)stop_record
+{
+    recording = NO;
+}
+
+/*!
+    Dispatches events that are sent to it from CPApplication.
+    @param anEvent the event to be dispatched
+*/
+- (void)sendEvent:(CPEvent)anEvent
+{
+    var type = [anEvent type],
+        sheet = [self attachedSheet],
+        recordingEvent = [[RecordingEvent alloc] initWithEvent:anEvent];
+
+    if (recordingEvent && type != CPFlagsChanged && type != CPMouseMoved)
+        [eventRecords addObject:recordingEvent];
+
+    // If a sheet is attached events get filtered here.
+    // It is not clear what events should be passed to the view, perhaps all?
+    // CPLeftMouseDown is needed for window moving and resizing to work.
+    // CPMouseMoved is needed for rollover effects on title bar buttons.
+
+    if (sheet)
+    {
+        switch (type)
+        {
+            case CPLeftMouseDown:
+
+                // This is needed when a doubleClick occurs when the sheet is closing or opening
+                if (!_parentWindow)
+                    return;
+
+                [recordingEvent setView:_windowView];
+
+                [_windowView mouseDown:anEvent];
+
+                // -dw- if the window is clicked, the sheet should come to front, and become key,
+                // and the window should be immediately behind
+                [sheet makeKeyAndOrderFront:self];
+
+                return;
+
+            case CPMouseMoved:
+                // Allow these through to the parent
+                break;
+
+            default:
+                // Everything else is filtered
+                return;
+        }
+    }
+
+    var point = [anEvent locationInWindow];
+
+    switch (type)
+    {
+        case CPFlagsChanged:
+            return [[self firstResponder] flagsChanged:anEvent];
+
+        case CPKeyUp:
+            return [[self firstResponder] keyUp:anEvent];
+
+        case CPKeyDown:
+            if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
+            {
+                if ([anEvent modifierFlags] & CPShiftKeyMask)
+                    [self selectPreviousKeyView:self];
+                else
+                    [self selectNextKeyView:self];
+
+                // Make sure the browser doesn't try to do its own tab handling.
+                // This is important or the browser might blur the shared text field or token field input field,
+                // even that we just moved it to a new first responder.
+                [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
+                return;
+            }
+            else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
+            {
+                var didTabBack = [self selectPreviousKeyView:self];
+
+                if (didTabBack)
+                {
+                    // Make sure the browser doesn't try to do its own tab handling.
+                    // This is important or the browser might blur the shared text field or token field input field,
+                    // even that we just moved it to a new first responder.
+                    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
+                }
+                return didTabBack;
+            }
+            else if ([anEvent charactersIgnoringModifiers] == CPEscapeFunctionKey && [self _processKeyboardUIKey:anEvent])
+            {
+                return;
+            }
+
+            [[self firstResponder] keyDown:anEvent];
+
+            // Trigger the default button if needed
+            // FIXME: Is this only applicable in a sheet? See isse: #722.
+            if (![self disableKeyEquivalentForDefaultButton])
+            {
+                var defaultButton = [self defaultButton],
+                    keyEquivalent = [defaultButton keyEquivalent],
+                    modifierMask = [defaultButton keyEquivalentModifierMask];
+
+                if ([anEvent _triggersKeyEquivalent:keyEquivalent withModifierMask:modifierMask])
+                    [[self defaultButton] performClick:self];
+            }
+
+            return;
+
+        case CPScrollWheel:
+            [recordingEvent setView:[_windowView hitTest:point]];
+
+            return [[_windowView hitTest:point] scrollWheel:anEvent];
+
+        case CPLeftMouseUp:
+        case CPRightMouseUp:
+            var hitTestedView = _leftMouseDownView,
+                selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);
+
+            if (!hitTestedView)
+                hitTestedView = [_windowView hitTest:point];
+
+            [recordingEvent setView:hitTestedView];
+
+            [hitTestedView performSelector:selector withObject:anEvent];
+
+            _leftMouseDownView = nil;
+
+            return;
+
+        case CPLeftMouseDown:
+        case CPRightMouseDown:
+            // This will return _windowView if it is within a resize region
+            _leftMouseDownView = [_windowView hitTest:point];
+
+            [recordingEvent setView:_leftMouseDownView];
+
+            if (_leftMouseDownView !== _firstResponder && [_leftMouseDownView acceptsFirstResponder])
+                [self makeFirstResponder:_leftMouseDownView];
+
+            [CPApp activateIgnoringOtherApps:YES];
+
+            var theWindow = [anEvent window],
+                selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);
+
+            if ([theWindow isKeyWindow] || ([theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey]))
+                return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            else
+            {
+                // FIXME: delayed ordering?
+                [self makeKeyAndOrderFront:self];
+
+                if ([_leftMouseDownView acceptsFirstMouse:anEvent])
+                    return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            }
+            break;
+
+        case CPLeftMouseDragged:
+        case CPRightMouseDragged:
+            if (!_leftMouseDownView)
+            {
+                [recordingEvent setView:[_windowView hitTest:point]];
+                return [[_windowView hitTest:point] mouseDragged:anEvent];
+            }
+
+            [recordingEvent setView:_leftMouseDownView];
+
+            var selector;
+
+            if (type == CPRightMouseDragged)
+            {
+                selector = @selector(rightMouseDragged:)
+                if (![_leftMouseDownView respondsToSelector:selector])
+                    selector = nil;
+            }
+
+            if (!selector)
+                selector = @selector(mouseDragged:)
+
+            return [_leftMouseDownView performSelector:selector withObject:anEvent];
+
+        case CPMouseMoved:
+            [_windowView setCursorForLocation:point resizing:NO];
+
+            // Ignore mouse moves for parents of sheets
+            if (!_acceptsMouseMovedEvents || sheet)
+                return;
+
+            if (!_mouseEnteredStack)
+                _mouseEnteredStack = [];
+
+            var hitTestView = [_windowView hitTest:point];
+
+            if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
+                return [hitTestView mouseMoved:anEvent];
+
+            var view = hitTestView,
+                mouseEnteredStack = [];
+
+            while (view)
+            {
+                mouseEnteredStack.unshift(view);
+
+                view = [view superview];
+            }
+
+            var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);
+
+            while (deviation--)
+                if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
+                    break;
+
+            var index = deviation + 1,
+                count = _mouseEnteredStack.length;
+
+            if (index < count)
+            {
+                var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+
+                for (; index < count; ++index)
+                    [_mouseEnteredStack[index] mouseExited:event];
+            }
+
+            index = deviation + 1;
+            count = mouseEnteredStack.length;
+
+            if (index < count)
+            {
+                var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+
+                for (; index < count; ++index)
+                    [mouseEnteredStack[index] mouseEntered:event];
+            }
+
+            _mouseEnteredStack = mouseEnteredStack;
+
+            [hitTestView mouseMoved:anEvent];
+    }
+}
+
+@end
+
+
+@implementation RecordingEvent : CPObject
+{
+    CPEvent     _event                  @accessors(property=event);
+    CPString    _keyView                @accessors(property=keyView);
+    CPString    _valueView              @accessors(property=valueView);
+    CGPoint     _offsetView             @accessors(property=offsetView);
+    int         _offsetXPercentage      @accessors(property=offsetXPercentage);
+    int         _offsetYPercentage      @accessors(property=offsetYPercentage);
+}
+
+- (id)initWithEvent:(CPEvent)anEvent
+{
+    if (self = [super init])
+    {
+        _event = anEvent;
+        _offsetView = CGPointMakeZero();
+        _keyView = @"";
+        _valueView = @"";
+    }
+
+    return self;
+}
+
+- (void)setView:(CPView)aView
+{
+    if ([aView respondsToSelector:@selector(cucappIdentifier)])
+    {
+        _keyView = @"cucappIdentifier";
+        _valueView = [aView cucappIdentifier];
+    }
+    else if ([aView respondsToSelector:@selector(identifier)])
+    {
+        _keyView = @"identifier";
+        _valueView = [aView identifier];
+    }
+    else if ([aView respondsToSelector:@selector(title)])
+    {
+        _keyView = @"title";
+        _valueView = [aView title];
+    }
+    else if ([aView respondsToSelector:@selector(placeholderString)])
+    {
+        _keyView = @"placeholderString";
+        _valueView = [aView placeholderString];
+    }
+    else if ([aView respondsToSelector:@selector(text)])
+    {
+        _keyView = @"text";
+        _valueView = [aView text];
+    }
+    else if ([aView respondsToSelector:@selector(tag)])
+    {
+        _keyView = @"tag";
+        _valueView = [aView tag];
+    }
+    else if ([aView respondsToSelector:@selector(label)])
+    {
+        _keyView = @"label";
+        _valueView = [aView label];
+    }
+    else if ([aView respondsToSelector:@selector(objectValue)])
+    {
+        _keyView = @"objectValue";
+        _valueView = [aView objectValue];
+    }
+
+    var globalPoint = [[aView superview] convertPointToBase:[aView frameOrigin]],
+        globalEventPoint = [_event locationInWindow];
+
+    _offsetView = CGPointMake(globalEventPoint.x - globalPoint.x, globalEventPoint.y - globalPoint.y);
+
+    _offsetXPercentage = _offsetView.x * 100 / [aView frameSize].width;
+    _offsetYPercentage = _offsetView.y * 100 / [aView frameSize].height;
+}
+
+- (CPString)objectToJSON
+{
+    var json = {};
+
+    json["keyView"] = _keyView;
+    json["valueView"] = _valueView;
+    json["offsetXPercentage"] = _offsetXPercentage;
+    json["offsetYPercentage"] = _offsetYPercentage;
+    json["offsetView"] = {"x" : _offsetView.x, "y" : _offsetView.y};
+
+    var event = {};
+    event["type"] = [_event type];
+    event["deltaX"] = [_event deltaX];
+    event["deltaY"] = [_event deltaY];
+    event["deltaZ"] = [_event deltaZ];
+    event["characters"] = [_event characters];
+    event["charactersIgnoringModifiers"] = [_event charactersIgnoringModifiers];
+    event["clickCount"] = [_event clickCount];
+    event["modifierFlags"] = [_event modifierFlags];
+    event["locationInWindow"] = {"x" : [_event locationInWindow].x, "y" : [_event locationInWindow].y};
+    event["keyCode"] = [_event keyCode];
+    event["timestamp"] = [_event timestamp];
+
+    json["event"] = event;
+
+    return JSON.stringify(json, null, 4);
+}
+
+@end
+
+
+@implementation CPApplication (cucappRecord)
+
+/*!
+    Dispatches events to other objects.
+    @param anEvent the event to dispatch
+*/
+- (void)sendEvent:(CPEvent)anEvent
+{
+    _currentEvent = anEvent;
+    CPEventModifierFlags = [anEvent modifierFlags];
+
+    var theWindow = [anEvent window];
+
+    // Check if this is a candidate for key equivalent...
+    if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
+        // The key equivalent was handled.
+        return;
+
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
+    }
+
+    /*
+        Event listeners are processed from back to front so that newer event listeners normally take
+        precedence. If during the execution of a callback a new event listener is added, it should
+        be inserted after the current callback but before any higher priority callbacks. This makes
+        repeating event listeners (those that reinsert themselves) stable relative to each other.
+    */
+    for (var i = _eventListeners.length - 1; i >= 0; i--)
+    {
+        var listener = _eventListeners[i];
+
+        if (listener._mask & (1 << [anEvent type]))
+        {
+            _eventListeners.splice(i, 1);
+            // In case the callback wants to add more listeners.
+            _eventListenerInsertionIndex = i;
+            listener._callback(anEvent);
+
+            var type = [anEvent type],
+                recordingEvent = [[RecordingEvent alloc] initWithEvent:anEvent];
+
+            if (recordingEvent && type != CPFlagsChanged && type != CPMouseMoved)
+                [eventRecords addObject:recordingEvent];
+
+            if (theWindow)
+                [recordingEvent setView:[theWindow._windowView hitTest:[anEvent locationInWindow]]];
+
+            if (listener._dequeue)
+            {
+                // Don't process the event normally and don't send it to any other listener.
+                _eventListenerInsertionIndex = _eventListeners.length;
+                return;
+            }
+        }
+    }
+
+    _eventListenerInsertionIndex = _eventListeners.length;
+
+    if (theWindow)
+        [theWindow sendEvent:anEvent];
+}
+
+@end
@@ -0,0 +1,14 @@
+<?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>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>CPAnimationContextTest</string>
+    <key>CPBundleVersion</key>
+    <string>1.0</string>
+    <key>CPHumanReadableCopyright</key>
+    <string>Copyright © 2016, Your Company All rights reserved.</string>
+</dict>
+</plist>
@@ -0,0 +1,194 @@
+/*
+ * Jakefile
+ * CPAnimationContextTest
+ *
+ * Created by You on May 6, 2016.
+ * Copyright 2016, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os"),
+    projectName = "CPAnimationContextTest";
+
+app (projectName, function(task)
+{
+    ENV["OBJJ_INCLUDE_PATHS"] = "Frameworks";
+
+    if (configuration === "Debug")
+        ENV["OBJJ_INCLUDE_PATHS"] = FILE.join(ENV["OBJJ_INCLUDE_PATHS"], configuration);
+
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPAnimationContextTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPAnimationContextTest");
+    task.setIdentifier("com.yourcompany.CPAnimationContextTest");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPAnimationContextTest");
+    task.setSources(new FileList("**/*.j").exclude(FILE.join("Build", "**")).exclude(FILE.join("Frameworks", "Source", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O2");
+});
+
+task ("default", [projectName], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"], function()
+{
+    updateApplicationSize();
+});
+
+task ("debug", function()
+{
+    configuration = ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    configuration = ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", projectName, "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", projectName, "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", projectName));
+    OS.system(["press", "-f", FILE.join("Build", "Release", projectName), FILE.join("Build", "Deployment", projectName)]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", projectName));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", projectName), FILE.join("Build", "Desktop", projectName, "CPAnimationContextTest.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", projectName, "CPAnimationContextTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, projectName));
+    print("----------------------------");
+}
+
+function updateApplicationSize()
+{
+    print("Calculating application file sizes...");
+
+    var contents = FILE.read(FILE.join("Build", configuration, projectName, "Info.plist"), { charset:"UTF-8" }),
+        format = CFPropertyList.sniffedFormatOfString(contents),
+        plist = CFPropertyList.propertyListFromString(contents),
+        totalBytes = {executable:0, data:0, mhtml:0};
+
+    // Get the size of all framework executables and sprite data
+    var frameworksDir = "Frameworks";
+
+    if (configuration === "Debug")
+        frameworksDir = FILE.join(frameworksDir, "Debug");
+
+    var frameworks = FILE.list(frameworksDir);
+
+    frameworks.forEach(function(framework)
+    {
+        if (framework !== "Source")
+            addBundleFileSizes(FILE.join(frameworksDir, framework), totalBytes);
+    });
+
+    // Read in the default theme name, and attempt to get its size
+    var themeName = plist.valueForKey("CPDefaultTheme") || "Aristo2",
+        themePath = nil;
+
+    if (themeName === "Aristo" || themeName === "Aristo2")
+        themePath = FILE.join(frameworksDir, "AppKit", "Resources", themeName + ".blend");
+    else
+        themePath = FILE.join("Frameworks", "Resources", themeName + ".blend");
+
+    if (FILE.isDirectory(themePath))
+        addBundleFileSizes(themePath, totalBytes);
+
+    // Add sizes for the app
+    addBundleFileSizes(FILE.join("Build", configuration, projectName), totalBytes);
+
+    print("Executables: " + totalBytes.executable + ", sprite data: " + totalBytes.data + ", total: " + (totalBytes.executable + totalBytes.data));
+
+    var dict = new CFMutableDictionary();
+
+    dict.setValueForKey("executable", totalBytes.executable);
+    dict.setValueForKey("data", totalBytes.data);
+    dict.setValueForKey("mhtml", totalBytes.mhtml);
+
+    plist.setValueForKey("CPApplicationSize", dict);
+
+    FILE.write(FILE.join("Build", configuration, projectName, "Info.plist"), CFPropertyList.stringFromPropertyList(plist, format), { charset:"UTF-8" });
+}
+
+function addBundleFileSizes(bundlePath, totalBytes)
+{
+    var bundleName = FILE.basename(bundlePath),
+        environment = bundleName === "Foundation" ? "Objj" : "Browser",
+        bundlePath = FILE.join(bundlePath, environment + ".environment");
+
+    if (FILE.isDirectory(bundlePath))
+    {
+        var filename = bundleName + ".sj",
+            filePath = new FILE.Path(FILE.join(bundlePath, filename));
+
+        if (filePath.exists())
+            totalBytes.executable += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "dataURLs.txt"));
+
+        if (filePath.exists())
+            totalBytes.data += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLData.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLPaths.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+    }
+}
+
+task ("cucumber-test", function()
+{
+    var SYSTEM = require("system");
+
+    OS.system("ln -s " + SYSTEM.prefix + "/packages/cucapp/Cucapp Cucapp")
+    var code = OS.system("cucumber");
+    OS.system("rm -f Cucapp; rm -f cucumber.html")
+    OS.exit(code);
+});
@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;80E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;82E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;103E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;107E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;109E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;D;K;6;CP$UIDd;3;157E;D;K;6;CP$UIDd;3;158E;D;K;6;CP$UIDd;3;159E;D;K;6;CP$UIDd;3;160E;D;K;6;CP$UIDd;3;161E;D;K;6;CP$UIDd;3;162E;D;K;6;CP$UIDd;3;163E;D;K;6;CP$UIDd;3;164E;D;K;6;CP$UIDd;3;165E;D;K;6;CP$UIDd;3;166E;D;K;6;CP$UIDd;3;167E;D;K;6;CP$UIDd;3;168E;D;K;6;CP$UIDd;3;169E;D;K;6;CP$UIDd;3;170E;D;K;6;CP$UIDd;3;171E;D;K;6;CP$UIDd;3;172E;D;K;6;CP$UIDd;3;173E;D;K;6;CP$UIDd;3;174E;D;K;6;CP$UIDd;3;175E;D;K;6;CP$UIDd;3;176E;D;K;6;CP$UIDd;3;177E;D;K;6;CP$UIDd;3;178E;D;K;6;CP$UIDd;3;179E;D;K;6;CP$UIDd;3;180E;D;K;6;CP$UIDd;3;181E;D;K;6;CP$UIDd;3;182E;D;K;6;CP$UIDd;3;183E;D;K;6;CP$UIDd;3;184E;D;K;6;CP$UIDd;3;185E;D;K;6;CP$UIDd;3;186E;D;K;6;CP$UIDd;3;187E;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;D;K;6;CP$UIDd;3;190E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;192E;D;K;6;CP$UIDd;3;193E;D;K;6;CP$UIDd;3;194E;D;K;6;CP$UIDd;3;195E;D;K;6;CP$UIDd;3;196E;D;K;6;CP$UIDd;3;197E;D;K;6;CP$UIDd;3;198E;D;K;6;CP$UIDd;3;199E;D;K;6;CP$UIDd;3;200E;D;K;6;CP$UIDd;3;201E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;203E;D;K;6;CP$UIDd;3;204E;D;K;6;CP$UIDd;3;205E;D;Line truncated
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1050" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="450" id="451"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <menu title="AMainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+            <items>
+                <menuItem title="NewApplication" id="56">
+                    <menu key="submenu" title="NewApplication" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About NewApplication" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Preferences…" keyEquivalent="," id="129" userLabel="121"/>
+                            <menuItem isSeparatorItem="YES" id="143">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide NewApplication" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit NewApplication" keyEquivalent="q" id="136" userLabel="1111">
+                                <connections>
+                                    <action selector="terminate:" target="-3" id="449"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="83">
+                    <menu key="submenu" title="File" id="81">
+                        <items>
+                            <menuItem title="New" keyEquivalent="n" id="82" userLabel="9">
+                                <connections>
+                                    <action selector="newDocument:" target="-1" id="373"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open…" keyEquivalent="o" id="72">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="374"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="124">
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="126">
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="79" userLabel="7">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73" userLabel="1">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="193"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save" keyEquivalent="s" id="75" userLabel="3">
+                                <connections>
+                                    <action selector="saveDocument:" target="-1" id="362"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save As…" keyEquivalent="S" id="80" userLabel="8">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="saveDocumentAs:" target="-1" id="363"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Revert to Saved" id="112" userLabel="10">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="74" userLabel="2">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Page Setup..." keyEquivalent="P" id="77" userLabel="5">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="runPageLayout:" target="-1" id="87"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78" userLabel="6">
+                                <connections>
+                                    <action selector="print:" target="-1" id="86"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="217">
+                    <menu key="submenu" title="Edit" id="205">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="207">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="223"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="215">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="redo:" target="-1" id="231"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="206">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="228"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="197">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="224"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="203">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="226"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="202">
+                                <connections>
+                                    <action selector="delete:" target="-1" id="235"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="198">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="232"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="214">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Find" id="218">
+                                <menu key="submenu" title="Find" id="220">
+                                    <items>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
+                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                        </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
+                                            <connections>
+                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Spelling and Grammar" id="216">
+                                <menu key="submenu" title="Spelling and Grammar" id="200">
+                                    <items>
+                                        <menuItem title="Show Spelling…" keyEquivalent=":" id="204">
+                                            <connections>
+                                                <action selector="showGuessPanel:" target="-1" id="230"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling" keyEquivalent=";" id="201">
+                                            <connections>
+                                                <action selector="checkSpelling:" target="-1" id="225"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219">
+                                            <connections>
+                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Grammar With Spelling" id="346">
+                                            <connections>
+                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Substitutions" id="348">
+                                <menu key="submenu" title="Substitutions" id="349">
+                                    <items>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
+                                            <connections>
+                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
+                                            <connections>
+                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Speech" id="211">
+                                <menu key="submenu" title="Speech" id="212">
+                                    <items>
+                                        <menuItem title="Start Speaking" id="196">
+                                            <connections>
+                                                <action selector="startSpeaking:" target="-1" id="233"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop Speaking" id="195">
+                                            <connections>
+                                                <action selector="stopSpeaking:" target="-1" id="227"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Format" id="375">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Format" id="376">
+                        <items>
+                            <menuItem title="Font" id="377">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Font" systemMenu="font" id="388">
+                                    <items>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392">
+                                            <connections>
+                                                <action selector="underline:" target="-1" id="432"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="393"/>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
+                                        <menuItem isSeparatorItem="YES" id="396"/>
+                                        <menuItem title="Kern" id="397">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Kern" id="415">
+                                                <items>
+                                                    <menuItem title="Use Default" id="416">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="417">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Tighten" id="418">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="tightenKerning:" target="-1" id="431"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Loosen" id="419">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="loosenKerning:" target="-1" id="435"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Ligature" id="398">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Ligature" id="411">
+                                                <items>
+                                                    <menuItem title="Use Default" id="412">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="413">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use All" id="414">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Baseline" id="399">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Baseline" id="405">
+                                                <items>
+                                                    <menuItem title="Use Default" id="406">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="unscript:" target="-1" id="437"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Superscript" id="407">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="superscript:" target="-1" id="430"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Subscript" id="408">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="subscript:" target="-1" id="429"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Raise" id="409">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Lower" id="410">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="400"/>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
+                                            <connections>
+                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="402"/>
+                                        <menuItem title="Copy Style" keyEquivalent="c" id="403">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyFont:" target="-1" id="428"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Style" keyEquivalent="v" id="404">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteFont:" target="-1" id="436"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Text" id="378">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Text" id="379">
+                                    <items>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="380">
+                                            <connections>
+                                                <action selector="alignLeft:" target="-1" id="442"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Center" keyEquivalent="|" id="381">
+                                            <connections>
+                                                <action selector="alignCenter:" target="-1" id="445"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Justify" id="382">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="alignJustified:" target="-1" id="443"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="383">
+                                            <connections>
+                                                <action selector="alignRight:" target="-1" id="447"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="384"/>
+                                        <menuItem title="Show Ruler" id="385">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleRuler:" target="-1" id="446"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy Ruler" keyEquivalent="c" id="386">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyRuler:" target="-1" id="444"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Ruler" keyEquivalent="v" id="387">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteRuler:" target="-1" id="448"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="View" id="295">
+                    <menu key="submenu" title="View" id="296">
+                        <items>
+                            <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298">
+                                <connections>
+                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="239">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="240"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="103" userLabel="1">
+                    <menu key="submenu" title="Help" id="106" userLabel="2">
+                        <items>
+                            <menuItem title="NewApplication Help" keyEquivalent="?" id="111">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="360"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="940" height="1040"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="940" height="1040"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button identifier="run" verticalHuggingPriority="750" id="462">
+                        <rect key="frame" x="332" y="999" width="134" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Start Animation" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="463">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="test:" target="450" id="0vd-DD-jrm"/>
+                        </connections>
+                    </button>
+                    <customView identifier="draw" id="FJv-ci-zoT" customClass="DrawView">
+                        <rect key="frame" x="29" y="769" width="148" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
+                    <customView identifier="layout" id="Ff1-j8-ljn" customClass="CustomLayoutView">
+                        <rect key="frame" x="29" y="637" width="148" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <subviews>
+                            <customView identifier="vanilla" id="obD-Te-e4b" customClass="ColorView">
+                                <rect key="frame" x="20" y="52" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="kng-GZ-UzT" customClass="ColorView">
+                                <rect key="frame" x="86" y="52" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="Ofx-KZ-FgQ" customClass="ColorView">
+                                <rect key="frame" x="48" y="6" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                        </subviews>
+                    </customView>
+                    <customView identifier="drawLayout" id="dLm-xl-6jP" customClass="CustomLayoutDrawView">
+                        <rect key="frame" x="29" y="499" width="148" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <subviews>
+                            <customView identifier="vanilla" id="Zo1-nI-BE8" customClass="ColorView">
+                                <rect key="frame" x="12" y="61" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="Ohs-DN-x4k" customClass="ColorView">
+                                <rect key="frame" x="84" y="61" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="OGq-ro-Klu" customClass="ColorView">
+                                <rect key="frame" x="48" y="10" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                        </subviews>
+                    </customView>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="643" y="761"/>
+        </window>
+        <customObject id="450" customClass="AppController">
+            <connections>
+                <outlet property="drawView" destination="FJv-ci-zoT" id="HzW-FO-0Sa"/>
+                <outlet property="layoutDrawView" destination="dLm-xl-6jP" id="6fs-7K-Eeq"/>
+                <outlet property="layoutView" destination="Ff1-j8-ljn" id="ryQ-pg-Xmz"/>
+                <outlet property="theWindow" destination="371" id="459"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>
@@ -0,0 +1,177 @@
+# Given the application is lauched
+Given /^the application is launched$/ do
+  launched = app.gui.command "launched"
+
+  if !launched
+    raise "The application was not launched"
+  end
+end
+
+# Given I wait for n seconds
+Given /^I wait for (\d+) seconds?$/ do |n|
+  sleep(eval("#{n.to_i}"))
+end
+
+# When I close the popover
+When /^I close the popover$/ do
+  step "I hit the key escape"
+end
+
+
+# When I hit the key c
+When /^I hit the key (.*)$/ do |key|
+  step "I hit the mask none and the key #{key}"
+end
+
+
+# When I hit the mask shif and the key c
+When /^I hit the mask (.*) and the key (.*)$/ do |mask, key|
+  simulate_keyboard_event(key, mask)
+end
+
+
+# When the keys cucapp
+When /^I hit the keys (.*)$/ do |keys|
+  step "I hit the mask none and keys #{keys}"
+end
+
+
+# When I hit the mask shif and the keys cucapp
+When /^I hit the mask (.*) and keys (.*)$/ do |mask, keys|
+  simulate_keyboard_event(keys, mask)
+end
+
+
+# When I select all
+When /^I select all$/ do
+  app.gui.simulate_keyboard_event    "a", [$CPCommandKeyMask]
+end
+
+
+# When I save the document
+When /^I save the document$/ do
+  app.gui.simulate_keyboard_event    "s", [$CPCommandKeyMask]
+end
+
+
+# When I (click|right click|double click) on the field with the value cucapp
+When /^I (click|right click|double click) on the (\w*\-*\w*) with the value (.*)$/ do |click_type, element, value|
+  step "I #{click_type} on the #{element} with the property object-value set to #{value}"
+end
+
+
+# When I click on the field with the property cucapp-identifier set to cucapp-identifier-button-add
+When /^I (click|right click|double click) on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |click_type, element, property, property_value|
+  step "I #{click_type} with the key mask none on the #{element} with the property #{property} set to #{property_value}"
+end
+
+
+# When I click with the mask shift on the field with the property cucapp-identifier set to cucapp-identifier-button-add
+When /^I (click|right click|double click) with the key mask (.*) on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |click_type, mask, element,  property, property_value|
+
+  type = $mouse_left_click
+
+  if click_type == "right click"
+    type = $mouse_right_click
+  end
+
+  if click_type == "double click"
+    type = $mouse_double_click
+  end
+
+  simulate_click(type, element, property, property_value, mask)
+end
+
+
+# When I do a drag and drop from the field with the value cucapp to the field with the value cappuccino
+When /^I do a drag and drop from the (\w*\-*\w*) with the value (.*) to the (\w*\-*\w*) with the value (.*)$/ do |element, value, second_element, second_value|
+  step "I do a drag and drop from the #{element} with the property object-value set to #{value} to the #{second_element} with the property object-value set to #{second_value}"
+end
+
+
+# When I do a drag and drop from the field with the property title set to cucapp to the field with the property title set to cappuccino
+When /^I do a drag and drop from the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) to the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |element, property, property_value, second_element, second_property, second_property_value|
+  step "I do a drag and drop with the key mask none from the #{element} with the property #{property} set to #{property_value} to the #{second_element} with the property #{second_property} set to #{second_property_value}"
+end
+
+
+# When I do a drag and drop with the key mask shift from the field with the property title set to cucapp to the field with the property title set to cappuccino
+When /^I do a drag and drop with the key mask (.*) from the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) to the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |mask, element, property, property_value, second_element, second_property, second_property_value|
+  simulate_drag_and_drop(element, property, property_value, second_element, second_property, second_property_value, mask)
+end
+
+
+# When I vertically|horizontally scroll on the field with the value cappuccino
+When /^I (vertically|horizontally) scroll on the (\w*\-*\w*) with the value (.*)$/ do |direction, element, value|
+  step "When I #{direction} scroll 10 times on the #{element} with the value #{value}"
+end
+
+
+# When I vertically|horizontally scroll 10 times on the field with the value cappuccino
+When /^I (vertically|horizontally) scroll ([0-9]*) times on the (\w*\-*\w*) with the value (.*)$/ do |direction, times, element, value|
+  step "I #{direction} scroll #{times} times on the #{element} with the property object-value set to #{value}"
+end
+
+
+# When I vertically|horizontally scroll 10 times on the field with the property title set to cappuccino
+When /^I (vertically|horizontally) scroll ([0-9]*) times on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |direction, times, element, property, property_value|
+  step "I #{direction} scroll #{times} times with the key mask none on the #{element} with the property #{property} set to #{property_value}"
+end
+
+
+# When I vertically|horizontally scroll 10 times on the field with the property title set to cappuccino
+When /^I (vertically|horizontally) scroll ([0-9]*) times with the key mask (.*) on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |direction, times, mask, element, property, property_value|
+
+  vertically = false
+  horizontally = false
+
+  if direction == "vertically"
+    vertically = true
+  end
+
+  if direction == "horizontally"
+    horizontally = true
+  end
+
+  simulate_scroll(element, property, property_value, times, mask, horizontally, vertically)
+end
+
+
+# When I select the item name of the pop-up-button with the property cucapp-identifier set to cucappIdentifierPopUpButton
+When /^I select the item (.*) of the pop-up-button with the property (\w*\-*\w*) set to (.*)$/ do |item_name, property, property_value|
+  select_pop_up_button_item(item_name, property, property_value)
+end
+
+
+# Then the field with the property title set to name should be focused
+Then /^the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) should be focused$/ do |element, property, property_value|
+  app.gui.is_control_focused(create_xpath(element, property, property_value))
+end
+
+
+# Then the field should not have a value
+Then /^the (\w*\-*\w*) should not have a value$/ do |element|
+  step "the #{element} with the property object-value set to #{value} should have the value #{value}"
+end
+
+
+# Then the field with the property cucapp-identifier set to cucapp-identifier-textfield-description should not have a value
+Then /^the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) should not have a value$/ do |element, property, property_value|
+  check_value_control(element, property, property_value, nil)
+end
+
+
+# Then the field should have the value cucapp
+Then /^the (\w*\-*\w*) should have the value (.*)$/ do |element, value|
+  step "the #{element} with the property object-value set to #{value} should have the value #{value}"
+end
+
+
+# Then the field with the property cucapp-identifier set to cucapp-identifier-textfield-description should have the value cucapp
+Then /^the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) should have the value (.*)$/ do |element, property, property_value, value|
+  check_value_control(element, property, property_value, value)
+end
+
+Then /^the delegate property (\w*) should have the value (.*)$/ do |property, value|
+  check_delegate_property(property, value)
+end
@@ -0,0 +1,30 @@
+@import <Foundation/Foundation.j>
+
+@implementation Cucumber (CuCapp)
+
+- (CPString)valueIsEqual:(CPArray)params
+{
+    var obj = cucumber_objects[params[0]],
+        value = params[1];
+
+    if (!obj)
+        return '{"result" : "__CUKE_ERROR__"}';
+
+    if ([obj respondsToSelector:@selector(stringValue)] && value === [obj stringValue])
+        return '{"result" : "OK"}';
+
+    return '{"result" : "__CUKE_ERROR__"}';
+}
+
+- (CPString)delegatePropertyIsEqual:(CPArray)params
+{
+    var property = params[0],
+        value = params[1];
+
+    if (property == nil || value !== [[[CPApplication sharedApplication] delegate] valueForKey:property])
+        return '{"result" : "__CUKE_ERROR__"}';
+
+    return '{"result" : "OK"}';
+}
+
+@end
@@ -0,0 +1,62 @@
+$cappuccino_control_mappings = {
+  "image-view-text"     => "_CPImageAndTextView",
+  "menu-item"           => "_CPMenuItemView",
+  "tool-bar-item"       => "_CPToolbarItemView",
+  "box"                 => "CPBox",
+  "button"              => "CPButton",
+  "button-bar"          => "CPButtonBar",
+  "collection-view"     => "CPCollectionView",
+  "combo-box"           => "CPComboBox",
+  "control"             => "CPControl",
+  "check-box"           => "CPCheckBox",
+  "date-picker"         => "CPDatePicker",
+  "image-view"          => "CPImageView",
+  "level-indicator"     => "CPLevelIndicator",
+  "outline-view"        => "CPOutlineView",
+  "pop-up-button"       => "CPPopUpButton",
+  "predicate-editor"    => "CPPredicateEditor",
+  "radio-button"        => "CPRadio",
+  "rule-editor"         => "CPRuleEditor",
+  "scroller"            => "CPScroller",
+  "scroll-view"         => "CPScrollView",
+  "search-field"        => "CPSearchField",
+  "secure-field"        => "CPSecureTextField",
+  "segemented-control"  => "CPSegmentedControl",
+  "slider"              => "CPSlider",
+  "stepper"             => "CPStepper",
+  "tab-view"            => "CPTabView",
+  "table"               => "CPTableView",
+  "field"               => "CPTextField",
+  "token-field"         => "CPTokenField",
+  "view"                => "CPView",
+  "none"                => nil
+}
+
+$property_mappings = {
+  "cucapp-identifier" => "cucappIdentifier",
+  "id"                => "id",
+  "identifier"        => "identifier",
+  "label"             => "label",
+  "object-value"      => "objectValue",
+  "placeholder"       => "placeholderString",
+  "tag"               => "tag",
+  "title"             => "title",
+  "text"              => "text",
+  "none"              => nil
+}
+
+$key_mappings = {
+  "command"     => $CPCommandKeyMask,
+  "shift"       => $CPShiftKeyMask,
+  "option"      => $CPAlternateKeyMask,
+  "control"     => $CPControlKeyMask,
+  "delete"      => $CPDeleteCharacter,
+  "escape"      => $CPEscapeFunctionKey,
+  "enter"       => $CPNewlineCharacter,
+  "left-arrow"  => $CPLeftArrowFunctionKey,
+  "right-arrow" => $CPRightArrowFunctionKey,
+  "top-arrow"   => $CPTopArrowFunctionKey,
+  "down-arrow"  => $CPDownArrowFunctionKey,
+  "tab"         => $CPTabCharacter,
+  "none"        => nil
+}
@@ -0,0 +1,20 @@
+module Encumber
+
+  class GUI
+    def value_is_equal(xpath, value)
+
+      if !value
+        value = ""
+      end
+
+      result = command 'valueIsEqual', id_for_element(xpath), value
+      raise "Value #{value} not found" if result["result"] != "OK"
+    end
+
+    def delegate_property_is_equal(property, value)
+      result = command 'delegatePropertyIsEqual', property, value
+      raise "Value #{value} not found" if result["result"] != "OK"
+    end
+
+  end
+end
@@ -0,0 +1,20 @@
+$: << File.join(File.dirname(__FILE__), '..', '..', 'Cucapp')
+
+require 'cucapp.rb'
+require 'logger'
+
+module AppHelper
+
+  def app
+    @app ||= Cucapp.new
+  end
+
+  def log
+    @log ||= ENV['log']
+  end
+
+end
+
+World(
+  AppHelper
+)
@@ -0,0 +1,7 @@
+Before do
+  app.reset()
+end
+
+After do
+  app.quit()
+end
@@ -0,0 +1,97 @@
+
+def check_delegate_property(property, value)
+    app.gui.delegate_property_is_equal  property, value
+end
+
+def check_value_control(element, property, property_value, value)
+  xpath = create_xpath(element, property, property_value)
+
+  app.gui.wait_for        xpath
+  app.gui.value_is_equal  xpath, value
+end
+
+def simulate_keyboard_event(keys, mask)
+  app.gui.simulate_keyboard_events    cappuccino_key(keys), [cappuccino_key(mask)]
+end
+
+def simulate_click(type, element, property, property_value, mask)
+  xpath = create_xpath(element, property, property_value)
+
+  app.gui.wait_for              xpath
+
+  if type == $mouse_double_click
+    app.gui.simulate_double_click   xpath, [cappuccino_key(mask)]
+  elsif type == $mouse_right_click
+    app.gui.simulate_right_click    xpath, [cappuccino_key(mask)]
+  else
+    app.gui.simulate_left_click     xpath, [cappuccino_key(mask)]
+  end
+end
+
+def simulate_drag_and_drop(element, property, property_value, second_element, second_property, second_property_value, mask)
+
+  xpath1 = create_xpath(element, property, property_value)
+  xpath2 = create_xpath(second_element, second_property, second_property_value)
+
+  app.gui.simulate_dragged_click_view_to_view xpath1, xpath2, [cappuccino_key(mask)]
+end
+
+def simulate_scroll(element, property, property_value, times, mask, horizontal, vertical)
+  xpath = create_xpath(element, property, property_value)
+  delta_x = 0
+  delta_y = 0
+
+  if horizontal
+    delta_x = 1
+  end
+
+  if vertical
+    delta_y = 1
+  end
+
+  for i in 0..times.to_i
+    app.gui.simulate_scroll_wheel xpath, delta_x, delta_y, [cappuccino_key(mask)]
+  end
+end
+
+def select_pop_up_button_item(item_name, property, property_value)
+  simulate_click($mouse_left_click, "pop-up-button", property, property_value, [])
+
+  pop_up_button_xpath = create_xpath("pop-up-button", property, property_value)
+
+  pop_up_button_item_xpath = create_xpath("image-view-text", "text", item_name)
+
+  while !app.gui.wait_for_element(pop_up_button_item_xpath, 0.05) && app.gui.pop_up_button_can_scroll_up(pop_up_button_xpath)
+    simulate_keyboard_event("up-arrow", [])
+  end
+
+  while !app.gui.wait_for_element(pop_up_button_item_xpath, 0.05) && app.gui.pop_up_button_can_scroll_down(pop_up_button_xpath)
+    simulate_keyboard_event("down-arrow", [])
+  end
+
+  if not app.gui.wait_for(pop_up_button_item_xpath)
+    raise "Menu item #{item_name} not found !"
+  end
+
+  simulate_click($mouse_left_click, "image-view-text", "text", item_name, [])
+end
+
+def cappuccino_key(key)
+  if $key_mappings.has_key?(key)
+    key = $key_mappings[key]
+  end
+
+  return key
+end
+
+def create_xpath(element, property, property_value)
+  if !$cappuccino_control_mappings.has_key?(element)
+    raise "Element #{element} not found in the hash cappuccino_control_mappings. You should complete the hash $cappuccino_control_mappings in env.rb"
+  end
+
+  if !$property_mappings.has_key?(property)
+    raise "Property #{property} not found in the hash $property_mappings. You should complete the hash $property_mappings in env.rb"
+  end
+
+  return "//" + $cappuccino_control_mappings[element] + "["+ $property_mappings[property] +"='#{property_value}']"
+end
@@ -0,0 +1,23 @@
+Feature: Cappuccino animations
+Cappuccino animations powered by css animations
+
+  Scenario: Check if the demo application works
+    Given the application is launched
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index-debug.html
+ CPAnimationContextTest
+
+ Created by You on May 6, 2016.
+ Copyright 2016, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPAnimationContextTest</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
+            // The below will tell the compiler to generate debug symbols, type signatures and not inline objj_msgSend functions.
+            // This will affect only Objective-J code that is compiled when loading the application. It will not affect precompiled
+            // code like the Cappuccino frameworks.
+            //
+            // Debug symbols will give each Objective-J method a Javascript function name. Without a name it will be very hard to find
+            // the methods in the debugger.
+            // Type Signatures will give type information to the Objective-J runtime for instance variables and methods.
+            // Inline objj_msgSend will give a speed increase but decorators will not work. Check below on debug options for
+            // more information on decorators.
+            //
+            // Uncomment or comment on the line below to change the flags
+            OBJJ_COMPILER_FLAGS = ["IncludeDebugSymbols", "IncludeTypeSignatures"/*, "InlineMsgSend"*/];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+            // Decorators will only work when the code is compiled without the compiler option 'InlineMsgSend'. Check above.
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>
@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index.html
+ CPAnimationContextTest
+
+ Created by You on May 6, 2016.
+ Copyright 2016, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPAnimationContextTest</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            // The below will tell the compiler to not generate debug symbols but will generate type signatures and inline objj_msgSend functions.
+            // This will affect only Objective-J code that is compiled when loading the application. It will not affect precompiled
+            // code like the Cappuccino frameworks.
+            // Uncomment or comment on the line below to change the flags
+            OBJJ_COMPILER_FLAGS = [/*"IncludeDebugSymbols"*/, "IncludeTypeSignatures", "InlineMsgSend"];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>
@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPAnimationContextTest
+ *
+ * Created by You on May 6, 2016.
+ * Copyright 2016, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}
@@ -7,6 +7,7 @@
 */
@import <AppKit/AppKit.j>
@import <Foundation/CPObject.j>
+@import "TabViewController.j"

 CPLogRegister(CPLogConsole);

@@ -15,7 +16,6 @@ CPLogRegister(CPLogConsole);
    CPWindow    theWindow; //this "outlet" is connected automatically by the Cib
    @outlet     CPTabView nibTabView;
    @outlet     CPTabView nibTabViewEmpty;
-    @outlet     CPViewController viewController;
    @outlet     CPStepper insertStepper;
    @outlet     CPStepper removeStepper;
    @outlet     CPButton fromViewController;
@@ -23,23 +23,25 @@ CPLogRegister(CPLogConsole);

 - (IBAction)insertTabViewItem:(id)sender
 {
-    var idx = [insertStepper intValue],
-        item;
-
-    if ([fromViewController state])
-        item = [CPTabViewItem tabViewItemWithViewController:viewController];
-    else
-    {
-        item = [[CPTabViewItem alloc] initWithIdentifier:@"Insert" + idx];
-        var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-        [view setBackgroundColor:[CPColor randomColor]];
-        [item setView:view];
-        [item setLabel:@"Insert" + idx];
-    }
+    var idx = [insertStepper objectValue];
+    var item = [[CPTabViewItem alloc] initWithIdentifier:@"Insert" + idx];
+    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    [view setBackgroundColor:[CPColor randomColor]];
+    [item setView:view];
+    [item setLabel:@"Insert" + idx];

    [nibTabView insertTabViewItem:item atIndex:idx];
 }

+- (IBAction)insertViewControllerTabViewItem:(id)sender
+{
+    var ctl = [[TabViewController alloc] initWithCibName:@"TabViewItem" bundle:nil];
+    [ctl setTitle:@"View Controller"];
+    var item = [CPTabViewItem tabViewItemWithViewController:ctl];
+
+    [nibTabView insertTabViewItem:item atIndex:0];
+}
+
 - (IBAction)removeTabViewItem:(id)sender
 {
    var idx = [removeStepper intValue],
@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;17E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;1;0E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;22E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;23E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;24E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;20E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;25E;E;D;K;10;$classnameS;21;CPCibBindingConnectorK;8;$classesA;S;21;CPCibBindingConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;16E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;22E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;11E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;26E;K;31;CPCibBindingConnectorBindingKeyD;K;6;CP$UIDd;2;27E;K;31;CPCibBindingConnectorKeyPathKeyD;K;6;CP$UIDd;2;28E;K;31;CPCibBindingConnectorOptionsKeyD;K;6;CP$UIDd;2;30E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;31E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;32E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;33E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;33E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;2;34E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;35E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;36E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;37E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;37E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;38E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6;CP$UIDd;2;39E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;40E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;40E;E;D;K;10;$classnameS;8;CPButtonK;8;$classesA;S;8;CPButtonS;9;CPControlS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;21E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;20E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;32E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;41E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;42E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;20E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;43E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;2;44E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;45E;K;15;$aimage-scalingD;K;6;CP$UIDd;2;32E;K;6;$afontD;K;6;CP$UIDd;2;47E;K;17;$aline-break-modeD;K;6;CP$UIDd;2;32E;K;11;$aalignmentD;K;6;CP$UIDd;2;48E;K;7;$aimageD;K;6;CP$UIDd;2;50E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;37E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;37E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;38E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6;CP$UIDd;2;51E;K;17;CPControlValueKeyD;K;6;CP$UIDd;2;32E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;2;52E;K;23;CPControlControlSizeKeyD;K;6;CP$UIDd;2;32E;K;33;CPControlBaseWrittingDirectionKeyD;K;6;CP$UIDd;2;53E;K;16;CPButtonTitleKeyD;K;6;CP$UIDd;2;54E;K;25;CPButtonAlternateTitleKeyD;K;6;CP$UIDd;2;55E;K;27;CPButtonAllowsMixedStateKeyD;K;6;CP$UIDd;2;38E;K;23;CPButtonHighlightsByKeyD;K;6;CP$UIDd;2;56E;K;23;CPButtonShowsStateByKeyD;K;6;CP$UIDd;2;32E;K;32;CPButtonImageDimsWhenDisabledKeyD;K;6;CP$UIDd;2;57E;K;24;CPButtonImagePositionKeyD;K;6;CP$UIDd;2;48E;K;28;CPButtonKeyEquivalentMaskKeyD;K;6;CP$UIDd;2;32E;K;24;CPButtonPeriodicDLine truncated
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
+            <connections>
+                <outlet property="view" destination="c22-O7-iKe" id="qxT-KH-2c6"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe" customClass="CPView">
+            <rect key="frame" x="0.0" y="0.0" width="90" height="40"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2mc-qc-fMw">
+                    <rect key="frame" x="3" y="2" width="81" height="32"/>
+                    <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Xfn-8O-d0Z">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <binding destination="-2" name="title" keyPath="representedObject" id="r8y-dc-uru"/>
+                    </connections>
+                </button>
+            </subviews>
+            <point key="canvasLocation" x="218" y="301"/>
+        </customView>
+    </objects>
+</document>
@@ -1 +1 @@
-280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;67E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;68E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;69E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;65E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;70E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;33E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;46E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;71E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;65E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;62E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;72E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;65E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;64E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;73E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;65E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;46E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;74E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;65E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;37E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;75E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;65E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;60E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;76E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorLine truncated
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;1;0E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;62E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;63E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;64E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;31E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;65E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;33E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;37E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;66E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;31E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;61E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;67E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;31E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;37E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;68E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;31E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;49E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;69E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;31E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;62E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;70E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;37E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;31E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;65E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;49E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;31E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;65E;E;D;K;10Line truncated
@@ -1 +1 @@
-280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;1;0E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;20E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;21E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;22E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;18E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;23E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;24E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;25E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;26E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;26E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;2;27E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;28E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;29E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;30E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;30E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;31E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;32E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;32E;E;D;K;10;$classnameS;11;CPTextFieldK;8;$classesA;S;11;CPTextFieldS;9;CPControlS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;18E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;25E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;33E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;34E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;18E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;35E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;2;36E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;37E;K;11;$aalignmentD;K;6;CP$UIDd;2;38E;K;17;$aline-break-modeD;K;6;CP$UIDd;2;38E;K;6;$afontD;K;6;CP$UIDd;2;40E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;30E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;30E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;31E;K;35;CPControlSendsActionOnEndEditingKeyD;K;6;CP$UIDd;2;41E;K;17;CPControlValueKeyD;K;6;CP$UIDd;2;42E;K;24;CPControlSendActionOnKeyD;K;6;CP$UIDd;2;43E;K;23;CPControlControlSizeKeyD;K;6;CP$UIDd;2;25E;K;24;CPTextFieldIsEditableKeyD;K;6;CP$UIDd;2;31E;K;26;CPTextFieldIsSelectableKeyD;K;6;CP$UIDd;2;31E;K;29;CPTextFieldDrawsBackgroundKeyD;K;6;CP$UIDd;2;31E;K;29;CPTextFieldBackgroundColorKeyD;K;6;CP$UIDd;2;45E;K;27;CPTextFieldLineBreakModeKeyD;K;6;CP$UIDd;2;38E;K;23;CPTextFieldAlignmentKeyD;K;6;CP$UIDd;2;38E;K;31;CPTextFieldPlaceholderStringKeyD;K;6;CP$UIDd;1;0E;K;29;CPTextFieldUsesSingleLineModeD;K;6;CP$UIDd;2;31E;K;16;CPTextFieldWrapsD;K;6;CP$UIDd;2;31E;K;18;CPTextFieldScrollsD;K;6;CP$UIDd;2;41E;E;S;16;CPViewControllerD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;4;viewS;13;CPApplicationd;1;0S;20;{{0, 0}, {406, 263}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;20E;E;E;d;2;18S;6;normalS;6;{1, 1}F;S;6;CPViewS;22;{{93, 118}, {220, 22}}S;19;{{0, 0}, {220, 22}}d;2;36S;9;textfieldS;26;bezeled+controlSizeRegulard;1;2D;K;10;$classnameS;6;CPFontK;8;$classesA;S;6;CPFontS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;39E;K;13;CPFontNameKeyD;K;6;CP$UIDd;2;46E;K;13;CPFontSizeKeyD;K;6;CP$UIDd;2;47E;K;15;CPFontIsBoldKeyD;K;6;CP$UIDd;2;31E;K;17;CPFontIsItalicKeyD;K;6;CP$UIDd;2;31E;K;17;CPFontIsSystemKeyD;K;6;CP$UIDd;2;31E;E;T;SLine truncated
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;26E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;27E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;28E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;18E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;29E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;30E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;31E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;32E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;32E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;2;33E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;34E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;35E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;36E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;36E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;37E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6;CP$UIDd;2;38E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;39E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;39E;E;D;K;10;$classnameS;5;CPBoxK;8;$classesA;S;5;CPBoxS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;18E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;31E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;32E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;32E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;2;40E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;18E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;41E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;2;42E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;35E;K;16;$acontent-marginD;K;6;CP$UIDd;2;44E;K;15;$acorner-radiusD;K;6;CP$UIDd;2;45E;K;14;$aborder-widthD;K;6;CP$UIDd;2;31E;K;18;$abackground-colorD;K;6;CP$UIDd;2;47E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;36E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;36E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;37E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6;CP$UIDd;2;48E;K;12;CPBoxTypeKeyD;K;6;CP$UIDd;2;45E;K;18;CPBoxBorderTypeKeyD;K;6;CP$UIDd;2;49E;K;10;CPBoxTitleD;K;6;CP$UIDd;2;50E;K;18;CPBoxTitlePositionD;K;6;CP$UIDd;2;31E;K;14;CPBoxTitleViewD;K;6;CP$UIDd;1;0E;K;16;CPBoxContentViewD;K;6;CP$UIDd;1;0E;E;D;K;10;$classnameS;6;CPViewK;8;$classesA;S;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;21E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;2;20E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;31E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;51E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;52E;K;17;CPViewSubviewsKeyD;K;6;CP$UIDd;2;53E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;2;20E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;41E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;35E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;36E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;36E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;37E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6Line truncated
@@ -1,31 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11191" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11191"/>
+        <capability name="box content view" minToolsVersion="7.0"/>
    </dependencies>
    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
+        <customObject id="-2" userLabel="File's Owner" customClass="TabViewController">
            <connections>
-                <outlet property="view" destination="c22-O7-iKe" id="DCH-07-kCx"/>
+                <outlet property="view" destination="8Ad-lT-bWg" id="p21-3P-cjc"/>
            </connections>
        </customObject>
        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="CPView">
-            <rect key="frame" x="0.0" y="0.0" width="406" height="263"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+        <customView misplaced="YES" id="8Ad-lT-bWg" customClass="CPView">
+            <rect key="frame" x="0.0" y="0.0" width="279" height="203"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
            <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FdY-tR-zTk">
-                    <rect key="frame" x="97" y="120" width="212" height="22"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="center" title="CPViewController TabViewItem" id="z8j-pD-CWg">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </textFieldCell>
-                </textField>
+                <box misplaced="YES" boxType="custom" cornerRadius="4" title="Box" titlePosition="noTitle" id="9We-aw-hQG">
+                    <rect key="frame" x="0.0" y="0.0" width="279" height="203"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <view key="contentView" id="agn-Mc-GSl">
+                        <rect key="frame" x="1" y="1" width="277" height="201"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" id="Pte-FL-dac">
+                                <rect key="frame" x="18" y="92" width="241" height="17"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="This view was loaded asynchronously" id="gqq-al-SMS">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                        </subviews>
+                    </view>
+                    <color key="fillColor" red="0.28570679530201343" green="0.55335046140939592" blue="0.72320679530201337" alpha="1" colorSpace="calibratedRGB"/>
+                </box>
            </subviews>
-            <point key="canvasLocation" x="376" y="412.5"/>
+            <point key="canvasLocation" x="185.5" y="313.5"/>
        </customView>
+        <collectionViewItem nibName="CollectionViewItem" id="fGB-7s-LKj"/>
    </objects>
 </document>
@@ -0,0 +1,13 @@
+@implementation TabViewController : CPViewController
+{
+}
+
+- (void)viewDidAppear
+{
+    CPLog.debug(_cmd);
+    var view = [self view];
+
+    [view setFrameSize:[[view superview] frameSize]];
+}
+
+@end
@@ -31,8 +31,6 @@
 		6841F2461AF98CE600CFE60E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6841F2451AF98CE600CFE60E /* Images.xcassets */; };
 		6841F26C1AF98DDD00CFE60E /* mod_pbxproj.py in Resources */ = {isa = PBXBuildFile; fileRef = 6841F2691AF98DDD00CFE60E /* mod_pbxproj.py */; };
 		6841F26E1AF98DDD00CFE60E /* pbxprojModifier.py in Resources */ = {isa = PBXBuildFile; fileRef = 6841F26B1AF98DDD00CFE60E /* pbxprojModifier.py */; };
-		6841F27C1AF990C300CFE60E /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6841F27A1AF990C300CFE60E /* Debug.xcconfig */; };
-		6841F27D1AF990C300CFE60E /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6841F27B1AF990C300CFE60E /* Release.xcconfig */; };
 		6841F2A51AF9932300CFE60E /* project.pbxproj in Resources */ = {isa = PBXBuildFile; fileRef = 6841F28A1AF9932300CFE60E /* project.pbxproj */; };
 		6841F2B71AFA83D500CFE60E /* XCCUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 6841F2B61AFA83D500CFE60E /* XCCUserDefaults.m */; };
 		6841F2BF1AFA965300CFE60E /* XCCTaskLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = 6841F2BE1AFA965300CFE60E /* XCCTaskLauncher.m */; };
@@ -324,7 +322,7 @@
 		6841F2331AF98CE600CFE60E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "cappuccino-project";
 				TargetAttributes = {
 					6841F23A1AF98CE600CFE60E = {
@@ -364,10 +362,8 @@
 				021B94671B20D1F800F12DDA /* OperationsView.xib in Resources */,
 				021B94711B20E31F00F12DDA /* SettingsView.xib in Resources */,
 				0258004B1B1E67090000EB7D /* supawhich in Resources */,
-				6841F27C1AF990C300CFE60E /* Debug.xcconfig in Resources */,
 				6841F26E1AF98DDD00CFE60E /* pbxprojModifier.py in Resources */,
 				6841F2A51AF9932300CFE60E /* project.pbxproj in Resources */,
-				6841F27D1AF990C300CFE60E /* Release.xcconfig in Resources */,
 				0257A65B1B3A2B0000015C1F /* MainMenu.xib in Resources */,
 				6841F26C1AF98DDD00CFE60E /* mod_pbxproj.py in Resources */,
 				021B94691B20D6FC00F12DDA /* ErrorsView.xib in Resources */,
@@ -437,8 +433,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -447,6 +445,7 @@
 				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = /;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -462,7 +461,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -483,8 +482,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -502,7 +503,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 			};
@@ -518,6 +519,7 @@
 				INFOPLIST_FILE = XcodeCapp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -532,6 +534,7 @@
 				INFOPLIST_FILE = XcodeCapp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -32,4 +32,4 @@
 - (IBAction)openAbout:(id)aSender;
 - (IBAction)openPreferences:(id)aSender;

-@end
+@end
				`@@ -0,0 +1 @@`
				280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;80E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;82E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;103E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;107E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;109E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;D;K;6;CP$UIDd;3;157E;D;K;6;CP$UIDd;3;158E;D;K;6;CP$UIDd;3;159E;D;K;6;CP$UIDd;3;160E;D;K;6;CP$UIDd;3;161E;D;K;6;CP$UIDd;3;162E;D;K;6;CP$UIDd;3;163E;D;K;6;CP$UIDd;3;164E;D;K;6;CP$UIDd;3;165E;D;K;6;CP$UIDd;3;166E;D;K;6;CP$UIDd;3;167E;D;K;6;CP$UIDd;3;168E;D;K;6;CP$UIDd;3;169E;D;K;6;CP$UIDd;3;170E;D;K;6;CP$UIDd;3;171E;D;K;6;CP$UIDd;3;172E;D;K;6;CP$UIDd;3;173E;D;K;6;CP$UIDd;3;174E;D;K;6;CP$UIDd;3;175E;D;K;6;CP$UIDd;3;176E;D;K;6;CP$UIDd;3;177E;D;K;6;CP$UIDd;3;178E;D;K;6;CP$UIDd;3;179E;D;K;6;CP$UIDd;3;180E;D;K;6;CP$UIDd;3;181E;D;K;6;CP$UIDd;3;182E;D;K;6;CP$UIDd;3;183E;D;K;6;CP$UIDd;3;184E;D;K;6;CP$UIDd;3;185E;D;K;6;CP$UIDd;3;186E;D;K;6;CP$UIDd;3;187E;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;D;K;6;CP$UIDd;3;190E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;192E;D;K;6;CP$UIDd;3;193E;D;K;6;CP$UIDd;3;194E;D;K;6;CP$UIDd;3;195E;D;K;6;CP$UIDd;3;196E;D;K;6;CP$UIDd;3;197E;D;K;6;CP$UIDd;3;198E;D;K;6;CP$UIDd;3;199E;D;K;6;CP$UIDd;3;200E;D;K;6;CP$UIDd;3;201E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;203E;D;K;6;CP$UIDd;3;204E;D;K;6;CP$UIDd;3;205E;D;Line truncated