Merge branch 'master' into coretext

Still needs a lot of work; there are bugs,
performance issues, and missing features.

.gitignore

@@ -9,4 +9,3 @@ WebSite
 *.xcodeproj/*.perspectivev3
 xcuserdata/
 !*.xcodeproj/project.pbxproj
-target

.rvmrc

@@ -1,2 +0,0 @@
-rvm_install_on_use_flag=1
-rvm jruby-head@buildr

AppKit/AppKit.j

@@ -25,6 +25,7 @@
 @import "CPAnimation.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
+@import "CPAttributedString+Additions.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
 @import "CPBrowser.j"
@@ -37,7 +38,6 @@
 @import "CPCibControlConnector.j"
 @import "CPCibLoading.j"
 @import "CPCibOutletConnector.j"
-@import "CPCibRuntimeAttributesConnector.j"
 @import "CPClipView.j"
 @import "CPCollectionView.j"
 @import "CPCollectionViewItem.j"
@@ -84,6 +84,7 @@
 @import "CPSound.j"
 @import "CPSplitView.j"
 @import "CPStepper.j"
+@import "CPString+Additions.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPTabView.j"

AppKit/CPApplication.j

@@ -107,7 +107,7 @@ CPRunContinuesResponse  = -1002;
 
     CPPanel                 _aboutPanel;
 
-    CPArray                 _themeBlends @accessors(property=themeBlends);
+    CPThemeBlend            _themeBlend @accessors(property=themeBlend);
 }
 
 /*!
@@ -141,8 +141,6 @@ CPRunContinuesResponse  = -1002;
         _windows = [];
 
         [_windows addObject:nil];
-
-        _themeBlends = [];
     }
 
     return self;
@@ -340,7 +338,7 @@ CPRunContinuesResponse  = -1002;
     Copyright - Human readable copyright information.
     </pre>
 
-    If you choose not the include any of the above keys, they will default
+    If you choose not the include any of the above keys, they will default 
     to the following respective keys in your info.plist file.
 
     <pre>
@@ -1005,7 +1003,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    Sets the arguments of your application.
+    Sets the arguments of your application. 
     That is, set the slash seperated values of an array as the window location hash.
 
     For example if you pass an array:
@@ -1158,16 +1156,6 @@ CPRunContinuesResponse  = -1002;
                                                       userInfo:nil];
 }
 
-- (CPThemeBlend)themeBlend
-{
-    return (_themeBlends.length > 0 ? _themeBlends[0] : nil);
-}
-
-- (void)setThemeBlend:(CPThemeBlend)aThemeBlend
-{
-    _themeBlends[0] = aThemeBlend;
-}
-
 + (CPString)defaultThemeName
 {
     return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
@@ -1230,14 +1218,15 @@ function CPApplicationMain(args, namedArgs)
     [_CPAppBootstrapper performActions];
 }
 
-var _CPAppBootstrapperActions = nil,
-    _CPAppThemeURLsToLoad = [];
+var _CPAppBootstrapperActions = nil;
 
 @implementation _CPAppBootstrapper : CPObject
+{
+}
 
 + (CPArray)actions
 {
-    return [@selector(bootstrapPlatform), @selector(loadThemes), @selector(loadMainCibFile)];
+    return [@selector(bootstrapPlatform), @selector(loadDefaultTheme), @selector(loadMainCibFile)];
 }
 
 + (void)performActions
@@ -1261,30 +1250,17 @@ var _CPAppBootstrapperActions = nil,
     return [CPPlatform bootstrap];
 }
 
-+ (BOOL)loadThemes
++ (BOOL)loadDefaultTheme
 {
-    _CPAppThemeURLsToLoad.push([CPApplication defaultThemeName]);
+    var defaultThemeName = [CPApplication defaultThemeName],
+        themeURL = nil;
 
-    var auxiliaryThemes = ([[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPAuxiliaryThemes"] || []);
-
-    _CPAppThemeURLsToLoad = _CPAppThemeURLsToLoad.concat(auxiliaryThemes);
-
-    [self loadNextTheme];
-
-    return YES;
-}
-
-+ (BOOL)loadNextTheme
-{
-    var themeName = _CPAppThemeURLsToLoad.shift();
-
-    if (themeName === @"Aristo")
-        themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:themeName + @".blend"];
+    if (defaultThemeName === @"Aristo")
+        themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
     else
-        themeURL = [[CPBundle mainBundle] pathForResource:themeName + @".blend"];
+        themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
 
     var blend = [[CPThemeBlend alloc] initWithContentsOfURL:themeURL];
-
     [blend loadWithDelegate:self];
 
     return YES;
@@ -1292,17 +1268,10 @@ var _CPAppBootstrapperActions = nil,
 
 + (void)blendDidFinishLoading:(CPThemeBlend)aThemeBlend
 {
-    var themeBlends = [CPApp themeBlends];
+    [[CPApplication sharedApplication] setThemeBlend:aThemeBlend];
+    [CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
 
-    [themeBlends addObject:aThemeBlend];
-
-    if ([themeBlends count] === 1)
-        [CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
-
-    if (_CPAppThemeURLsToLoad.length === 0)
-        [self performActions];
-    else
-        [self loadNextTheme];
+    [self performActions];
 }
 
 + (BOOL)loadMainCibFile

AppKit/CPAttributedString+Additions.j

@@ -0,0 +1,62 @@
+/*
+ * CPAttributedString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+    AppKit adds two methods to the CPAttributedString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPString.
+*/
+@implementation CPAttributedString (AppKitAdditions)
+/*!
+    Draws a string in the current graphics context.
+    This method and draws the reciver on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        line = CTLineCreateWithAttributedString([self copy]);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTLineDraw(line, context);
+}
+
+/*!
+    Draws a string in the current graphics context.
+
+    @param aRect - The rect for which the string should be drawn into
+*/
+- (void)drawInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        frameSetter = CTFramesetterCreateWithAttributedString([self copy]),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [self length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+@end

AppKit/CPColor.j

@@ -27,7 +27,6 @@
 @import "CPCompatibility.j"
 @import "CPImage.j"
 
-/// @cond IGNORE
 
 var _redComponent        = 0,
     _greenComponent      = 1,
@@ -55,66 +54,6 @@ var cachedBlackColor,
     cachedShadowColor,
     cachedClearColor;
 
-/// @endcond
-
-/*!
-    Orientation to use with \c CPColorPattern for vertical patterns.
-*/
-CPColorPatternIsVertical = YES,
-
-/*!
-    Orientation to use with \c CPColorPattern for horizontal patterns.
-*/
-CPColorPatternIsHorizontal = NO;
-
-/*!
-    To create a simple color with a pattern image:
-
-    <code>CPColorWithImages(name, width, height{, bundle})</code>
-
-    To create a color with a three part pattern image:
-
-    <code>CPColorWithImages(slices{, orientation})</code>
-
-    where slices is an array of three [name, width, height{, bundle}] arrays,
-    and orientation is \c CPColorPatternIsVertical or \ref CPColorPatternIsHorizontal.
-    If orientatation is not passed, it defaults to \ref CPColorPatternIsHorizontal.
-
-    To create a color with a nine part pattern image:
-
-    <code>CPColorWithImages(slices);</code>
-
-    where slices is an array of nine [name, width, height{, bundle}] arrays.
-*/
-function CPColorWithImages()
-{
-    if (arguments.length < 3)
-    {
-        var slices = arguments[0],
-            imageSlices = [];
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var slice = slices[i];
-
-            imageSlices.push(slice ? CPImageInBundle(slice[0], CGSizeMake(slice[1], slice[2]), slice[3]) : nil);
-        }
-
-        if (imageSlices.length === 3)
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1] || CPColorPatternIsHorizontal]];
-        else
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-    }
-    else if (arguments.length === 3 || arguments.length === 4)
-    {
-        return [CPColor colorWithPatternImage:CPImageInBundle(arguments[0], CGSizeMake(arguments[1], arguments[2]), arguments[3])];
-    }
-    else
-    {
-        return nil;
-    }
-}
-
 /*!
     @ingroup appkit
 
@@ -694,36 +633,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 - (CPString)description
 {
-    var description = [super description],
-        patternImage = [self patternImage];
-
-    if (!patternImage)
-        return description + " " + [self cssString];
-
-    description += " {\n";
-
-    if ([patternImage isThreePartImage] || [patternImage isNinePartImage])
-    {
-        var slices = [patternImage imageSlices];
-
-        if ([patternImage isThreePartImage])
-            description += "    orientation: " + ([patternImage isVertical] ? "vertical" : "horizontal") + ",\n";
-
-        description += "    patternImage (" + slices.length + " part): [\n";
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var imgDescription = [slices[i] description];
-
-            description += imgDescription.replace(/^/mg, "        ") + ",\n";
-        }
-
-        description = description.substr(0, description.length - 2) + "\n    ]\n}";
-    }
-    else
-        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
-
-    return description;
+    return [super description]+" "+[self cssString];
 }
 
 @end
@@ -768,10 +678,8 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-/// @cond IGNORE
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
-/// @endcond
 
 @implementation CPColor (CPCoding)
 
@@ -802,12 +710,13 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 @end
 
 
-/// @cond IGNORE
 var hexCharacters = "0123456789ABCDEF";
 
-/*
-    Used for the CPColor +colorWithHexString: implementation.
-    Returns an array of rgb components.
+/*!
+    Used for the CPColor \c +colorWithHexString: implementation
+    @ignore
+    @class CPColor
+    @return an array of rgb components
 */
 var hexToRGB = function(hex)
 {
@@ -845,5 +754,3 @@ var byteToHex = function(n)
     return hexCharacters.charAt((n - n % 16) / 16) +
            hexCharacters.charAt(n % 16);
 };
-
-/// @endcond

AppKit/CPControl.j

@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
-@import "../Foundation/CPFormatter.j"
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
@@ -85,7 +82,6 @@ var CPControlBlackColor = [CPColor blackColor];
 @implementation CPControl : CPView
 {
     id                  _value;
-    CPFormatter         _formatter @accessors(property=formatter);
 
     // Target-Action Support
     id                  _target;
@@ -225,11 +221,10 @@ var CPControlBlackColor = [CPColor blackColor];
     @param anAction the action to send
     @param anObject the object to which the action will be sent
 */
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [self _reverseSetBinding];
-
-    return [CPApp sendAction:anAction to:anObject from:self];
+    [CPApp sendAction:anAction to:anObject from:self];
 }
 
 - (int)sendActionOn:(int)mask
@@ -507,46 +502,15 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (CPString)stringValue
 {
-    if (_formatter && _value !== undefined && _value !== nil)
-    {
-        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];
-
-        if (formattedValue !== nil && formattedValue !== undefined)
-            return formattedValue;
-    }
-
     return (_value === undefined || _value === nil) ? "" : String(_value);
 }
 
 /*!
     Sets the receiver's string value.
 */
-- (void)setStringValue:(CPString)aString
+- (void)setStringValue:(CPString)anObject
 {
-    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
-    if (aString === nil || aString === undefined)
-    {
-        CPLog.warn("nil sent to CPControl -setStringValue");
-        return;
-    }
-
-    var value;
-
-    if (_formatter)
-    {
-        value = nil;
-
-        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
-        {
-            // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
-            if (!aString || [_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;  // Means the value is invalid
-        }
-    }
-    else
-        value = aString;
-
-    [self setObjectValue:value];
+    [self setObjectValue:anObject];
 }
 
 - (void)takeDoubleValueFrom:(id)sender
@@ -562,18 +526,21 @@ var CPControlBlackColor = [CPColor blackColor];
         [self setFloatValue:[sender floatValue]];
 }
 
+
 - (void)takeIntegerValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(integerValue)])
         [self setIntegerValue:[sender integerValue]];
 }
 
+
 - (void)takeIntValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(intValue)])
         [self setIntValue:[sender intValue]];
 }
 
+
 - (void)takeObjectValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(objectValue)])
@@ -915,7 +882,7 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
     if (_target !== nil)
         [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];
 
-    if (_action !== nil)
+    if (_action !== NULL)
         [aCoder encodeObject:_action forKey:CPControlActionKey];
 
     [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];

AppKit/CPEvent.j

@@ -571,28 +571,29 @@ var _CPEventPeriodicEventPeriod         = 0,
     if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
         return YES;
 
-    // Cocoa does not consider space, backspace, or escape a key equivalent
-    // if the first responder is a text field (presumably a subclass of NSText).
-    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
-
     for (var i = 0; i < characterCount; i++)
     {
-        var c = _characters.charAt(i);
-
-        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-            c === CPEnterCharacter ||
-            c === CPNewlineCharacter ||
-            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey ||
-            (!firstResponderIsText &&
-                (c === CPSpaceFunctionKey ||
-                 c === CPDeleteCharacter ||
-                 c === CPBackspaceCharacter)))
+        switch (_characters.charAt(i))
         {
-            return YES;
+            case CPBackspaceCharacter:
+            case CPDeleteCharacter:
+            case CPDeleteFunctionKey:
+            case CPTabCharacter:
+            case CPCarriageReturnCharacter:
+            case CPNewlineCharacter:
+            case CPSpaceFunctionKey:
+            case CPEscapeFunctionKey:
+            case CPPageUpFunctionKey:
+            case CPPageDownFunctionKey:
+            case CPLeftArrowFunctionKey:
+            case CPUpArrowFunctionKey:
+            case CPRightArrowFunctionKey:
+            case CPDownArrowFunctionKey:
+            case CPEndFunctionKey:
+            case CPHomeFunctionKey:
+                return YES;
         }
     }
-
     // FIXME: More cases?
     return NO;
 }
@@ -650,3 +651,4 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie
 
     return aNativeEvent;
 }
+

AppKit/CPImage.j

@@ -44,8 +44,7 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
 
 var imagesForNames = { },
-    AppKitImageForNames = { },
-    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
+    AppKitImageForNames = { };
 
 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
@@ -325,24 +324,6 @@ function CPAppKitImage(aFilename, aSize)
     return NO;
 }
 
-- (CPString)description
-{
-    var filename = [self filename],
-        size = [self size];
-
-    if (filename.indexOf("data:") === 0)
-    {
-        var index = filename.indexOf(",");
-
-        if (index > 0)
-            filename = [CPString stringWithFormat:@"%s,%s...%s", filename.substr(0, index), filename.substr(index + 1, 10), filename.substr(filename.length - 10)];
-        else
-            filename = "data:<unknown type>";
-    }
-
-    return [CPString stringWithFormat:ImageDescriptionFormat, [super description], filename, size.width, size.height];
-}
-
 /* @ignore */
 - (void)_derefFromImage
 {

AppKit/CPLevelIndicator.j

@@ -149,9 +149,9 @@ var _CPLevelIndicatorBezelColor = nil,
     var filledColor = _CPLevelIndicatorSegmentNormalColor,
         value = [self doubleValue];
 
-    if (value <= _criticalValue)
+    if (value < _criticalValue)
         filledColor = _CPLevelIndicatorSegmentCriticalColor;
-    else if (value <= _warningValue)
+    else if (value < _warningValue)
         filledColor = _CPLevelIndicatorSegmentWarningColor;
 
     for (var i = 0; i < segmentCount; i++)

AppKit/CPMenu/CPMenu.j

@@ -711,7 +711,10 @@ var _CPMenuBarVisible               = NO,
     if (aView && !theWindow)
         throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";
 
-    [self _menuWillOpen];
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
 
     // Convert location to global coordinates if not already in them.
     if (aView)
@@ -799,7 +802,10 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    [aMenu _menuWillOpen];
+    var delegate = [aMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:aMenu];
 
     if (!aFont)
         aFont = [CPFont systemFontOfSize:12.0];
@@ -869,15 +875,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    if (_highlightedIndex < 0)
-        return nil;
-
-    var highlightedItem = _items[_highlightedIndex];
-
-    if ([highlightedItem isSeparatorItem])
-        return nil;
-
-    return highlightedItem;
+    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
 }
 
 // Managing the Delegate
@@ -892,22 +890,6 @@ var _CPMenuBarVisible               = NO,
     return _delegate;
 }
 
-- (void)_menuWillOpen
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:self];
-}
-
-- (void)_menuDidClose
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:self];
-}
-
 // Handling Tracking
 /*!
     Cancels tracking.

AppKit/CPMenu/_CPMenuManager.j

@@ -11,7 +11,6 @@ var STICKY_TIME_INTERVAL            = 500,
 @implementation _CPMenuManager: CPObject
 {
     CPTimeInterval      _startTime;
-    BOOL                _hasMouseGoneUpAfterStartedTracking;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
 
@@ -88,8 +87,6 @@ var STICKY_TIME_INTERVAL            = 500,
             return [self trackMenuBarButtonEvent:anEvent];
     }
 
-    _hasMouseGoneUpAfterStartedTracking = NO;
-
     [self trackEvent:anEvent];
 }
 
@@ -224,13 +221,8 @@ var STICKY_TIME_INTERVAL            = 500,
                     [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
             }
         }
-        else if (type === CPLeftMouseUp)
-        {
-            if (_hasMouseGoneUpAfterStartedTracking)
-                [trackingMenu cancelTracking];
-            else
-                _hasMouseGoneUpAfterStartedTracking = YES;
-        }
+        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] * 5)))
+            [trackingMenu cancelTracking];
     }
 
     // Prevent previous selected menu items from opening by stopping the timer if a
@@ -314,7 +306,11 @@ var STICKY_TIME_INTERVAL            = 500,
 
     // Hide all submenus.
     [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-    [trackingMenu _menuDidClose];
+
+    var delegate = [trackingMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:trackingMenu];
 
     if (_trackingCallback)
         _trackingCallback([self trackingMenuContainer], trackingMenu);
@@ -383,8 +379,6 @@ var STICKY_TIME_INTERVAL            = 500,
     var count = _menuContainerStack.length,
         index = count;
 
-    [newMenu _menuWillOpen];
-
     // Hide all menus up to the base menu...
     while (index--)
     {
@@ -404,8 +398,6 @@ var STICKY_TIME_INTERVAL            = 500,
 
         [_CPMenuWindow poolMenuWindow:menuContainer];
         [_menuContainerStack removeObjectAtIndex:index];
-
-        [menu _menuDidClose];
     }
 
     if (!newMenu)

AppKit/CPMenuItem/CPMenuItem.j

@@ -496,7 +496,6 @@ CPOffState
     if (_submenu)
     {
         [_submenu setSupermenu:_menu];
-        [_submenu setTitle:[self title]]
 
         [self setTarget:_menu];
         [self setAction:@selector(submenuAction:)];

AppKit/CPOutlineView.j

@@ -1458,44 +1458,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                     userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
-
-- (void)keyDown:(CPEvent)anEvent
-{
-    var character = [anEvent charactersIgnoringModifiers],
-        modifierFlags = [anEvent modifierFlags];
-
-    // Check for the key events manually, as opposed to waiting for CPWindow to sent the actual action message
-    // in _processKeyboardUIKey:, because we might not want to handle the arrow events.
-
-    if (character !== CPRightArrowFunctionKey && character !== CPLeftArrowFunctionKey) 
-        return [super keyDown:anEvent];
-
-    var rows = [self selectedRowIndexes],
-        indexes = [],
-        items = [];
-
-    [rows getIndexes:indexes maxCount:-1 inIndexRange:nil];
-
-    var i = 0,
-        c = [indexes count];
-
-    for (; i < c; i++)
-        items.push([self itemAtRow:indexes[i]]);
-   
-
-    if (character === CPRightArrowFunctionKey)
-    {
-        for (var i = 0; i < c; i++)
-            [self expandItem:items[i]];
-    }
-    else if (character === CPLeftArrowFunctionKey)
-    {
-        for (var i = 0; i < c; i++)
-            [self collapseItem:items[i]]; 
-    }
-
-    [super keyDown:anEvent];
-}
 @end
 
 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...

AppKit/CPString+Additions.j

@@ -0,0 +1,72 @@
+/*
+ * CPString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+    AppKit adds two methods to the CPString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPAttributedString.
+    The two drawing methods draw a string object with a single set of attributes that apply to the entire string.
+    To draw a string with multiple attributes, such as multiple text fonts, you must use an attributed string.
+*/
+@implementation CPString (AppKitAdditions)
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        run = _CTRunCreate([self copy], attributes);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTRunDraw(run, context, nil);
+}
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it within the given rect.
+
+    @param aRect - The rect for which the string should be drawn into
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawInRect:(CGRect)aRect withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        string = [[CPAttributedString alloc] initWithString:self attributes:attributes];
+        frameSetter = CTFramesetterCreateWithAttributedString(string),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [string length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+
+@end

AppKit/CPTableColumn.j

@@ -332,18 +332,18 @@ CPTableColumnUserResizingMask   = 1 << 1;
     individual cell that is shown. As a result, changes made after calling this method won't be reflected.
 
     Example:
-    @code
-    [tableColumn setDataView:someView]; // snapshot taken
-    [[tableColumn dataView] setSomething:x]; //won't work
-    @endcode
+        @code
+        [tableColumn setDataView:someView]; // snapshot taken
+        [[tableColumn dataView] setSomething:x]; //won't work
+        @endcode
 
     This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
-    @code
-    [someView setSomething:x];
-    [tableColumn setDataView:someView];
-    @endcode
+        @code
+        [someView setSomething:x];
+        [tableColumn setDataView:someView];
+        @endcode
 
-    @note You should implement CPKeyedArchiving otherwise you might see unexpected results.
+    @note you should implement CPKeyedArchiving otherwise you might see unexpected results.
     This is done by adding the following methods to your class:
     @endnote
 
@@ -380,7 +380,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     }
     @endcode
 
-    @section Theming
+    @section Themeing
 
     When you set a dataview and it is added to the tableview the theme state will be set to \c CPThemeStateTableDataView
     When the dataview becomes selected the theme state will be set to \c CPThemeStateSelectedDataView.

AppKit/CPTableView.j

@@ -323,7 +323,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
     _tableViewFlags = 0;
     _lastSelectedRow = -1;
-    _clickedRow = -1;
 
     _selectedColumnIndexes = [CPIndexSet indexSet];
     _selectedRowIndexes = [CPIndexSet indexSet];
@@ -2771,7 +2770,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
 {
-    return [rowIndexes count] > 0 && [self numberOfRows] > 0;
+    return YES;
 }
 
 /*!
@@ -4610,7 +4609,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
             }
             _wasSelectionBroken = true;
         }
-        else if (_wasSelectionBroken && ((shouldGoUpward && i !== [selectedIndexes firstIndex]) || (!shouldGoUpward && i !== [selectedIndexes lastIndex])))
+        else if (_wasSelectionBroken && ((shouldGoUpward && i !== [selectedIndexes firstIndex]) || (!shouldGoUpward && i !== [selectedIndexes lastindex])))
         {
             shouldGoUpward ? i = [selectedIndexes firstIndex] - 1 : i = [selectedIndexes lastIndex];
             _wasSelectionBroken = false;

AppKit/CPTextField.j

@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
@@ -85,11 +83,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     CPColor                 _textFieldBackgroundColor;
 
-    CPString                _placeholderString;
-    CPString                _stringValue;
+    id                      _placeholderString;
 
     id                      _delegate;
 
+    CPString                _textDidChangeValue;
+
     // NS-style Display Properties
     CPTextFieldBezelStyle   _bezelStyle;
     BOOL                    _isBordered;
@@ -482,17 +481,17 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self setNeedsLayout];
 
     _isEditing = NO;
-    _stringValue = [self stringValue];
 
 #if PLATFORM(DOM)
 
-    var element = [self _inputElement],
+    var string = [self stringValue],
+        element = [self _inputElement],
         font = [self currentValueForThemeAttribute:@"font"];
 
     // generate the font metric
     [font _getMetrics];
 
-    element.value = _stringValue;
+    element.value = string;
     element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
     element.style.font = [font cssString];
     element.style.zIndex = 1000;
@@ -549,6 +548,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldInputOwner = self;
     }, 0.0);
 
+    element.value = [self stringValue];
+
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 
     CPTextFieldInputIsActive = YES;
@@ -571,33 +572,17 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 {
     [self unsetThemeState:CPThemeStateEditing];
 
-#if PLATFORM(DOM)
-
-    var element = [self _inputElement],
-        error = @"";
-
-    // If there is a formatter, always give it a chance to reject the resignation,
-    // even if the value has not changed.
-    if ([self _valueIsValid:element.value] === NO)
-    {
-        [self setThemeState:CPThemeStateEditing];
-        element.focus();
-        return NO;
-    }
-
-#endif
-
-    // Cache the formatted string
-    _stringValue = [self stringValue];
-
-    _willBecomeFirstResponderByClick = NO;
-
     [self _updatePlaceholderState];
 
     [self setNeedsLayout];
 
 #if PLATFORM(DOM)
 
+    var element = [self _inputElement];
+
+    if ([self stringValue] !== element.value)
+        [self _setStringValue:element.value];
+
     CPTextFieldInputResigning = YES;
 
     if (CPTextFieldInputIsActive)
@@ -625,7 +610,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 #endif
 
-    // post CPControlTextDidEndEditingNotification
+    //post CPControlTextDidEndEditingNotification
     if (_isEditing)
     {
         _isEditing = NO;
@@ -640,28 +625,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return YES;
 }
 
-- (BOOL)_valueIsValid:(CPString)aValue
-{
-#if PLATFORM(DOM)
-
-    var error = @"";
-
-    if ([self _setStringValue:aValue isNewValue:NO errorDescription:AT_REF(error)] === NO)
-    {
-        var acceptInvalidValue = NO;
-
-        if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
-            acceptInvalidValue = [_delegate control:self didFailToFormatString:[self _inputElement] errorDescription:error];
-
-        if (acceptInvalidValue === NO)
-            return NO;
-    }
-
-#endif
-
-    return YES;
-}
-
 /*!
     Text fields require panels to become key window, so this returns \c YES.
 */
@@ -722,14 +685,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)keyUp:(CPEvent)anEvent
 {
-#if PLATFORM(DOM)
+    var oldValue = [self stringValue];
+    [self _setStringValue:[self _inputElement].value];
 
-    var newValue = [self _inputElement].value;
-
-    if (newValue !== _stringValue)
+    if (oldValue !== [self stringValue])
     {
-        [self _setStringValue:newValue];
-
         if (!_isEditing)
         {
             _isEditing = YES;
@@ -739,13 +699,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
 
-#endif
-
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)keyDown:(CPEvent)anEvent
 {
+    if ([anEvent _couldBeKeyEquivalent] && [self performKeyEquivalent:anEvent])
+        return;
+
     // CPTextField uses an HTML input element to take the input so we need to
     // propagate the dom event so the element is updated. This has to be done
     // before interpretKeyEvents: though so individual commands have a chance
@@ -774,46 +735,26 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)insertNewline:(id)sender
 {
-    if ([self _valueIsValid:_stringValue])
+    if (_isEditing)
     {
-        if (![self action] || [self sendAction:[self action] to:[self target]])
-        {
-            if (_isEditing)
-            {
-                _isEditing = NO;
-                [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-            }
-
-            [self selectAll:nil];
-        }
+        _isEditing = NO;
+        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
     }
 
+    [self sendAction:[self action] to:[self target]];
+    [self selectText:nil];
+
     [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
 }
 
 - (void)insertNewlineIgnoringFieldEditor:(id)sender
 {
-    [self _insertCharacterIgnoringFieldEditor:CPNewlineCharacter];
-}
+    var oldValue = [self stringValue];
 
-- (void)insertTabIgnoringFieldEditor:(id)sender
-{
-    [self _insertCharacterIgnoringFieldEditor:CPTabCharacter];
-}
+    [self _inputElement].value += CPNewlineCharacter;
+    [self _setStringValue:[self _inputElement].value];
 
-- (void)_insertCharacterIgnoringFieldEditor:(CPString)aCharacter
-{
-#if PLATFORM(DOM)
-
-    var oldValue = _stringValue,
-        range = [self selectedRange],
-        element = [self _inputElement];
-
-    element.value = [element.value stringByReplacingCharactersInRange:[self selectedRange] withString:aCharacter];
-    [self _setStringValue:element.value];
-
-    // NOTE: _stringValue is now the current input element value
-    if (oldValue !== _stringValue)
+    if (oldValue !== [self stringValue])
     {
         if (!_isEditing)
         {
@@ -823,8 +764,25 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
+}
 
-#endif
+- (void)insertTabIgnoringFieldEditor:(id)sender
+{
+    var oldValue = [self stringValue];
+
+    [self _inputElement].value += CPTabCharacter;
+    [self _setStringValue:[self _inputElement].value];
+
+    if (oldValue !== [self stringValue])
+    {
+        if (!_isEditing)
+        {
+            _isEditing = YES;
+            [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+        }
+
+        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
+    }
 }
 
 - (void)textDidBlur:(CPNotification)note
@@ -855,8 +813,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [super textDidChange:note];
 }
 
+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [self _reverseSetBinding];
+
+    [CPApp sendAction:anAction to:anObject from:self];
+}
+
 /*!
-    Returns the string in the text field.
+    Returns the string the text field.
 */
 - (id)objectValue
 {
@@ -865,84 +830,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*
     @ignore
-    Sets the internal string value without updating the value in the input element.
-    This should only be invoked when the underlying text element's value has changed.
+    Sets the internal string value without updating the value in the input element
 */
-- (BOOL)_setStringValue:(CPString)aValue
+- (void)_setStringValue:(id)aValue
 {
-    return [self _setStringValue:aValue isNewValue:YES errorDescription:nil];
-}
-
-/*
-    @ignore
-    Sets the internal string value without updating the value in the input element.
-    If there is a formatter and formatting fails, returns NO. Otherwise returns YES.
-*/
-- (BOOL)_setStringValue:(CPString)aValue isNewValue:(BOOL)isNewValue errorDescription:(CPStringRef)anError
-{
-    _stringValue = aValue;
-
-    var objectValue = aValue,
-        formatter = [self formatter],
-        result = YES;
-
-    if (formatter)
-    {
-        var object = nil;
-
-        if ([formatter getObjectValue:AT_REF(object) forString:aValue errorDescription:anError])
-            objectValue = object;
-        else
-        {
-            objectValue = undefined;  // Mark the value as invalid
-            result = NO;
-        }
-
-        isNewValue |= objectValue !== [super objectValue];
-    }
-
-    if (isNewValue)
-    {
-        [self willChangeValueForKey:@"objectValue"];
-        [super setObjectValue:objectValue];
-        [self _updatePlaceholderState];
-        [self didChangeValueForKey:@"objectValue"];
-    }
-
-    return result;
+    [self willChangeValueForKey:@"objectValue"];
+    [super setObjectValue:String(aValue)];
+    [self _updatePlaceholderState];
+    [self didChangeValueForKey:@"objectValue"];
 }
 
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
 
-    var formatter = [self formatter];
-
-    if (formatter)
-    {
-        // If there is a formatter, make sure the object value can be formatted successfully
-        var formattedString = [self hasThemeState:CPThemeStateEditing] ? [formatter editingStringForObjectValue:aValue] : [formatter stringForObjectValue:aValue];
-
-        if (formattedString === nil)
-        {
-            var value = nil;
-
-            // Formatting failed, get an "empty" object by formatting an empty string.
-            // If that fails, the value is undefined.
-            if ([formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;
-
-            [super setObjectValue:value];
-        }
-    }
-
-    _stringValue = [self stringValue];
-
 #if PLATFORM(DOM)
 
     if (CPTextFieldInputOwner === self || [[self window] firstResponder] === self)
-        [self _inputElement].value = _stringValue;
-
+        [self _inputElement].value = aValue;
 #endif
 
     [self _updatePlaceholderState];
@@ -950,7 +855,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)_updatePlaceholderState
 {
-    if ((!_stringValue || _stringValue.length === 0) && ![self hasThemeState:CPThemeStateEditing])
+    var string = [self stringValue];
+
+    if ((!string || string.length === 0) && ![self hasThemeState:CPThemeStateEditing])
         [self setThemeState:CPTextFieldStatePlaceholder];
     else
         [self unsetThemeState:CPTextFieldStatePlaceholder];
@@ -1016,7 +923,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         minSize = [self currentValueForThemeAttribute:@"min-size"],
         maxSize = [self currentValueForThemeAttribute:@"max-size"],
         lineBreakMode = [self lineBreakMode],
-        text = (_stringValue || @" "),
+        text = ([self stringValue] || @" "),
         textSize = _CGSizeMakeCopy(frameSize),
         font = [self currentValueForThemeAttribute:@"font"];
 
@@ -1087,7 +994,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             return;
 
         var pasteboard = [CPPasteboard generalPasteboard],
-            stringForPasting = [_stringValue substringWithRange:selectedRange];
+            stringValue = [self stringValue],
+            stringForPasting = [stringValue substringWithRange:selectedRange];
 
         [pasteboard declareTypes:[CPStringPboardType] owner:nil];
         [pasteboard setString:stringForPasting forType:CPStringPboardType];
@@ -1117,8 +1025,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self deleteBackward:sender];
 
         var selectedRange = [self selectedRange],
+            stringValue = [self stringValue],
             pasteString = [pasteboard stringForType:CPStringPboardType],
-            newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
+            newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
 
         [self setStringValue:newValue];
         [self setSelectedRange:CPMakeRange(selectedRange.location + pasteString.length, 0)];
@@ -1132,8 +1041,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if ([[self window] firstResponder] !== self)
         return CPMakeRange(0, 0);
 
-#if PLATFORM(DOM)
-
     // we wrap this in try catch because firefox will throw an exception in certain instances
     try
     {
@@ -1160,8 +1067,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         // fall through to the return
     }
 
-#endif
-
     return CPMakeRange(0, 0);
 }
 
@@ -1170,8 +1075,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if (![[self window] firstResponder] === self)
         return;
 
-#if PLATFORM(DOM)
-
     var inputElement = [self _inputElement];
 
     try
@@ -1200,8 +1103,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     catch (e)
     {
     }
-
-#endif
 }
 
 - (void)selectAll:(id)sender
@@ -1219,7 +1120,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     selectedRange.location += 1;
     selectedRange.length -= 1;
 
-    var newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
+    var stringValue = [self stringValue],
+        newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
 
     [self setStringValue:newValue];
     [self setSelectedRange:CPMakeRange(selectedRange.location, 0)];
@@ -1372,7 +1274,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             string = [self placeholderString];
         else
         {
-            string = _stringValue;
+            string = [self stringValue];
 
             if ([self isSecure])
                 string = secureStringForString(string);

AppKit/CPTheme.j

@@ -25,10 +25,9 @@
 @import <Foundation/CPKeyedUnarchiver.j>
 
 
-var CPThemesByName              = { },
-    CPThemeNamesByInheritance   = [],
-    CPThemeDefaultTheme         = nil,
-    CPThemeDefaultHudTheme      = nil;
+var CPThemesByName          = { },
+    CPThemeDefaultTheme     = nil,
+    CPThemeDefaultHudTheme  = nil;
 
 
 /*!
@@ -77,52 +76,6 @@ var CPThemesByName              = { },
     return CPThemesByName[aName];
 }
 
-/*!
-    Returns an array of names of all loaded themes, in the order they were loaded.
-*/
-+ (CPArray)allThemeNames
-{
-    return [CPThemeNamesByInheritance copy];
-}
-
-/*!
-    Returns the closest matching theme for a given view or view class.
-    The matching proceeds as follows:
-
-    - The default theme class name for the class is retrieved.
-    - Starting with the last loaded theme and proceeding towards the default theme,
-      each theme is checked to see if it defines that theme class.
-    - If the theme defines the class name, that theme is returned.
-    - If no themes match, the default theme is returned.
-
-    @param aViewOrClass The view or view class to match with a theme
-    @return             The first matching theme
-*/
-+ (CPTheme)themeForView:(id)aViewOrClass
-{
-    var themeClass = nil;
-
-    if (class_isMetaClass(aViewOrClass.isa))
-        themeClass = [aViewOrClass defaultThemeClass];
-    else
-        themeClass = [aViewOrClass themeClass];
-
-    if (themeClass)
-    {
-        var count = CPThemeNamesByInheritance.length;
-
-        while (count--)
-        {
-            var theme = CPThemesByName[CPThemeNamesByInheritance[count]];
-
-            if ([theme._attributes containsKey:themeClass])
-                return theme;
-        }
-    }
-
-    return CPThemeDefaultTheme;
-}
-
 - (id)initWithName:(CPString)aName
 {
     self = [super init];
@@ -133,9 +86,6 @@ var CPThemesByName              = { },
         _attributes = [CPDictionary dictionary];
 
         CPThemesByName[_name] = self;
-
-        if (![CPThemeNamesByInheritance containsObject:_name])
-            CPThemeNamesByInheritance.push(_name);
     }
 
     return self;
@@ -349,9 +299,6 @@ var CPThemeNameKey          = @"CPThemeNameKey",
         _attributes = [aCoder decodeObjectForKey:CPThemeAttributesKey];
 
         CPThemesByName[_name] = self;
-
-        if (![CPThemeNamesByInheritance containsObject:_name])
-            CPThemeNamesByInheritance.push(_name);
     }
 
     return self;

AppKit/CPView.j

@@ -295,7 +295,7 @@ var CPViewFlags                     = { },
         _DOMImageSizes = [];
 #endif
 
-        _theme = [CPTheme themeForView:self];
+        _theme = [CPTheme defaultTheme];
         _themeState = CPThemeStateNormal;
 
         [self setupViewFlags];
@@ -2543,32 +2543,6 @@ setBoundsOrigin:
     return (_themeAttributes && _themeAttributes[aName] !== undefined);
 }
 
-- (void)registerThemeValues:(CPArray)themeValues
-{
-    for (var i = 0; i < themeValues.length; ++i)
-    {
-        var attributeValueState = themeValues[i],
-            attribute = attributeValueState[0],
-            value = attributeValueState[1],
-            state = attributeValueState[2];
-
-        if (state)
-            [self setValue:value forThemeAttribute:attribute inState:state];
-        else
-            [self setValue:value forThemeAttribute:attribute];
-    }
-}
-
-- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues
-{
-    // Register inherited values first, then override those with the subtheme values.
-    if (inheritedValues)
-        [self registerThemeValues:inheritedValues];
-
-    if (themeValues)
-        [self registerThemeValues:themeValues];
-}
-
 - (CPView)createEphemeralSubviewNamed:(CPString)aViewName
 {
     return nil;
@@ -2721,7 +2695,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 
         [self setupViewFlags];
 
-        _theme = [CPTheme themeForView:self];
+        _theme = [CPTheme defaultTheme];
         _themeClass = [aCoder decodeObjectForKey:CPViewThemeClassKey];
         _themeState = CPThemeState([aCoder decodeIntForKey:CPViewThemeStateKey]);
         _themeAttributes = {};

AppKit/Cib/CPCibRuntimeAttributesConnector.j

@@ -1,64 +0,0 @@
-/*
- * CPCibRuntimeAttributesConnector.j
- * AppKit
- *
- * Created by Aparajita Fishman.
- * Copyright 2011, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPCibConnector.j"
-
-var CPCibRuntimeAttributesConnectorObjectKey   = @"CPCibRuntimeAttributesConnectorObjectKey",
-    CPCibRuntimeAttributesConnectorKeyPathsKey = @"CPCibRuntimeAttributesConnectorKeyPathsKey",
-    CPCibRuntimeAttributesConnectorValuesKey   = @"CPCibRuntimeAttributesConnectorValuesKey";
-
-@implementation CPCibRuntimeAttributesConnector : CPCibConnector
-{
-    id _keyPaths;
-    id _values;
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _source = [aCoder decodeObjectForKey:CPCibRuntimeAttributesConnectorObjectKey];
-        _keyPaths = [aCoder decodeObjectForKey:CPCibRuntimeAttributesConnectorKeyPathsKey];
-        _values = [aCoder decodeObjectForKey:CPCibRuntimeAttributesConnectorValuesKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_source forKey:CPCibRuntimeAttributesConnectorObjectKey];
-    [aCoder encodeObject:_keyPaths forKey:CPCibRuntimeAttributesConnectorKeyPathsKey];
-    [aCoder encodeObject:_values forKey:CPCibRuntimeAttributesConnectorValuesKey];
-}
-
-- (void)establishConnection
-{
-    var count = [_keyPaths count];
-
-    while (count--)
-        [_source setValue:_values[count] forKeyPath:_keyPaths[count]];
-}
-
-@end

AppKit/Cib/_CPCibClassSwapper.j

@@ -61,14 +61,14 @@ var _CPCibClassSwapperClassNameKey          = @"_CPCibClassSwapperClassNameKey",
 
         if (!object)
         {
-            CPLog.error("Unable to find class " + theClassName + " referenced in cib file.");
+            CPLog.error("Unable to find class " + theClassName + " in cib file.");
 
             object = [self allocObjectWithCoder:aCoder className:[aCoder decodeObjectForKey:_CPCibClassSwapperOriginalClassNameKey]];
         }
     }
 
     if (!object)
-        [CPException raise:CPInvalidArgumentException reason:@"Unable to find class " + theClassName + " referenced in cib file."];
+        [CPException raise:CPInvalidArgumentException reason:@"Unable to find class " + theClassName + " in cib file."];
 
     return object;
 }

AppKit/Cib/_CPCibCustomResource.j

@@ -43,11 +43,6 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObject:aSize forKey:@"size"]];
 }
 
-+ (id)imageResourceWithName:(CPString)aResourceName size:(CGSize)aSize bundleClass:(CPString)aBundleClass
-{
-    return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObjects:[aSize, aBundleClass] forKeys:[@"size", @"bundleClass"]]];
-}
-
 - (id)initWithClassName:(CPString)aClassName resourceName:(CPString)aResourceName properties:(CPDictionary)properties
 {
     self = [super init];
@@ -94,18 +89,7 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
             else if (_resourceName == "CPRemoveTemplate")
                 return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
-            var bundleClass = _properties.valueForKey(@"bundleClass"),
-                bundle = nil;
-
-            if (bundleClass)
-            {
-                bundleClass = CPClassFromString(bundleClass);
-
-                if (bundleClass)
-                    bundle = [CPBundle bundleForClass:bundleClass];
-            }
-
-            return [[CPImage alloc] initWithContentsOfFile:[(bundle || [aCoder bundle]) pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
+            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
         }
 
     return self;

AppKit/Cib/_CPCibObjectData.j

@@ -29,7 +29,6 @@
 @import "CPCibControlConnector.j"
 @import "CPCibOutletConnector.j"
 @import "CPCibBindingConnector.j"
-@import "CPCibRuntimeAttributesConnector.j"
 
 
 @implementation _CPCibObjectData : CPObject
@@ -258,29 +257,11 @@ var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey
     _replacementObjects[[_fileOwner UID]] = anOwner;
 
     var index = 0,
-        count = _connections.length,
-        runtimeAttributeConnectors = [],
-        connection = nil;
+        count = _connections.length;
 
     for (; index < count; ++index)
     {
-        connection = _connections[index];
-
-        if ([connection isKindOfClass:[CPCibRuntimeAttributesConnector class]])
-            // Defer runtime attribute connections until after all other connections are made
-            runtimeAttributeConnectors.push(connection);
-        else
-        {
-            [connection replaceObjects:_replacementObjects];
-            [connection establishConnection];
-        }
-    }
-
-    count = runtimeAttributeConnectors.length;
-
-    for (index = 0; index < count; ++index)
-    {
-        connection = runtimeAttributeConnectors[index];
+        var connection = _connections[index];
 
         [connection replaceObjects:_replacementObjects];
         [connection establishConnection];

AppKit/CoreText/CGContextText.j

@@ -0,0 +1,99 @@
+/*
+ * CGContextText.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+kCGTextFill = 0;
+kCGTextStroke = 1;
+kCGTextFillStroke = 2;
+kCGTextInvisible = 3;
+
+function CGContextGetTextMatrix(/* CGContext */ aContext)
+{
+    return aContext._textMatrix;
+}
+
+function CGContextSetTextMatrix(/* CGContext */ aContext, /* CGAffineTransform */ aTransform)
+{
+    aContext._textMatrix = aTransform;
+}
+
+function CGContextGetTextPosition(/* CGContext */ aContext)
+{
+    return aContext._textPosition || _CGPointMakeZero();
+}
+
+function CGContextSetTextPosition(/* CGContext */ aContext, /* float */ x, /* float */ y)
+{
+    aContext._textPosition = CGPointMake(x, y);
+}
+
+function CGContextGetFont(/* CGContext */ aContext)
+{
+    return aContext._CPFont;
+}
+
+function CGContextSelectFont(/* CGContext */ aContext, /* CPFont */ aFont)
+{
+    aContext.font = [aFont cssString];
+    aContext._CPFont = aFont;
+}
+
+function CGContextSetTextDrawingMode(/* CGContext */ aContext, /* CGTextDrawingMode */ aMode)
+{
+    aContext._textDrawingMode = aMode;
+}
+
+function CGContextShowText(/* CGContext */ aContext, /* CPString */ aString)
+{
+    CGContextShowTextAtPoint(aContext, aContext._textPosition.x, aContext._textPosition.y, aString);
+}
+
+function CGContextShowTextAtPoint(/* CGContext */ aContext, /* float */ x, /* float */ y, /* CPString */ aString)
+{
+    aContext.textBaseline = @"middle";
+    aContext.textAlign = @"left";
+    
+    var mode = aContext._textDrawingMode;
+    if (!mode && mode !== 0)
+        mode = kCGTextFill;
+    
+    var width = aContext.measureText(aString).width;
+    
+    if (mode === kCGTextFill || mode === kCGTextFillStroke)
+        aContext.fillText(aString, x, y);
+    if (mode === kCGTextStroke || mode === kCGTextFillStroke)
+        aContext.strokeText(aString, x, y);
+    
+    aContext._textPosition = CGPointMake(x + width, y);
+}
+
+// FIXME: these are hacks that override the default behavior.
+
+function CGContextSetFillColor(/* CGContext */ aContext, /* CPColor */ aColor)
+{
+    aContext.fillStyle = [aColor cssString];
+    aContext._CPColor = aColor;
+}
+
+function CGContextGetFillColor(/* CGContext */ aContext)
+{
+    return aContext._CPColor;
+}

AppKit/CoreText/CTFrame.j

@@ -0,0 +1,192 @@
+/*
+ * CTFrame.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTLine.j"
+
+
+kCTFrameProgressionTopToBottom = 0;
+kCTFrameProgressionRightToLeft = 1;
+
+kCTFrameProgressionAttributeName = @"kCTFrameProgressionAttributeName";
+
+function _CTFrameCreate(aPath, attributes, lines, attributedString)
+{
+    return {
+        path: aPath,
+        attributes: attributes,
+        lines: lines,
+        string: attributedString
+    };
+}
+
+_CTFrameCreate.displayName = @"_CTFrameCreate";
+
+/*!
+    Returns the range of the frame based on the original string
+    FIX ME: This implementation is wrong
+*/
+function CTFrameGetStringRange(/* CTFrame */ aFrame)
+{
+    return CPMakeRange();
+}
+
+CTFrameGetStringRange.displayName = @"CTFrameGetStringRange";
+
+/*!
+    Returns a range object with the visisble characters
+    FIX ME: THis implementation is wrong
+*/
+function CTFrameGetVisibleStringRange(/* CTFrame */ aFrame)
+{
+    return CPMakeRange();
+}
+
+CTFrameGetVisibleStringRange.displayName = @"CTFrameGetVisibleStringRange";
+
+/*!
+    Returns the path for the frame.
+*/
+function CTFrameGetPath(/* CTFrame */ aFrame)
+{
+    return aFrame.path;
+}
+
+CTFrameGetPath.displayName = @"CTFrameGetPath";
+
+/*!
+    Returns a dictionary of attributes for the frame.
+*/
+function CTFrameGetFrameAttributes(/* CTFrame */ aFrame)
+{
+    return aFrame.frameAttributes;
+}
+
+CTFrameGetFrameAttributes.displayName = @"CTFrameGetFrameAttributes";
+
+/*!
+    Returns the array containing CTLines that make up the frame
+*/
+function CTFrameGetLines(/* CTFrame */ aFrame)
+{
+    return aFrame.lines;
+}
+
+CTFrameGetLines.displayName = @"CTFrameGetLines";
+
+/*!
+    Returns an array of CGPoints for the origin of each CTLine in the frame
+*/
+function CTFrameGetLineOrigins(/* CTFrame */ aFrame, /* CPRange */ aRange)
+{
+    var results = [],
+        lines = aRange ? CTFrameGetLinesForRange(aFrame, aRange) : aFrame.lines;
+    
+    for (var i = -1, count = lines.length; ++i < count;)
+        results.push(lines[i].origin);
+    
+    return results;
+}
+
+CTFrameGetLineOrigins.displayName = @"CTFrameGetLineOrigins";
+
+/*!
+    Returns an array of CTLines for a given range.
+    Divergent from Cocoa and expensive.
+*/
+function CTFrameGetLinesForRange(/* CTFrame */ aFrame, /* CPRange */ lhs)
+{
+    var lines = aFrame.lines, results = [];
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var line = lines[i],
+            rhs = CTLineGetStringRange(line);
+        
+        if ((CPMaxRange(lhs) < rhs.location || CPMaxRange(rhs) < lhs.location) && result.length)
+            break;
+        
+        if (lhs.location >= rhs.location && rhs.location <= CPMaxRange(lhs) && CPMaxRange(rhs) > lhs.location)
+            results.push(line);
+    }
+    
+    return results;
+}
+
+CTFrameGetLinesForRange.displayName = @"CTFrameGetLinesForRange";
+
+/*!
+    Returns a CPRange
+    This is divergent from Cocoa. It's a convenience method used in CPTextView.
+*/
+function CTFrameGetRangeForPoint(/* CTFrame */ aFrame, /* CGPoint */ aPoint)
+{
+    var lines = aFrame.lines, y = aPoint.y;
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var line = lines[i],
+            bounds = CTLineGetImageBounds(line),
+            lineY = line._startPosition.y;
+        
+        if (y >= lineY && y < bounds.size.height + lineY)
+        {
+            // FIXME: we seem to be doing stuff like this with some frequency;
+            // Maybe it should be normalized at an earlier point.
+            var index = CTLineGetStringIndexForPosition(line, aPoint),
+                range = CTLineGetStringRange(line);
+            
+            range.location += index;
+            range.length = 0;
+            return range;
+        }
+    }
+}
+
+CTFrameGetRangeForPoint.displayName = @"CTFrameGetRangeForPoint";
+
+/*!
+    Draws the frame to the graphics context.
+*/
+function CTFrameDraw(/* CTFrame */ aFrame, /* CGContext */ aContext)
+{
+    var origin = aFrame.path.start,
+        lines = aFrame.lines;
+    
+    CGContextSetTextPosition(aContext, origin.x, origin.y);
+    
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var line = lines[i],
+            alignment = [line.string attribute:@"alignment" atIndex:0 effectiveRange:CPMakeRange(0, 0)],
+            position = CGContextGetTextPosition(aContext);
+        
+        if (alignment === CPRightTextAlignment)
+            line.origin = CGPointMake((aFrame.path.elements[1].x - origin.x * 2) - CTLineGetTypographicBounds(line).width, position.y);
+        else if (alignment === CPCenterTextAlignment)
+            line.origin = CGPointMake(((aFrame.path.elements[1].x - origin.x) / 2) - CTLineGetTypographicBounds(line).width / 2, position.y);
+        else
+            line.origin = CGPointMake(origin.x, position.y);
+        
+        CGContextSetTextPosition(aContext, line.origin.x, line.origin.y);
+        CTLineDraw(line, aContext);
+    }
+}
+
+CTFrameDraw.displayName = @"CTFrameDraw";

AppKit/CoreText/CTFramesetter.j

@@ -0,0 +1,122 @@
+/*
+ * CTFramesetter.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTFrame.j"
+@import "CTTypesetter.j"
+
+
+/*!
+    Creates a typesetter with a given CPAttributedString
+*/
+function CTFramesetterCreateWithAttributedString(/* CPAttributedString */ aString)
+{
+    return {
+        string: aString,
+        typesetter: CTTypesetterCreateWithAttributedString(aString)
+    };
+}
+
+CTFramesetterCreateWithAttributedString.displayName = @"CTFramesetterCreateWithAttributedString";
+
+/*!
+    Creates a CTFrame with a given typesetter, range, path, and attributes
+*/
+function CTFramesetterCreateFrame(/* CTFramesetter */ aFramesetter, /* CPRange */ aRange, /* CGPath */ aPath, /* CPDictionary */ frameAttributes)
+{
+    if (aFramesetter._cachedFrame && [aFramesetter._cachedAttributes isEqual:frameAttributes])
+        return aFramesetter._cachedFrame;
+    
+    var attributedString = aRange ? [aFramesetter.string attributedSubstringFromRange:aRange] : aFramesetter.string,
+        nonattributedString = [attributedString string],
+        splitLines = nonattributedString.split(/\n|\r/g),
+        lines = [];
+    
+    var index = 0;
+    for (var i = -1, count = splitLines.length; ++i < count;)
+    {
+        var length = splitLines[i].length;
+        if (i !== count - 1)
+            ++length;
+        
+        var range = CPMakeRange(index, length),
+            line = CTLineCreateWithAttributedString([attributedString attributedSubstringFromRange:range]);
+        
+        line.range = range; // FIXME: a couple hacks to make managing lines in CPTextView easier
+        line.prevLine = lastLine;
+        
+        if (lastLine)
+            lastLine.nextLine = line;
+        
+        lines.push(line);
+        index += length;
+        
+        var lastLine = line;
+    }
+    
+    return aFramesetter._cachedFrame = _CTFrameCreate(aPath, frameAttributes, lines);
+}
+
+CTFramesetterCreateFrame.displayName = @"CTFramesetterCreateFrame";
+
+/*!
+    Returns a CTTypesetter
+*/
+function CTFramesetterGetTypesetter(/* CTFramesetter */ aFramesetter)
+{
+    return aFramesetter.typesetter;
+}
+
+CTFramesetterGetTypesetter.displayName = @"CTFramesetterGetTypesetter";
+
+/*!
+    Returns a CGSize object with the suggested size for a given frame.
+*/
+function CTFramesetterSuggestFrameSizeWithConstraints(/* CTFramesetter */ aFramesetter, /* CPRange */ aRange, /* CPDictionary */ frameAttributes, /* CGSize */ constraints, /* {CPRange} */ fitRange)
+{
+    var frame = CTFramesetterCreateFrame(aFramesetter, aRange, null, frameAttributes),
+        lines = CTFrameGetLines(frame),
+        width = 0.0,
+        height = 0.0;
+    
+    for (var i = -1, count = lines.length; ++i < count;)
+    {
+        var bounds = CTLineGetTypographicBounds(lines[i]);
+        // var bounds = CTLineGetImageBounds(lines[i], [[CPGraphicsContext currentContext] graphicsPort]).size;
+        width = MAX(width, bounds.width);
+        height += bounds.lineHeight;
+        // height += bounds.height;
+    }
+    
+    return CGSizeMake(width, height);
+}
+
+CTFramesetterSuggestFrameSizeWithConstraints.displayName = @"CTFramesetterSuggestFrameSizeWithConstraints";
+
+/*!
+    Returns the CPAttributedString for a given framesetter
+*/
+function CTFramesetterGetAttributedString(/* CTFramesetter */ aFramesetter)
+{
+    return aFramesetter.string;
+}
+
+CTFramesetterGetAttributedString.displayName = @"CTFramesetterGetAttributedString";

AppKit/CoreText/CTLine.j

@@ -0,0 +1,258 @@
+/*
+ * CTLine.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTRun.j"
+
+
+kCTLineTruncationStart = 0;
+kCTLineTruncationEnd = 1;
+kCTLineTruncationMiddle = 2;
+
+/*!
+    Creates a new line with a supplied CPAttributedString
+*/
+function CTLineCreateWithAttributedString(/* CPAttributedString */ aString)
+{
+    var line = {
+        string: aString,
+        runs: []
+    };
+    
+    _CTLineCreateRuns(line);
+    
+    return line;
+}
+
+CTLineCreateWithAttributedString.displayName = @"CTLineCreateWithAttributedString";
+
+/*!
+    Creates a new line truncated to a given width.
+    @param aLine - The input line
+    @param width - The constraining width
+    @param truncationToken - The characters to represent the truncation. This is usually an elipsis. If not token is given the string will just clip
+
+    FIX ME: Not implemented correctly
+*/
+function CTLineCreateTruncatedLine(/* CTLine */ aLine, /* float */ width, /* CTLineTruncationType */ truncationType, /* CTLine */ truncationToken)
+{
+    return aLine;
+}
+
+CTLineCreateTruncatedLine.displayName = @"CTLineCreateTruncatedLine";
+
+/*!
+    Returns a CTLine with justified text.
+    FIX ME: This is not implemented correctly
+*/
+function CTLineCreateJustifiedLine(/* CTline */ aLine, /* float */ justificationFactor, /* float */ width)
+{
+    return aLine;
+}
+
+CTLineCreateJustifiedLine.displayName = @"CTLineCreateJustifiedLine";
+
+/*!
+    Returns the number of glyphs in a given line.
+*/
+function CTLineGetGlyphCount(/* CTLine */ aLine)
+{
+    return [aLine.string length];
+}
+
+CTLineGetGlyphCount.displayName = @"CTLineGetGlyphCount";
+
+/*!
+    Returns the array of CTRuns that make up the line.
+*/
+function CTLineGetGlyphRuns(/* CTLine */ aLine)
+{
+    return aLine.runs;
+}
+
+CTLineGetGlyphRuns.displayName = @"CTLineGetGlyphRuns";
+
+/*!
+    Returns the range for which the CTLine makes up the original string
+*/
+function CTLineGetStringRange(/* CTLine */ aLine)
+{
+    return CPCopyRange(aLine.range) || CPMakeRange(0, [aLine.string length])
+}
+
+CTLineGetStringRange.displayName = @"CTLineGetStringRange";
+
+/*!
+    No op
+*/
+function CTLineGetPenOffsetForFlush(/* CTLine */ aLine, /* float */ flushFactor, /* float */ flushWidth)
+{
+    
+}
+
+CTLineGetPenOffsetForFlush.displayName = @"CTLineGetPenOffsetForFlush";
+/*!
+    Draws the CTLine to the graphics context.
+*/
+function CTLineDraw(/* CTLine */ aLine, /* CGContext */ aContext)
+{
+    var startPosition = aLine._startPosition = CGContextGetTextPosition(aContext),
+        height = CTLineGetImageBounds(aLine, aContext).size.height;
+    
+    // FIXME: This is WRONG. This NEEDS to be in CGContext.
+    CGContextSetTextPosition(aContext, startPosition.x, startPosition.y + height * 0.5);
+    
+    var runs = aLine.runs;
+    for (var i = -1, count = runs.length; ++i < count;)
+        CTRunDraw(runs[i], aContext);
+    
+    CGContextSetTextPosition(aContext, startPosition.x, startPosition.y + height);
+}
+
+CTLineDraw.displayName = @"CTLineDraw";
+
+/*!
+    Calcaulates the image bounds for a line.
+*/
+function CTLineGetImageBounds(/* CTLine */ aLine, /* CGContext */ aContext)
+{
+    if (aLine._imageBounds)
+        return aLine._imageBounds;
+    
+    var runs = aLine.runs,
+        width = 0.0,
+        height = 0.0;
+    
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var runSize = CTRunGetImageBounds(runs[i], aContext).size;
+        width += runSize.width;
+        height = MAX(height, runSize.height);
+    }
+    
+    return aLine._imageBounds = CGRectMake(0.0, 0.0, width, height);
+}
+
+CTLineGetImageBounds.displayName = @"CTLineGetImageBounds";
+
+/*!
+    Returns a JSObject: {width: float, ascent: float, descent: float, lineHeight: float}
+    This method is more expensive than CTLineGetImageBounds.
+*/
+function CTLineGetTypographicBounds(/* CTLine */ aLine)
+{
+    if (aLine._typographicBounds)
+        return aLine._typographicBounds;
+    
+    var runs = aLine.runs,
+        width = 0.0,
+        ascent = 0.0,
+        descent = 0.0,
+        lineHeight = 0.0;
+    
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var runObject = CTRunGetTypographicBounds(runs[i]);
+        width += runObject.width;
+        ascent = MAX(ascent, runObject.ascent);
+        descent = MAX(descent, runObject.descent);
+        lineHeight = MAX(lineHeight, runObject.lineHeight);
+    }
+    
+    return aLine._typographicBounds = {
+        width: width,
+        ascent: ascent,
+        descent: descent,
+        lineHeight: lineHeight
+    };
+}
+
+CTLineGetTypographicBounds.displayName = @"CTLineGetTypographicBounds";
+
+/*!
+    Returns the index of the line based on the original string
+*/
+function CTLineGetStringIndexForPosition(/* CTLine */ aLine, /* CGPoint */ aPoint)
+{
+    var runs = aLine.runs, x = aPoint.x, index = 0;
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var run = runs[i],
+            origins = run.glyphOrigins;
+        
+        for (var j = -1, jcount = origins.length; ++j < jcount;)
+        {
+            var origin = origins[j], next;
+            if (j < jcount - 1)
+                next = origins[j + 1];
+            else if (i < count - 1)
+                next = runs[i + 1].glyphOrigins[0];
+            else
+                return index++;
+            
+            if (x <= (next.x - origin.x) / 2 + origin.x)
+                return index;
+            
+            index++;
+        }
+    }
+}
+
+CTLineGetStringIndexForPosition.displayName = @"CTLineGetStringIndexForPosition";
+
+/*!
+    Returns the offset corresponding to a string index,
+    this works well for for movement between adjacent lines or for drawing a custom caret.  
+*/
+function CTLineGetOffsetForStringIndex(/* CTLine */ aLine, /* int */ anIndex, /* float */ secondaryOffset)
+{
+    var runs = aLine.runs;
+    for (var i = -1, count = runs.length; ++i < count;)
+    {
+        var run = runs[i], runRange = run.range;
+        if (CPLocationInRange(anIndex, runRange))
+            return run.glyphOrigins[anIndex - runRange.location];
+    }
+}
+
+CTLineGetOffsetForStringIndex.displayName = @"CTLineGetOffsetForStringIndex";
+
+function _CTLineCreateRuns(aLine)
+{
+    var string = aLine.string,
+        runs = aLine.runs,
+        rangeEntries = string._rangeEntries;
+    
+    for (var i = -1, count = rangeEntries.length; ++i < count;)
+    {
+        var rangeEntry = rangeEntries[i],
+            range = rangeEntry.range,
+            rangeString = [[string string] substringWithRange:range],
+            attributes = rangeEntry.attributes;
+        
+        var run = _CTRunCreate(rangeString, attributes);
+        run.range = range;
+        
+        runs.push(run);
+    }
+}
+
+_CTLineCreateRuns.displayName = @"_CTLineCreateRuns";

AppKit/CoreText/CTRun.j

@@ -0,0 +1,290 @@
+/*
+ * CTRun.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+kCTRunStatusNoStatus = 0;
+kCTRunStatusRightToLeft = 1 << 0;
+kCTRunStatusNonMonotonic = 1 << 1;
+kCTRunStatusNonIdentityMatrix = 1 << 2;
+
+/*!
+    A CTRun represents a span of characters with common attribtues.
+*/
+
+function _CTRunCreate(glyphs, attributes)
+{
+    return {
+        glyphs: glyphs,
+        attributes: attributes,
+        status: kCTRunStatusNoStatus
+    };
+}
+
+_CTRunCreate.displayName = @"_CTRunCreate";
+
+/*!
+    Returns the number of glyphs in the run.
+*/
+function CTRunGetGlyphCount(/* CTRun */ aRun)
+{
+    return aRun.glyphs.length;
+}
+
+CTRunGetGlyphCount.displayName = @"CTRunGetGlyphCount";
+
+/*!
+    Returns a CPDictionary of attributes for the CTRun
+*/
+function CTRunGetAttributes(/* CTRun */ aRun)
+{
+    return aRun.attributes;
+}
+
+CTRunGetAttributes.displayName = @"CTRunGetAttributes";
+
+/*!
+    Returns a CTRunStatus
+    CTRuns have status that can be used to speed up certain operations.
+
+    Possible values:
+
+    @code
+    kCTRunStatusNoStatus
+    kCTRunStatusRightToLeft
+    kCTRunStatusNonMonotonic
+    kCTRunStatusNonIdentityMatrix
+    @endcode
+*/
+function CTRunGetStatus(/* CTRun */ aRun)
+{
+    return aRun.status || kCTRunStatusNoStatus;
+}
+
+CTRunGetStatus.displayName = @"CTRunGetStatus";
+
+/*!
+    Returns an array of CGGlyphs
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetGlyphs(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.glyphs)
+        aRun.glyphs = [];
+    
+    return aRun.glyphs;
+}
+
+CTRunGetGlyphs.displayName = @"CTRunGetGlyphs";
+
+/*!
+    Returns an array of CGPoints
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetPositions(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.positions)
+        aRun.positions = [];
+    
+    return aRun.positions;
+}
+
+CTRunGetPositions.displayName = @"CTRunGetPositions";
+
+/*!
+    Returns an array of CGSizes
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetAdvances(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.advances)
+        aRun.advances = [];
+    
+    return aRun.advances;
+}
+
+CTRunGetAdvances.displayName = @"CTRunGetAdvances";
+
+/*!
+    Returns an array of indexes.
+    FIX ME: Not implemented correctly
+*/
+function CTRunGetStringIndices(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (!aRun.stringIndices)
+        aRun.stringIndices = [];
+    
+    return aRun.stringIndices;
+}
+
+CTRunGetStringIndices.displayName = @"CTRunGetStringIndices";
+
+/*!
+    Returns a CPRange containing the location of the run in the parent string
+*/
+function CTRunGetStringRange(/* CTRun */ aRun)
+{
+    return aRun.range;
+}
+
+CTRunGetStringRange.displayName = @"CTRunGetStringRange";
+
+/*!
+    Returns a JSObject: {width: float, ascender: float, descender: float, lineHeight: float}
+    More expensive
+*/
+function CTRunGetTypographicBounds(/* CTRun */ aRun, /* CPRange */ aRange)
+{
+    if (aRun._typographicBounds)
+        return aRun._typographicBounds;
+    
+    var attributes = aRun.attributes,
+        font = [attributes valueForKey:@"font"],
+        string = _CTRunStringForRange(aRun, aRange);
+    
+    return aRun._typographicBounds = {
+        width: [string sizeWithFont:font].width, // FIXME: account for tabs
+        ascender: [font ascender],
+        descender: [font descender],
+        lineHeight: [font defaultLineHeightForFont]
+    };
+}
+
+CTRunGetTypographicBounds.displayName = @"CTRunGetTypographicBounds";
+
+/*!
+    Returns a CGRect
+    Cheap
+*/
+function CTRunGetImageBounds(/* CTRun */ aRun, /* CGContext */ aContext, /* CPRange */ aRange)
+{
+    if (aRun._imageBounds)
+        return aRun._imageBounds;
+    
+    _CTRunPrepareDraw(aRun, aContext);
+    
+    var string = _CTRunStringForRange(aRun, aRange),
+        width = aContext.measureText(string).width,
+        height = [CGContextGetFont(aContext) defaultLineHeightForFont];
+    
+    _CTRunUnprepareDraw(aRun, aContext);
+    
+    return aRun._imageBounds = CGRectMake(0.0, 0.0, width, height);
+}
+
+CTRunGetImageBounds.displayName = @"CTRunGetImageBounds";
+
+// CGAffineTransform
+function CTRunGetTextMatrix(/* CTRun */ aRun)
+{
+    
+}
+
+CTRunGetTextMatrix.displayName = @"CTRunGetTextMatrix";
+
+/*!
+    Draws the run to the context
+*/
+function CTRunDraw(/* CTRun */ aRun, /* CGContext */ aContext, /* CPRange */ aRange)
+{
+    _CTRunPrepareDraw(aRun, aContext);
+    
+    var string = aRange ? [aRun.glyphs substringWithRange:aRange] : aRun.glyphs;
+    _CTRunDrawShadow(aRun, aContext, string);
+    
+    var origins = aRun.glyphOrigins = [];
+    for (var i = -1, count = string.length; ++i < count;)
+    {
+        var glyph = string[i];
+        origins[i] = CGContextGetTextPosition(aContext);
+        
+        CGContextShowText(aContext, glyph);
+    }
+    
+    _CTRunUnprepareDraw(aRun, aContext);
+}
+
+CTRunDraw.displayName = @"CTRunDraw";
+
+function _CTRunDrawShadow(aRun, aContext, aString)
+{
+    var attributes = aRun.attributes,
+        textShadowColor = [attributes valueForKey:@"text-shadow-color"],
+        textShadowOffset = [attributes valueForKey:@"text-shadow-offset"];
+    
+    if (textShadowColor && textShadowOffset)
+    {
+        var color = CGContextGetFillColor(aContext),
+            position = CGContextGetTextPosition(aContext);
+        
+        CGContextSetFillColor(aContext, textShadowColor);
+        CGContextShowTextAtPoint(aContext, position.x + textShadowOffset.width, position.y + textShadowOffset.height, aString);
+        
+        CGContextSetFillColor(aContext, color);
+        CGContextSetTextPosition(aContext, position.x, position.y);
+    }
+}
+
+_CTRunDrawShadow.displayName = @"_CTRunDrawShadow";
+
+function _CTRunPrepareDraw(aRun, aContext)
+{
+    var attributes = aRun.attributes,
+        font = [attributes valueForKey:@"font"],
+        color = [attributes valueForKey:@"color"];
+    
+    if (font)
+    {
+        CGContextSelectFont(aContext, font);
+        aRun._cachedFont = CGContextGetFont(aContext);
+    }
+    
+    if (color)
+    {
+        CGContextSetFillColor(aContext, color);
+        aRun._cachedColor = CGContextGetFillColor(aContext);
+    }
+}
+
+_CTRunPrepareDraw.displayName = @"_CTRunPrepareDraw";
+
+function _CTRunUnprepareDraw(aRun, aContext)
+{
+    if (aRun._cachedFont)
+    {
+        CGContextSelectFont(aContext, aRun._cachedFont);
+        aRun._cachedFont = nil;
+    }
+    
+    if (aRun._cachedColor)
+    {
+        CGContextSetFillColor(aContext, aRun._cachedColor);
+        aRun._cachedColor = nil;
+    }
+}
+
+_CTRunUnprepareDraw.displayName = @"_CTRunUnprepareDraw";
+
+function _CTRunStringForRange(aRun, aRange)
+{
+    return (!aRange || aRange.length === 0) ? aRun.glyphs : [aRun.glyphs substringWithRange:aRange];
+}
+
+_CTRunStringForRange.displayName = @"_CTRunStringForRange";

AppKit/CoreText/CTTypesetter.j

@@ -0,0 +1,60 @@
+/*
+ * CTTypesetter.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CTLine.j"
+
+
+kCTTypesetterOptionDisableBidiProcessing = @"kCTTypesetterOptionDisableBidiProcessing";
+kCTTypesetterOptionForcedEmbeddingLevel = @"kCTTypesetterOptionForcedEmbeddingLevel";
+
+// Returns a CTTypesetter
+function CTTypesetterCreateWithAttributedString(/* CPAttributedString */ aString)
+{
+    return CTTypesetterCreateWithAttributedStringAndOptions(aString, nil);
+}
+
+// Returns a CTTypesetter
+function CTTypesetterCreateWithAttributedStringAndOptions(/* CPAttributedString */ aString, /* CPDictionary */ aDictionary)
+{
+    return {
+        string: aString,
+        options: aDictionary
+    }
+}
+
+// Returns a CTLine
+function CTTypesetterCreateLine(/* CTTypesetter */ aTypesetter, /* CPRange */ aRange)
+{
+    
+}
+
+// Returns an index
+function CTTypesetterSuggestLineBreak(/* CTTypesetter */ aTypesetter, /* int */ startIndex, /* float */ width)
+{
+    
+}
+
+// Returns an index
+function CTTypesetterSuggestClusterBreak(/* CTTypesetter */ aTypesetter, /* int */ startIndex, /* float */ width)
+{
+    
+}

AppKit/CoreText/CoreText.j

@@ -1,10 +1,9 @@
 /*
- * __filename__
- * __project.name__
+ * CoreText.j
+ * CoreText
  *
- * Created by __user.name__ on __project.date__.
- *
- * Copyright __project.year__, __organization.name__. All rights reserved.
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,4 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "__project.nameasidentifier__Class.j"
+@import "CTFramesetter.j"
+@import "CTFrame.j"
+@import "CTTypesetter.j"
+@import "CTLine.j"
+@import "CTRun.j"
+
+@import "CGContextText.j"

AppKit/Platform/CPPlatformString.j

@@ -42,16 +42,7 @@
 #include "DOM/CPPlatformString.j"
 #else
 @implementation CPPlatformString : CPBasePlatformString
-
-+ (CGSize)sizeOfString:(CPString)aString withFont:(CPFont)aFont forWidth:(float)aWidth
 {
-    return _CGSizeMakeZero();
 }
-
-+ (CPDictionary)metricsOfFont:(CPFont)aFont
-{
-    return [CPDictionary dictionaryWithObjectsAndKeys:0, @"ascender", 0, @"descender", 0, @"lineHeight"];
-}
-
 @end
 #endif

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -810,8 +810,8 @@ var themedButtonValues = nil,
         [@"bezel-color",        bezelDisabledColor,                 CPThemeStateBezeled | CPThemeStateDisabled],
         [@"font",               [CPFont systemFontOfSize:12.0],     CPThemeStateBezeled],
 
-        [@"content-inset",      CGInsetMake(7.0, 7.0, 6.0, 8.0),    CPThemeStateBezeled],
-        [@"content-inset",      CGInsetMake(6.0, 7.0, 6.0, 8.0),    CPThemeStateBezeled | CPThemeStateEditing],
+        [@"content-inset",      CGInsetMake(8.0, 7.0, 5.0, 8.0),    CPThemeStateBezeled],
+        [@"content-inset",      CGInsetMake(7.0, 7.0, 5.0, 8.0),    CPThemeStateBezeled | CPThemeStateEditing],
         [@"bezel-inset",        CGInsetMake(3.0, 4.0, 3.0, 4.0),    CPThemeStateBezeled],
         [@"bezel-inset",        CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled | CPThemeStateEditing],
 

AppKit/Themes/BlendKit/BKThemeDescriptor.j

@@ -225,7 +225,7 @@ var ItemSizes               = { },
     }
 }
 
-+ (void)registerThemeValues:(CPArray)themeValues forView:(CPView)aView inherit:(CPArray)inheritedValues
++ (void)registerThemeValues:(CPArray)themeValues forView:aView inherit:(CPArray)inheritedValues
 {
     // Register inherited values first, then override those with the subtheme values.
     if (inheritedValues)

AppKit/_CPImageAndTextView.j

@@ -288,28 +288,6 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
     return _textShadowOffset;
 }
 
-- (CGRect)textFrame
-{
-    [self layoutIfNeeded];
-
-    var textFrame = CGRectMakeZero();
-
-    if (_DOMTextElement)
-    {
-        var textStyle = _DOMTextElement.style;
-
-        textFrame.origin.y = parseInt(textStyle.top.substr(0, textStyle.top.length - 2), 10),
-        textFrame.origin.x = parseInt(textStyle.left.substr(0, textStyle.left.length - 2), 10),
-        textFrame.size.width = parseInt(textStyle.width.substr(0, textStyle.width.length - 2), 10),
-        textFrame.size.height = parseInt(textStyle.height.substr(0, textStyle.height.length - 2), 10);
-
-        textFrame.size.width += _textShadowOffset.width;
-        textFrame.size.height += _textShadowOffset.height;
-    }
-
-    return textFrame;
-}
-
 - (void)setImage:(CPImage)anImage
 {
     if (_image == anImage)

Buildfile

@@ -1,54 +0,0 @@
-require File.join(File.dirname(__FILE__), "repositories.rb")
-require File.join(File.dirname(__FILE__), "dependencies.rb")
-
-# Keep this structure to allow the build system to update version numbers.
-VERSION_NUMBER = "1.0.0.006"
-
-
-# Shorten expressions
-def jars(*args)
- args.collect {|arg| project(arg).package(:jar)}
-end
-
-desc "Cappuccino Distribution"
-define "cappuccino" do
-  project.version = VERSION_NUMBER
-  project.group = "com.intalio.cloud.cappuccino"
-  
-  file(_("target/patch")).enhance do
-    mkdir_p "target/patch"
-  end
-
-  file(_("target/Frameworks")).enhance do
-    mkdir_p "target/Frameworks/Debug"
-        system <<-BASH
-export BUILD_PATH="target/Build"
-jake debug release
-BASH
-
-    cp_r "target/Build/Release/AppKit", "target/Frameworks/"
-    cp_r "target/Build/Release/Foundation", "target/Frameworks/"
-    cp_r "target/Build/Release/Objective-J", "target/Frameworks/"
-    cp_r "target/Build/Debug/AppKit", "target/Frameworks/Debug/"
-    cp_r "target/Build/Debug/Foundation", "target/Frameworks/Debug/"
-    cp_r "target/Build/Debug/Objective-J", "target/Frameworks/Debug/"
-  end
-
-  # file(_("target/Build")).enhance do
-  # end
-  read_m = ::Buildr::Packaging::Java::Manifest.parse(File.read(_("META-INF/MANIFEST.MF"))).main
-  read_m["Copyright"]="Intalio, Inc 2011"
-  read_m["Bundle-Version"]=VERSION_NUMBER.gsub(/SNAPSHOT/, "#{Time.now.to_i}")
-  read_m.delete("Jetty-WarFragmentFolderPath")
-  read_m.delete("Jetty-WarPatchFragmentFolderPath")
-  package(:jar).with :manifest => read_m
-  #package(:jar).include _("target/patch"), :as => "patch"
-  package(:jar).include _("target/Frameworks"), :as => "META-INF/resources/Frameworks"
-  
-  #do not include those: they are at best not read harmful.
-  #package(:bundle).include _("build.properties"), :as => "build.properties"
-  #package(:bundle).meta_inf << file('META-INF/web-fragment.xml')
-
-end
-
-

Foundation/CPArray+KVO.j

@@ -428,9 +428,7 @@ var avgOperator,
     maxOperator,
     minOperator,
     countOperator,
-    sumOperator,
-    distinctUnionOfObjectsOperator,
-    unionOfObjectsOperator;
+    sumOperator;
 
 kvoOperators["avg"] = function avgOperator(self, _cmd, param)
 {
@@ -497,18 +495,6 @@ kvoOperators["sum"] = function sumOperator(self, _cmd, param)
     return sum;
 }
 
-kvoOperators["distinctUnionOfObjects"] = function distinctUnionOfObjectsOperator(self, _cmd, param)
-{
-    var objects = [self valueForKeyPath:param];
-
-    return [[CPSet setWithArray:objects] allObjects];
-}
-
-kvoOperators["unionOfObjects"] = function unionOfObjectsOperator(self, _cmd, param)
-{
-    return [self valueForKeyPath:param];
-}
-
 @implementation CPArray (KeyValueObserving)
 
 - (void)addObserver:(id)anObserver toObjectsAtIndexes:(CPIndexSet)indexes forKeyPath:(CPString)aKeyPath options:(unsigned)options context:(id)context

Foundation/CPAttributedString.j

@@ -27,6 +27,10 @@
 @import "CPRange.j"
 @import "CPString.j"
 
+
+CPFontAttributeName = "font";
+CPForegroundColorAttributeName = "color";
+
 /*!
     @class CPAttributedString
     @ingroup foundation
@@ -42,6 +46,11 @@
     implements functionality from both NSAttributedString and
     NSMutableAttributedString. However, to ease converting of existing
     Objective-C code a CPMutableAttributedString alias to this class exists.
+    
+    Below are a list of commonly used attributes:
+    CPFontAttributeName - Font object
+    CPForegroundColorAttributeName - CPColor object
+
 */
 @implementation CPAttributedString : CPObject
 {

Foundation/CPDecimal.j

@@ -72,7 +72,6 @@ CPRoundPlain                         = 1;
 CPRoundDown                          = 2;
 CPRoundUp                            = 3;
 CPRoundBankers                       = 4;
-_CPRoundHalfDown                     = 5; // Private API rounding mode used by CPNumberFormatter.
 
 //Exceptions
 CPDecimalNumberOverflowException     = @"CPDecimalNumberOverflowException";
@@ -1331,10 +1330,6 @@ function CPDecimalRound(result, dcm, scale ,roundingMode)
             n = result._mantissa[l];
             up = (n >= 5);
             break;
-        case _CPRoundHalfDown:
-            n = result._mantissa[l];
-            up = (n > 5);
-            break;
         case CPRoundBankers:
             n = result._mantissa[l];
             if (n > 5)

Foundation/CPFormatter.j

@@ -33,8 +33,6 @@
            make sure that you cannot configure the public subclasses CPDateFormatter and CPNumberFormatter to satisfy your requirements.
 */
 
-#import "Ref.h"
-
 @import "CPException.j"
 @import "CPObject.j"
 
@@ -82,19 +80,19 @@
 /*!
     The default implementation of this method raises an exception.
 
-    When implementing a subclass, return by reference the object anObject after creating it from aString.
-    Return \c YES if the conversion is successful. If you return \c NO, also return by reference (in anError)
+    When implementing a subclass, return by reference the object anObject after creating it from string.
+    Return YES if the conversion is successful. If you return NO, also return by indirection (in error)
     a localized user-presentable CPString object that explains the reason why the conversion failed; the delegate
-    (if any) of the CPControl object can then respond to the failure in
-    control:didFailToFormatString:errorDescription:. However, if anError is nil, the sender is not interested in
+    (if any) of the CPControl object managing the cell can then respond to the failure in
+    control:didFailToFormatString:errorDescription:. However, if error is nil, the sender is not interested in
     the error description, and you should not attempt to assign one.
 
     @param anObject if conversion is successful, upon return contains the object created from the string
     @param aString the string to parse.
     @param anError if non-nil, if there is an error during the conversion, upon return contains an CPString object that describes the problem.
-    @return BOOL \c YES if the conversion from the string to a view content object was successful, otherwise \c NO.
+    @return BOOL YES if the conversion from the string to a view content object was successful, otherwise NO.
 */
-- (BOOL)getObjectValue:(idRef)anObject forString:(CPString)aString errorDescription:(CPStringRef)anError
+- (BOOL)getObjectValue:(id)anObject forString:(CPString)aString errorDescription:(CPString)anError
 {
     _CPRaiseInvalidAbstractInvocation(self, _cmd);
     return NO;
@@ -106,11 +104,11 @@
     This method is invoked each time the user presses a key while the cell has the keyboard focus it lets you verify and
     edit the cell text as the user types it.
 
-    In a subclass implementation, evaluate aPartialString according to the context, edit the text if necessary, and return
-    by reference any edited string in aNewString. Return \c YES if aPartialString is acceptable and \c NO if aPartialString is unacceptable.
-    If you return \c NO and aNewString is nil, the control displays aPartialString minus the last character typed. If you return \c NO, you can
-    also return by reference a CPString object (in anError) that explains the reason why the validation failed; the delegate (if any)
-    of the CPControl can then respond to the failure in control:didFailToValidatePartialString:errorDescription:.
+    In a subclass implementation, evaluate partialString according to the context, edit the text if necessary, and return
+    by reference any edited string in newString. Return YES if partialString is acceptable and NO if partialString is unacceptable.
+    If you return NO and newString is nil, the cell displays partialString minus the last character typed. If you return NO, you can
+    also return by indirection an CPString object (in error) that explains the reason why the validation failed; the delegate (if any)
+    of the CPControl object managing the cell can then respond to the failure in control:didFailToValidatePartialString:errorDescription:.
     The selection range will always be set to the end of the text if replacement occurs.
 
     This method is a compatibility method. If a subclass overrides this method and does not override
@@ -120,16 +118,12 @@
     @param aPartialString the text currently in the view.
     @param aNewString if aPartialString needs to be modified, upon return contains the replacement string.
     @param anError if non-nil, if validation fails contains a CPString object that describes the problem.
-    @return \c YES if aPartialString is an acceptable value, otherwise \c NO.
+    @return YES if aPartialString is an acceptable value, otherwise NO.
 */
-- (BOOL)isPartialStringValid:(CPString)aPartialString newEditingString:(CPStringRef)aNewString errorDescription:(CPStringRef)anError
+- (BOOL)isPartialStringValid:(CPString)aPartialString newEditingString:(CPString)aNewString errorDescription:(CPString)anError
 {
-    AT_DEREF(aPartialString, nil);
-
-    if (anError)
-        AT_DEREF(anError, nil);
-
-    return YES;
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+    return NO;
 }
 
 /*!
@@ -137,35 +131,24 @@
     not necessarily at the end of the string, and preserve the selection (or set a different one, such as selecting the erroneous part of
     the string the user has typed).
 
-    In a subclass implementation, evaluate aPartialString according to the context. Return \c YES if aPartialString is acceptable and \c NO if aPartialString
-    is unacceptable. Assign a new string by reference to aPartialString and a new range by reference to aProposedSelectedRange and return \c NO if you want to replace the string and
-    change the selection range. If you return \c NO, you can also return by reference a CPString object (in anError) that explains the reason why the
-    validation failed; the delegate (if any) of the CPControl can then respond to the failure in
+    In a subclass implementation, evaluate partialString according to the context. Return YES if partialStringPtr is acceptable and NO if partialStringPtr
+    is unacceptable. Assign a new string to partialStringPtr and a new range to proposedSelRangePtr and return NO if you want to replace the string and
+    change the selection range. If you return NO, you can also return by indirection an CPString object (in error) that explains the reason why the
+    validation failed; the delegate (if any) of the CPControl object managing the cell can then respond to the failure in
     control:didFailToValidatePartialString:errorDescription:.
 
     @param aPartialString The new string to validate.
     @param aProposedSelectedRange The selection range that will be used if the string is accepted or replaced.
     @param originalString The original string, before the proposed change.
     @param originalSelectedRange The selection range over which the change is to take place.
-    @param anError If non-nil, if validation fails contains an CPString object that describes the problem.
-    @return \c YES if aPartialString is acceptable, otherwise \c NO.
+    @param error If non-nil, if validation fails contains an CPString object that describes the problem.
+    @return YES if aPartialString is acceptable, otherwise NO.
 
 */
-- (BOOL)isPartialStringValid:(CPStringRef)aPartialString proposedSelectedRange:(CPRangeRef)aProposedSelectedRange originalString:(CPString)originalString originalSelectedRange:(CPRange)originalSelectedRange errorDescription:(CPStringRef)anError
+- (BOOL)isPartialStringValue:(CPString)aPartialString proposedSelectedRange:(CPRange)aProposedSelectedRange originalString:(CPString)originalString originalSelectedRange:(CPRange)originalSelectedRange errorDescription:(CPString)anError
 {
-    var newString = nil,
-        valid = [self isPartialStringValid:aPartialString newEditingString:AT_REF(newString) errorDescription:anError];
-
-    if (!valid)
-    {
-        AT_DEREF(aPartialString, newString);
-
-        // If a new string is passed back, the selection is always put at the end
-        if (newString !== nil)
-            AT_DEREF(aProposedSelectedRange, CPMakeRange(newString.length, 0));
-    }
-
-    return valid;
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+    return NO;
 }
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -175,6 +158,7 @@
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
+
 }
 
 @end

Foundation/CPKeyedArchiver.j

@@ -201,10 +201,11 @@ var _CPKeyedArchiverStringClass                         = Nil,
 
     for (; i < _objects.length; ++i)
     {
-        var object = _objects[i];
+        var object = _objects[i],
+            theClass = [object classForKeyedArchiver];
 
         // Do whatever with the class, yo.
-        // We called willEncodeObject previously.
+        // We call willEncodeObject previously.
 
         _plistObject = _plistObjects[[_UIDs objectForKey:[object UID]]];
         [object encodeWithCoder:self];

Foundation/CPNumberFormatter.j

@@ -20,152 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "Ref.h"
 
 @import <Foundation/CPString.j>
 @import <Foundation/CPFormatter.j>
-@import <Foundation/CPDecimalNumber.j>
 
-#define UPDATE_NUMBER_HANDLER_IF_NECESSARY() if (!_numberHandler) \
-    _numberHandler = [CPDecimalNumberHandler decimalNumberHandlerWithRoundingMode:_roundingMode scale:_maximumFractionalDigits raiseOnExactness:NO raiseOnOverflow:NO raiseOnUnderflow:NO raiseOnDivideByZero:YES];
-#define SET_NEEDS_NUMBER_HANDLER_UPDATE() _numberHandler = nil;
-
-CPNumberFormatterNoStyle            = 0;
-CPNumberFormatterDecimalStyle       = 1;
-CPNumberFormatterCurrencyStyle      = 2;
-CPNumberFormatterPercentStyle       = 3;
-CPNumberFormatterScientificStyle    = 4;
-CPNumberFormatterSpellOutStyle      = 5;
-
-CPNumberFormatterRoundCeiling       = CPRoundUp;
-CPNumberFormatterRoundFloor         = CPRoundDown;
-CPNumberFormatterRoundDown          = CPRoundDown;
-CPNumberFormatterRoundUp            = CPRoundUp;
-CPNumberFormatterRoundHalfEven      = CPRoundBankers;
-CPNumberFormatterRoundHalfDown      = _CPRoundHalfDown;
-CPNumberFormatterRoundHalfUp        = CPRoundPlain;
-
-/*!
-    @ingroup foundation
-    @class CPNumberFormatter
-
-    CPNumberFormatter takes a numeric NSNumber value and formats it as text for
-    display. It also supports the converse, taking text and interpreting it as a
-    CPNumber by configurable formatting rules.
-*/
 @implementation CPNumberFormatter : CPFormatter
 {
-    CPNumberFormatterStyle          _numberStyle @accessors(property=numberStyle);
-    CPString                        _perMillSymbol @accessors(property=perMillSymbol);
-    CPNumberFormatterRoundingMode   _roundingMode @accessors(property=roundingMode);
-    CPUInteger                      _maximumFractionalDigits @accessors(property=maximalFractionalDigits);
-
-    CPDecimalNumberHandler         _numberHandler;
-}
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _roundingMode = CPNumberFormatterRoundHalfUp;
-        _maximumFractionalDigits = 3;
-    }
-
-    return self;
-}
-
-- (CPString)stringFromNumber:(CPNumber)number
-{
-    // TODO Add locale support.
-    switch(_numberStyle)
-    {
-        case CPNumberFormatterDecimalStyle:
-            UPDATE_NUMBER_HANDLER_IF_NECESSARY();
-
-            var dcmn = [CPDecimalNumber numberWithFloat:number];
-            dcmn = [dcmn decimalNumberByRoundingAccordingToBehavior:_numberHandler];
-
-            var output = [dcmn descriptionWithLocale:nil],
-                parts = [output componentsSeparatedByString:"."], // FIXME Locale specific.
-                preFraction = parts[0],
-                fraction = parts.length > 1 ? parts[1] : "",
-                preFractionLength = [preFraction length],
-                commaPosition = 3,
-                perMillSymbol = [self _effectivePerMillSymbol];
-
-            // TODO This is just a temporary solution. Should be generalised.
-            // Add in thousands separators.
-            if (perMillSymbol)
-                while(commaPosition < [preFraction length])
-                {
-                    preFraction = [preFraction stringByReplacingCharactersInRange:CPMakeRange(commaPosition, 0) withString:perMillSymbol];
-                    commaPosition += 4;
-                }
-
-            if (fraction)
-                return preFraction + "." + fraction;
-            else
-                return preFraction;
-        default:
-            return [number description];
-    }
-}
-
-- (CPNumber)numberFromString:(CPString)string
-{
-    // TODO
-    return parseFloat(string);
-}
-
-- (CPString)stringForObjectValue:(id)anObject
-{
-    if ([anObject isKindOfClass:[CPNumber class]])
-        return [self stringFromNumber:anObject];
-    else
-        return [anObject description];
-}
-
-- (CPString)editingStringForObjectValue:(id)anObject
-{
-    return [self stringForObjectValue:anObject];
-}
-
-- (BOOL)getObjectValue:(id)anObject forString:(CPString)aString errorDescription:(CPString)anError
-{
-    // TODO Error handling.
-    var value = [self numberFromString:aString];
-    AT_DEREF(anObject, value);
-
-    return YES;
-}
-
-/*!
-    @ignore
-    Return the perMillSymbol if set, otherwise the locale default.
-*/
-- (CPString)_effectivePerMillSymbol
-{
-    if (_perMillSymbol === nil || _perMillSymbol === undefined)
-        return ","; // (FIXME US Locale specific.)
-    return _perMillSymbol;
-}
-
-- (void)setRoundingMode:(CPNumberFormatterRoundingMode)aRoundingMode
-{
-    _roundingMode = aRoundingMode;
-    SET_NEEDS_NUMBER_HANDLER_UPDATE();
-}
-
-- (void)setMaximumFractionDigits:(CPUInteger)aNumber
-{
-    _maximumFractionalDigits = aNumber;
-    SET_NEEDS_NUMBER_HANDLER_UPDATE();
 }
 
 @end
 
-var CPNumberFormatterStyleKey = "CPNumberFormatterStyleKey";
-
 @implementation CPNumberFormatter (CPCoding)
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -174,7 +38,6 @@ var CPNumberFormatterStyleKey = "CPNumberFormatterStyleKey";
 
     if (self)
     {
-        _numberStyle = [aCoder decodeIntForKey:CPNumberFormatterStyleKey];
     }
 
     return self;
@@ -183,8 +46,6 @@ var CPNumberFormatterStyleKey = "CPNumberFormatterStyleKey";
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_numberStyle forKey:CPNumberFormatterStyleKey];
 }
 
 @end

Foundation/CPPredicate/CPComparisonPredicate.j

@@ -438,18 +438,14 @@ var CPComparisonPredicateModifier,
                                                                 reg = new RegExp(rhs.escapeForRegExp(),commut);
                                                             return reg.test(lhs);
 
-        case CPBeginsWithPredicateOperatorType:             var range = CPMakeRange(0, MIN([lhs length], [rhs length]));
-                                                            if (_options & CPCaseInsensitivePredicateOption)
-                                                                string_compare_options |= CPCaseInsensitiveSearch;
-                                                            if (_options & CPDiacriticInsensitivePredicateOption)
-                                                                string_compare_options |= CPDiacriticInsensitiveSearch;
+        case CPBeginsWithPredicateOperatorType:             var range = CPMakeRange(0,[rhs length]);
+                                                            if (_options & CPCaseInsensitivePredicateOption) string_compare_options |= CPCaseInsensitiveSearch;
+                                                            if (_options & CPDiacriticInsensitivePredicateOption) string_compare_options |= CPDiacriticInsensitiveSearch;
                                                             return ([lhs compare:rhs options:string_compare_options range:range] == CPOrderedSame);
 
-        case CPEndsWithPredicateOperatorType:               var range = CPMakeRange(MAX([lhs length] - [rhs length], 0), MIN([lhs length], [rhs length]));
-                                                            if (_options & CPCaseInsensitivePredicateOption)
-                                                                string_compare_options |= CPCaseInsensitiveSearch;
-                                                            if (_options & CPDiacriticInsensitivePredicateOption)
-                                                                string_compare_options |= CPDiacriticInsensitiveSearch;
+        case CPEndsWithPredicateOperatorType:               var range = CPMakeRange([lhs length] - [rhs length],[rhs length]);
+                                                            if (_options & CPCaseInsensitivePredicateOption) string_compare_options |= CPCaseInsensitiveSearch;
+                                                            if (_options & CPDiacriticInsensitivePredicateOption) string_compare_options |= CPDiacriticInsensitiveSearch;
                                                             return ([lhs compare:rhs options:string_compare_options range:range] == CPOrderedSame);
 
         case CPCustomSelectorPredicateOperatorType:         return [lhs performSelector:_customSelector withObject:rhs];

Foundation/Foundation.j

@@ -21,6 +21,7 @@
  */
 
 @import "CPArray.j"
+@import "CPAttributedString.j"
 @import "CPBundle.j"
 @import "CPCharacterSet.j"
 @import "CPCoder.j"

Gemfile

@@ -1,25 +0,0 @@
-source "http://rubygems.org"
-
-gem "atoulme-Antwrap", "0.7.1" # -java
-gem "bouncy-castle-java", "1.5.0146.1"
-gem "builder", "2.1.2"
-gem "buildr", "1.4.5" # -java
-gem "buildr4osgi", "0.9.6"
-gem "bundler", "1.0.0.rc.5"
-gem "diff-lcs", "1.1.2"
-gem "highline", "1.5.1"
-gem "hoe", "2.3.3"
-gem "jruby-openssl", "0.7.4"
-gem "json_pure", "1.4.3"
-gem "manifest", "0.0.8"
-gem "minitar", "0.5.3"
-gem "net-sftp", "2.0.4"
-gem "net-ssh", "2.0.23" # 2.1.4
-gem "rake", "0.8.7" # 0.9.1
-gem "rspec", "2.1.0"
-gem "rspec-core", "2.1.0"
-gem "rspec-expectations", "2.1.0"
-gem "rspec-mocks", "2.1.0"
-gem "rubyforge", "2.0.3"
-gem "rubyzip", "0.9.4"
-gem "xml-simple", "1.0.12"

Gemfile.lock

@@ -1,81 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    atoulme-Antwrap (0.7.1-java)
-    bouncy-castle-java (1.5.0146.1)
-    builder (2.1.2)
-    buildr (1.4.5-java)
-      atoulme-Antwrap (= 0.7.1)
-      builder (= 2.1.2)
-      diff-lcs (= 1.1.2)
-      highline (= 1.5.1)
-      hoe (= 2.3.3)
-      jruby-openssl (>= 0.7)
-      json_pure (= 1.4.3)
-      minitar (= 0.5.3)
-      net-sftp (= 2.0.4)
-      net-ssh (= 2.0.23)
-      rake (= 0.8.7)
-      rspec (= 2.1.0)
-      rspec-core (= 2.1.0)
-      rspec-expectations (= 2.1.0)
-      rspec-mocks (= 2.1.0)
-      rubyforge (= 2.0.3)
-      rubyzip (= 0.9.4)
-      xml-simple (= 1.0.12)
-    buildr4osgi (0.9.6)
-      manifest (= 0.0.8)
-    diff-lcs (1.1.2)
-    highline (1.5.1)
-    hoe (2.3.3)
-      rake (>= 0.8.7)
-      rubyforge (>= 1.0.4)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    json_pure (1.4.3)
-    manifest (0.0.8)
-    minitar (0.5.3)
-    net-sftp (2.0.4)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.0.23)
-    rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rubyforge (2.0.3)
-      json_pure (>= 1.1.7)
-    rubyzip (0.9.4)
-    xml-simple (1.0.12)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  atoulme-Antwrap (= 0.7.1)
-  bouncy-castle-java (= 1.5.0146.1)
-  builder (= 2.1.2)
-  buildr (= 1.4.5)
-  buildr4osgi (= 0.9.6)
-  bundler (= 1.0.0.rc.5)
-  diff-lcs (= 1.1.2)
-  highline (= 1.5.1)
-  hoe (= 2.3.3)
-  jruby-openssl (= 0.7.4)
-  json_pure (= 1.4.3)
-  manifest (= 0.0.8)
-  minitar (= 0.5.3)
-  net-sftp (= 2.0.4)
-  net-ssh (= 2.0.23)
-  rake (= 0.8.7)
-  rspec (= 2.1.0)
-  rspec-core (= 2.1.0)
-  rspec-expectations (= 2.1.0)
-  rspec-mocks (= 2.1.0)
-  rubyforge (= 2.0.3)
-  rubyzip (= 0.9.4)
-  xml-simple (= 1.0.12)

META-INF/MANIFEST.MF

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: cappuccinofrag
-Bundle-SymbolicName: com.intalio.cloud.cappuccino
-Fragment-Host: com.intalio.cloud.carbon
-Jetty-WarPatchFragmentFolderPath: /
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Eclipse-BundleShape: dir

Objective-J/CommonJS/lib/objective-j/jake/bundletask.js

@@ -836,7 +836,8 @@ BundleTask.prototype.defineSourceTasks = function()
 
         environmentSources.forEach(function(/*String*/ aFilename)
         {
-            if (!FILE.exists(aFilename))
+            // if this file doesn't exist or isn't a .j file, don't preprocess it.
+            if (!FILE.exists(aFilename) || FILE.extension(aFilename) !== '.j')
                 return;
 
             var relativePath = aFilename.substring(basePathLength ? basePathLength + 1 : basePathLength),
@@ -844,19 +845,8 @@ BundleTask.prototype.defineSourceTasks = function()
 
             filedir (compiledEnvironmentSource, [aFilename], function()
             {
-                var compile
-                // if this file doesn't exist or isn't a .j file, don't preprocess it.
-                if (FILE.extension(aFilename) !== ".j")
-                {
-                    TERM.stream.write("Including [\0blue(" + anEnvironment + "\0)] \0purple(" + aFilename + "\0)").flush();
-                    var compiled = FILE.read(aFilename, { charset:"UTF-8" });
-                }
-                else
-                {
-                    TERM.stream.write("Compiling [\0blue(" + anEnvironment + "\0)] \0purple(" + aFilename + "\0)").flush();
-                    var compiled = require("objective-j/compiler").compile(aFilename, environmentCompilerFlags);
-                }
-
+                TERM.stream.write("Compiling [\0blue(" + anEnvironment + "\0)] \0purple(" + aFilename + "\0)").flush();
+                var compiled = require("objective-j/compiler").compile(aFilename, environmentCompilerFlags);
                 TERM.stream.print(Array(Math.round(compiled.length / 1024) + 3).join("."));
                 FILE.write(compiledEnvironmentSource, compiled, { charset:"UTF-8" });
             });

Tests/AppKit/CPTextFieldTest.j

@@ -22,31 +22,6 @@
     [self assert:[view valueForThemeAttribute:@"content-inset"].top equals:[decoded valueForThemeAttribute:@"content-inset"].top message:@"content-inset should unarchive correctly"];
 }
 
-- (void)testFormatters
-{
-    var control = [[CPTextField alloc] initWithFrame:CGRectMakeZero()],
-        numberFormatter = [[CPNumberFormatter alloc] init];
-
-    [numberFormatter setNumberStyle:CPNumberFormatterDecimalStyle];
-    [numberFormatter setMaximumFractionDigits:3];
-
-    [control setFormatter:numberFormatter];
-    [control setStringValue:@"12.3456"];
-    [self assert:[CPNumber class] equals:[[control objectValue] class] message:@"object should be a number"];
-    // Note that the control stores the value with a different precision than the maximum fraction
-    // digits of the number formatter. It's a little surprising but this makes the implementation easier
-    // and Cocoa does it too.
-    [self assert:[CPNumber numberWithFloat:12.3456] equals:[control objectValue]];
-    [self assert:"12.346" equals:[control stringValue]];
-
-    [control setFloatValue:45.3456];
-    [self assertTrue:"45.346" === [control stringValue]];
-
-    [control setFormatter:nil];
-    [control setStringValue:@"12"];
-    [self assert:@"12" equals:[control objectValue]];
-}
-
 @end
 
 @implementation CPTextFieldSubclass : CPTextField

Tests/Foundation/CPNumberFormatterTest.j

@@ -1,48 +0,0 @@
-@import <Foundation/Foundation.j>
-
-@implementation CPNumberFormatterTest : OJTestCase
-{
-}
-
-- (void)testDecimalStyle
-{
-    var numberFormatter = [[CPNumberFormatter alloc] init];
-    [numberFormatter setNumberStyle:CPNumberFormatterDecimalStyle];
-    var formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithInt:123]];
-    [self assert:@"123" equals:formattedNumberString];
-
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:122344.4563]];
-    // TODO Locale support. This test is sensitive to float precision.
-    [self assert:@"122,344.456" equals:formattedNumberString];
-}
-
-- (void)testRoundingMode
-{
-    var numberFormatter = [[CPNumberFormatter alloc] init],
-        formattedNumberString;
-    [numberFormatter setNumberStyle:CPNumberFormatterDecimalStyle];
-
-    [numberFormatter setRoundingMode:CPNumberFormatterRoundUp];
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:123.5672]];
-    [self assert:@"123.568" equals:formattedNumberString];
-
-    [numberFormatter setRoundingMode:CPNumberFormatterRoundDown];
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:123.5679]];
-    [self assert:@"123.567" equals:formattedNumberString];
-
-    [numberFormatter setRoundingMode:CPNumberFormatterRoundHalfEven];
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:123.5675]];
-    [self assert:@"123.568" equals:formattedNumberString];
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:123.5665]];
-    [self assert:@"123.566" equals:formattedNumberString];
-
-    [numberFormatter setRoundingMode:CPNumberFormatterRoundHalfDown];
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:123.5675]];
-    [self assert:@"123.567" equals:formattedNumberString];
-
-    [numberFormatter setRoundingMode:CPNumberFormatterRoundHalfUp];
-    formattedNumberString = [numberFormatter stringFromNumber:[CPNumber numberWithFloat:123.5675]];
-    [self assert:@"123.568" equals:formattedNumberString];
-}
-
-@end

Tests/Foundation/CPPredicateTest.j

@@ -189,28 +189,6 @@
     [self assertTrue:[pred evaluateWithObject:dict] message:"'"+ [pred description]  + "' should be true"];
 }
 
-- (void)testBeginsWithEndsWithPredicate
-{
-    // This always worked
-    var data = ["To", "Tom", "Tomb", "Tomboy"],
-        pred = [CPPredicate predicateWithFormat:@"SELF beginsWith 'To'"],
-        result = [data filteredArrayUsingPredicate:pred];
-
-    [self assertTrue:result.length === 4 message:"'" + [pred description] + "' should return [\"To\", \"Tom\", \"Tomb\", \"Tomboy\"]"];
-
-    // Make sure beginsWith comparison string longer than source strings works
-    pred = [CPPredicate predicateWithFormat:@"SELF beginsWith 'Tomb'"];
-    result = [data filteredArrayUsingPredicate:pred];
-
-    [self assertTrue:[result isEqual:["Tomb", "Tomboy"]] message:"'" + [pred description] + "' should return [\"Tomb\", \"Tomboy\"]"];
-
-    // Make sure endsWith comparison string longer than source strings works
-    pred = [CPPredicate predicateWithFormat:@"SELF endsWith 'boy'"];
-    result = [data filteredArrayUsingPredicate:pred];
-
-    [self assertTrue:[result isEqual:["Tomboy"]] message:"'" + [pred description] + "' should return [\"Tomboy\"]"];
-}
-
 - (void)testNilComparisons
 {
 // Custom Selector Predicate

Tests/Manual/CPColor-CPImage-description/AppController.j

@@ -1,80 +0,0 @@
-/*
- * AppController.j
- * test
- *
- * Created by aparajita on May 19, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-
-function formatter(aString, aLevel, aTitle)
-{
-    return aString;
-}
-
-@implementation AppController : CPObject
-{
-    CPWindow    theWindow; //this "outlet" is connected automatically by the Cib
-    CPView      simpleColor;
-    CPView      patternColor;
-    CPView      threePartColor;
-    CPView      ninePartColor;
-    CPImage     imageView;
-}
-
-- (void)applicationDidFinishLaunching:(CPNotification)aNotification
-{
-    // This is called when the application is done loading.
-}
-
-- (void)awakeFromCib
-{
-    CPLogRegister(CPLogConsole, null, formatter);
-
-    // In this case, we want the window from Cib to become our full browser window
-    [theWindow setFullPlatformWindow:YES];
-
-    var color = [CPColor colorWithHexString:@"88B3FF"];
-    CPLog([color description]);
-
-    [simpleColor setBackgroundColor:color];
-
-    color = CPColorWithImages("wheel_button.png", 32, 32, [CPBundle bundleForClass:[CPView class]]);
-    CPLog([color description]);
-
-    [patternColor setBackgroundColor:color];
-
-    var bundle = [CPBundle bundleForClass:[CPView class]];
-
-    color = CPColorWithImages([
-        ["Aristo.blend/Resources/button-bezel-left.png", 4, 24, bundle],
-        ["Aristo.blend/Resources/button-bezel-center.png", 1, 24, bundle],
-        ["Aristo.blend/Resources/button-bezel-right.png", 4, 24, bundle]
-    ]);
-    CPLog([color description]);
-
-    [threePartColor setBackgroundColor:color];
-
-    color = CPColorWithImages([
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-0.png", 7, 7, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-1.png", 1, 7, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-2.png", 7, 7, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-3.png", 7, 1, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-4.png", 1, 1, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-5.png", 7, 1, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-6.png", 7, 7, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-7.png", 1, 7, bundle],
-        ["Aristo.blend/Resources/textfield-bezel-square-focused-8.png", 7, 7, bundle],
-    ]);
-    CPLog([color description]);
-
-    [ninePartColor setBackgroundColor:color];
-
-    var image = CPImageInBundle("add1-32.png", CGSizeMake(32, 32));
-
-    CPLog([image description]);
-    [imageView setImage:image];
-}
-
-@end

Tests/Manual/CPColor-CPImage-description/Info.plist

@@ -1,10 +0,0 @@
-<?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>CPColor-CPImage-description</string>
-</dict>
-</plist>

Tests/Manual/CPColor-CPImage-description/Jakefile

@@ -1,94 +0,0 @@
-/*
- * Jakefile
- * test
- *
- * Created by aparajita on May 19, 2011.
- * Copyright 2011, Victory-Heart Productions 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");
-
-app ("test", function(task)
-{
-    task.setBuildIntermediatesPath(FILE.join("Build", "test.build", configuration));
-    task.setBuildPath(FILE.join("Build", configuration));
-
-    task.setProductName("test");
-    task.setIdentifier("com.aparajita.test");
-    task.setVersion("1.0");
-    task.setAuthor("Victory-Heart Productions");
-    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("test");
-    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/**"));
-    task.setIndexFilePath("index.html");
-    task.setInfoPlistPath("Info.plist");
-    task.setNib2CibFlags("-R Resources/");
-
-    if (configuration === "Debug")
-        task.setCompilerFlags("-DDEBUG -g");
-    else
-        task.setCompilerFlags("-O");
-});
-
-task ("default", ["test"], function()
-{
-    printResults(configuration);
-});
-
-task ("build", ["default"]);
-
-task ("debug", function()
-{
-    ENV["CONFIGURATION"] = "Debug";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("release", function()
-{
-    ENV["CONFIGURATION"] = "Release";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("run", ["debug"], function()
-{
-    OS.system(["open", FILE.join("Build", "Debug", "test", "index.html")]);
-});
-
-task ("run-release", ["release"], function()
-{
-    OS.system(["open", FILE.join("Build", "Release", "test", "index.html")]);
-});
-
-task ("deploy", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Deployment", "test"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "test"), FILE.join("Build", "Deployment", "test")]);
-    printResults("Deployment")
-});
-
-task ("desktop", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Desktop", "test"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "test"), FILE.join("Build", "Desktop", "test", "test.app"));
-    printResults("Desktop")
-});
-
-task ("run-desktop", ["desktop"], function()
-{
-    OS.system([FILE.join("Build", "Desktop", "test", "test.app", "Contents", "MacOS", "NativeHost"), "-i"]);
-});
-
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "test"));
-    print("----------------------------");
-}

Tests/Manual/CPColor-CPImage-description/Resources/MainMenu.xib

@@ -1,654 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="372"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">7</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{335, 370}, {389, 380}}</string>
-				<int key="NSWTFlags">1946157056</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSCustomView" id="1066696903">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 297}, {159, 36}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<string key="NSClassName">NSView</string>
-						</object>
-						<object class="NSTextField" id="385245898">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{47, 307}, {82, 17}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="12386750">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Simple color</string>
-								<object class="NSFont" key="NSSupport" id="710279137">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="385245898"/>
-								<object class="NSColor" key="NSBackgroundColor" id="616930867">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="968014435">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-						</object>
-						<object class="NSCustomView" id="605260233">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 243}, {159, 36}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<string key="NSClassName">NSView</string>
-						</object>
-						<object class="NSTextField" id="179895693">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{47, 253}, {85, 17}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="222300836">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Pattern color</string>
-								<reference key="NSSupport" ref="710279137"/>
-								<reference key="NSControlView" ref="179895693"/>
-								<reference key="NSBackgroundColor" ref="616930867"/>
-								<reference key="NSTextColor" ref="968014435"/>
-							</object>
-						</object>
-						<object class="NSCustomView" id="688674788">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 186}, {159, 36}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<string key="NSClassName">NSView</string>
-						</object>
-						<object class="NSTextField" id="63869060">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{47, 196}, {85, 17}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="828490958">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">3-part color</string>
-								<reference key="NSSupport" ref="710279137"/>
-								<reference key="NSControlView" ref="63869060"/>
-								<reference key="NSBackgroundColor" ref="616930867"/>
-								<reference key="NSTextColor" ref="968014435"/>
-							</object>
-						</object>
-						<object class="NSCustomView" id="100716157">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{151, 130}, {159, 36}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<string key="NSClassName">NSView</string>
-						</object>
-						<object class="NSTextField" id="488609560">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{47, 140}, {85, 17}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="548167261">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">9-part color</string>
-								<reference key="NSSupport" ref="710279137"/>
-								<reference key="NSControlView" ref="488609560"/>
-								<reference key="NSBackgroundColor" ref="616930867"/>
-								<reference key="NSTextColor" ref="968014435"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="696346150">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{47, 84}, {85, 17}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="30856995">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Image</string>
-								<reference key="NSSupport" ref="710279137"/>
-								<reference key="NSControlView" ref="696346150"/>
-								<reference key="NSBackgroundColor" ref="616930867"/>
-								<reference key="NSTextColor" ref="968014435"/>
-							</object>
-						</object>
-						<object class="NSImageView" id="276994718">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<object class="NSMutableSet" key="NSDragTypes">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="set.sortedObjects">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>Apple PDF pasteboard type</string>
-									<string>Apple PICT pasteboard type</string>
-									<string>Apple PNG pasteboard type</string>
-									<string>NSFilenamesPboardType</string>
-									<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-									<string>NeXT TIFF v4.0 pasteboard type</string>
-								</object>
-							</object>
-							<string key="NSFrame">{{148, 68}, {48, 48}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSImageCell" key="NSCell" id="334634827">
-								<int key="NSCellFlags">130560</int>
-								<int key="NSCellFlags2">33554432</int>
-								<int key="NSAlign">0</int>
-								<int key="NSScale">2</int>
-								<int key="NSStyle">0</int>
-								<bool key="NSAnimates">NO</bool>
-							</object>
-							<bool key="NSEditable">YES</bool>
-						</object>
-					</object>
-					<string key="NSFrameSize">{389, 380}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
-			<object class="NSCustomObject" id="635946545">
-				<string key="NSClassName">AppController</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="635946545"/>
-					</object>
-					<int key="connectionID">451</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">theWindow</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">459</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">ninePartColor</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="100716157"/>
-					</object>
-					<int key="connectionID">480</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">threePartColor</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="688674788"/>
-					</object>
-					<int key="connectionID">481</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">patternColor</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="605260233"/>
-					</object>
-					<int key="connectionID">482</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">simpleColor</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="1066696903"/>
-					</object>
-					<int key="connectionID">483</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">imageView</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="276994718"/>
-					</object>
-					<int key="connectionID">490</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="439893737"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="385245898"/>
-							<reference ref="1066696903"/>
-							<reference ref="605260233"/>
-							<reference ref="179895693"/>
-							<reference ref="688674788"/>
-							<reference ref="63869060"/>
-							<reference ref="100716157"/>
-							<reference ref="488609560"/>
-							<reference ref="696346150"/>
-							<reference ref="276994718"/>
-						</object>
-						<reference key="parent" ref="972006081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">450</int>
-						<reference key="object" ref="635946545"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">468</int>
-						<reference key="object" ref="1066696903"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">469</int>
-						<reference key="object" ref="385245898"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="12386750"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">470</int>
-						<reference key="object" ref="12386750"/>
-						<reference key="parent" ref="385245898"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">471</int>
-						<reference key="object" ref="605260233"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">472</int>
-						<reference key="object" ref="179895693"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="222300836"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">473</int>
-						<reference key="object" ref="222300836"/>
-						<reference key="parent" ref="179895693"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">474</int>
-						<reference key="object" ref="688674788"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">475</int>
-						<reference key="object" ref="63869060"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="828490958"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">476</int>
-						<reference key="object" ref="828490958"/>
-						<reference key="parent" ref="63869060"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">477</int>
-						<reference key="object" ref="100716157"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">478</int>
-						<reference key="object" ref="488609560"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="548167261"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">479</int>
-						<reference key="object" ref="548167261"/>
-						<reference key="parent" ref="488609560"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">485</int>
-						<reference key="object" ref="696346150"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="30856995"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">486</int>
-						<reference key="object" ref="30856995"/>
-						<reference key="parent" ref="696346150"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">487</int>
-						<reference key="object" ref="276994718"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="334634827"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">488</int>
-						<reference key="object" ref="334634827"/>
-						<reference key="parent" ref="276994718"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-3.IBPluginDependency</string>
-					<string>371.IBEditorWindowLastContentRect</string>
-					<string>371.IBPluginDependency</string>
-					<string>371.IBViewEditorWindowController.showingBoundsRectangles</string>
-					<string>371.IBViewEditorWindowController.showingLayoutRectangles</string>
-					<string>371.IBWindowTemplateEditedContentRect</string>
-					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>371.editorWindowContentRectSynchronizationRect</string>
-					<string>372.IBPluginDependency</string>
-					<string>468.IBPluginDependency</string>
-					<string>468.IBViewBoundsToFrameTransform</string>
-					<string>469.IBPluginDependency</string>
-					<string>469.IBViewBoundsToFrameTransform</string>
-					<string>470.IBPluginDependency</string>
-					<string>471.IBPluginDependency</string>
-					<string>471.IBViewBoundsToFrameTransform</string>
-					<string>472.IBPluginDependency</string>
-					<string>472.IBViewBoundsToFrameTransform</string>
-					<string>473.IBPluginDependency</string>
-					<string>474.IBPluginDependency</string>
-					<string>474.IBViewBoundsToFrameTransform</string>
-					<string>475.IBPluginDependency</string>
-					<string>475.IBViewBoundsToFrameTransform</string>
-					<string>476.IBPluginDependency</string>
-					<string>477.IBPluginDependency</string>
-					<string>477.IBViewBoundsToFrameTransform</string>
-					<string>478.IBPluginDependency</string>
-					<string>478.IBViewBoundsToFrameTransform</string>
-					<string>479.IBPluginDependency</string>
-					<string>485.IBPluginDependency</string>
-					<string>485.IBViewBoundsToFrameTransform</string>
-					<string>486.IBPluginDependency</string>
-					<string>487.IBPluginDependency</string>
-					<string>488.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{432, 718}, {389, 380}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<boolean value="YES"/>
-					<boolean value="YES"/>
-					<string>{{432, 718}, {389, 380}}</string>
-					<integer value="1"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUMXAABDm4AAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCPAAAw6gAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUMXAABDgIAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCPAAAw40AAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUMXAABDSAAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCPAAAw2EAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUMXAABDAgAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCPAAAwxsAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCUAAAwxYAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">490</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">theWindow</string>
-						<string key="NS.object.0">NSWindow</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">theWindow</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">theWindow</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>imageView</string>
-							<string>ninePartColor</string>
-							<string>patternColor</string>
-							<string>simpleColor</string>
-							<string>threePartColor</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>imageView</string>
-							<string>ninePartColor</string>
-							<string>patternColor</string>
-							<string>simpleColor</string>
-							<string>threePartColor</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">imageView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">ninePartColor</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">patternColor</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">simpleColor</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">threePartColor</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>

Tests/Manual/CPColor-CPImage-description/index-debug.html

@@ -1,103 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index-debug.html
- test
-
- Created by aparajita on May 19, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>CPColor-CPImage-description</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
-        </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:
-
-            // 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);
-        </script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading test...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/CPColor-CPImage-description/index.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index.html
- test
-
- Created by aparajita on May 19, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>CPColor-CPImage-description</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading test...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/CPColor-CPImage-description/main.j

@@ -1,18 +0,0 @@
-/*
- * AppController.j
- * test
- *
- * Created by aparajita on May 19, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
-
-@import "AppController.j"
-
-
-function main(args, namedArgs)
-{
-    CPApplicationMain(args, namedArgs);
-}

Tests/Manual/CPFormatterTest/AppController.j

@@ -1,205 +0,0 @@
-/*
- * AppController.j
- * CPFormatterTest
- *
- * Created by aparajita on June 30, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-@import "DateFormatter.j"
-
-var RecordData = [
-        {name:"Tom", age:34},
-        {name:"Dick", age:27},
-        {name:"Harry", age:50}
-    ];
-
-var randomFromTo = function(from, to)
-{
-    return Math.floor(Math.random() * (to - from + 1) + from);
-};
-
-@implementation AppController : CPObject
-{
-    CPWindow        theWindow;
-    CPTextField     dateField1;
-    CPTextField     dateField2;
-    CPTextField     error1;
-    CPTextField     textField;
-    CPTextField     error2;
-    CPTextField     recordField;
-    CPPopUpButton   recordMenu;
-}
-
-- (void)awakeFromCib
-{
-    [theWindow setInitialFirstResponder:dateField1];
-    [dateField1 setFormatter:[DateFormatter formatterWithDisplayFormat:@"D M jS, Y" editingFormat:@"m/j/Y" emptyIsValid:NO]];
-    [dateField2 setFormatter:[DateFormatter formatterWithDisplayFormat:@"m-d-Y" editingFormat:@"m-d-Y" emptyIsValid:YES]];
-    [dateField2 setDelegate:self];
-
-    [[CPNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(resetErrorMessage:)
-                                                 name:CPTextFieldDidFocusNotification
-                                               object:nil];
-
-    [textField setFormatter:[TextFormatter new]];
-    [textField setDelegate:self];
-
-    [error1 setStringValue:@""];
-    [error2 setStringValue:@""];
-
-    [recordField setFormatter:[ContactFormatter new]];
-    [recordField setObjectValue:RecordData[0]];
-}
-
-- (void)selectRecord:(id)sender
-{
-    var record = RecordData[[sender selectedIndex]];
-
-    [recordField setObjectValue:record];
-}
-
-- (void)setDate1:(id)sender
-{
-    [self setDate:dateField1];
-}
-
-- (void)setDate2:(id)sender
-{
-    [self setDate:dateField2];
-}
-
-- (void)setDate:(CPTextField)field
-{
-    var date = new Date(randomFromTo(1931, 2012), randomFromTo(0, 11), randomFromTo(1, 31));
-
-    [field setObjectValue:date];
-}
-
-- (void)objectValue1:(id)sender
-{
-    CPLog.info("Date 1: %s", [[dateField1 objectValue] description]);
-}
-
-- (void)objectValue2:(id)sender
-{
-    CPLog.info("Date 2: %s", [[dateField2 objectValue] description]);
-}
-
-- (void)setNil:(id)sender
-{
-    [dateField1 setStringValue:nil];  // should log a warning and do nothing
-}
-
-- (void)setEmptyOK:(id)sender
-{
-    [[dateField2 formatter] setEmptyIsValid:[sender state] === CPOnState];
-}
-
-- (void)controlTextDidChange:(CPNotification)aNotification
-{
-    var field = [aNotification object],
-        error;
-
-    if (field === dateField2)
-        error = error1;
-    else if (field === textField)
-        error = error2;
-
-    [error setStringValue:@""];
-}
-
-- (BOOL)control:(CPControl)aControl didFailToFormatString:(CPString)aString errorDescription:(CPString)anError
-{
-    CPLog.info("control:didFailToFormatString:%s errorDescription:%s", aString, anError);
-
-    if (anError)
-    {
-        var error;
-
-        if (aControl === dateField2)
-            error = error1;
-        else if (aControl === textField)
-            error = error2;
-
-        [error setStringValue:anError];
-    }
-
-    return NO;
-}
-
-- (void)resetErrorMessage:(CPNotification)aNotification
-{
-    [error2 setStringValue:@""];
-}
-
-@end
-
-
-@implementation TextFormatter : CPFormatter
-
-- (CPString)stringForObjectValue:(id)anObject
-{
-    var result;
-
-    if ([anObject isKindOfClass:[CPString class]])
-        result = [self errorDescriptionForString:anObject] === nil ? anObject : nil;
-    else
-        result = nil;
-
-    console.log("stringForObjectValue:%s ==> %s", [anObject description], result);
-    return result;
-}
-
-- (BOOL)getObjectValue:(CPStringRef)anObject forString:(CPString)aString errorDescription:(CPStringRef)anError
-{
-    var error = [self errorDescriptionForString:aString];
-
-    if (error)
-    {
-        anObject(nil);
-
-        if (anError)
-            anError(error);
-    }
-    else
-        anObject(aString);
-
-    result = error === nil;
-
-    console.log("getObjectValue:forString:%s ==> %s", aString, result);
-    return result;
-}
-
-- (CPString)errorDescriptionForString:(CPString)aString
-{
-    if (aString.length > 7)
-        return @"Maximum length is 7 characters.";
-    else if (!/^[a-zA-Z0-9]*$/.test(aString))
-        return @"Invalid characters in string.";
-    else
-        return nil;
-}
-
-@end
-
-
-@implementation ContactFormatter : CPFormatter
-
-- (CPString)stringForObjectValue:(id)anObject
-{
-    if (anObject && typeof(anObject) === "object" && anObject.hasOwnProperty("name"))
-        return [CPString stringWithFormat:@"%s (age %d)", anObject.name, anObject.age];
-    else
-        return nil;
-}
-
-- (BOOL)getObjectValue:(CPStringRef)anObject forString:(CPString)aString errorDescription:(CPStringRef)anError
-{
-    // We don't support reverse conversion
-    return NO;
-}
-
-@end

Tests/Manual/CPFormatterTest/DateFormatter.j

@@ -1,125 +0,0 @@
-/*
- * AppController.j
- * CPFormatterTest
- *
- * Created by aparajita on July 6, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/CPFormatter.j>
-
-
-@implementation DateFormatter : CPFormatter
-{
-    CPString    displayFormat;
-    CPString    editingFormat;
-    BOOL        emptyIsValid @accessors(getter=isEmptyValid);
-}
-
-+ (DateFormatter)formatterWithDisplayFormat:(CPString)aDisplayFormat editingFormat:(CPString)anEditingFormat emptyIsValid:(BOOL)emptyValid
-{
-    return [[self alloc] initWithDisplayFormat:aDisplayFormat editingFormat:anEditingFormat emptyIsValid:emptyValid];
-}
-
-- (id)initWithDisplayFormat:(CPString)aDisplayFormat editingFormat:(CPString)anEditingFormat emptyIsValid:(BOOL)emptyValid
-{
-    self = [super init];
-
-    if (self)
-    {
-        displayFormat = aDisplayFormat;
-        editingFormat = anEditingFormat;
-        emptyIsValid = emptyValid;
-    }
-
-    return self;
-}
-
-- (CPString)stringForObjectValue:(id)anObject
-{
-    var result;
-
-    if ([anObject isKindOfClass:[CPDate class]])
-        result = anObject.dateFormat(displayFormat);
-    else
-        result = nil;
-
-    console.log("stringForObjectValue:%s ==> %s", [anObject description], result);
-    return result;
-}
-
-- (CPString)editingStringForObjectValue:(id)anObject
-{
-    var result;
-
-    if ([anObject isKindOfClass:[CPDate class]])
-        result = anObject.dateFormat(editingFormat);
-    else
-        result = nil;
-
-    console.log("editingStringForObjectValue:%s ==> %s", [anObject description], result);
-    return result;
-}
-
-- (BOOL)getObjectValue:(CPStringRef)anObject forString:(CPString)aString errorDescription:(CPStringRef)anError
-{
-    var result;
-
-    if (anError)
-        anError(nil);
-
-    if (aString.length === 0)
-    {
-        anObject(nil);
-        result = emptyIsValid;
-
-        if (anError)
-            anError(@"Please enter a date.");
-    }
-    else
-    {
-        var date = Date.parseDate(aString, editingFormat);
-
-        anObject(date);
-
-        if (date === nil && anError)
-            anError(@"Invalid date format.");
-
-        result = date !== nil;
-    }
-
-    console.log("getObjectValue:forString:%s ==> %s", aString, result);
-    return result;
-}
-
-@end
-
-var DateFormatterDisplayFormatKey = @"DateFormatterDisplayFormatKey",
-    DateFormatterEditingFormatKey = @"DateFormatterEditingFormatKey",
-    DateFormatterEmptyIsValidKey = @"DateFormatterEmptyIsValidKey";
-
-@implementation DateFormatter (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        displayFormat = [aCoder decodeObjectForKey:DateFormatterDisplayFormatKey];
-        editingFormat = [aCoder decodeObjectForKey:DateFormatterEditingFormatKey];
-        emptyIsValid = [aCoder decodeObjectForKey:DateFormatterEmptyIsValidKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    [aCoder encodeObject:displayFormat forKey:DateFormatterDisplayFormatKey];
-    [aCoder encodeObject:editingFormat forKey:DateFormatterEditingFormatKey];
-    [aCoder encodeObject:emptyIsValid forKey:DateFormatterEmptyIsValidKey];
-}
-
-@end

Tests/Manual/CPFormatterTest/Info.plist

@@ -1,10 +0,0 @@
-<?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>CPFormatterTest</string>
-</dict>
-</plist>

Tests/Manual/CPFormatterTest/Jakefile

@@ -1,94 +0,0 @@
-/*
- * Jakefile
- * CPFormatterTest
- *
- * Created by aparajita on June 30, 2011.
- * Copyright 2011, Victory-Heart Productions 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");
-
-app ("CPFormatterTest", function(task)
-{
-    task.setBuildIntermediatesPath(FILE.join("Build", "CPFormatterTest.build", configuration));
-    task.setBuildPath(FILE.join("Build", configuration));
-
-    task.setProductName("CPFormatterTest");
-    task.setIdentifier("com.aparajita.CPFormatterTest");
-    task.setVersion("1.0");
-    task.setAuthor("Victory-Heart Productions");
-    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("CPFormatterTest");
-    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/**"));
-    task.setIndexFilePath("index.html");
-    task.setInfoPlistPath("Info.plist");
-    task.setNib2CibFlags("-R Resources/");
-
-    if (configuration === "Debug")
-        task.setCompilerFlags("-DDEBUG -g");
-    else
-        task.setCompilerFlags("-O");
-});
-
-task ("default", ["CPFormatterTest"], function()
-{
-    printResults(configuration);
-});
-
-task ("build", ["default"]);
-
-task ("debug", function()
-{
-    ENV["CONFIGURATION"] = "Debug";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("release", function()
-{
-    ENV["CONFIGURATION"] = "Release";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("run", ["debug"], function()
-{
-    OS.system(["open", FILE.join("Build", "Debug", "CPFormatterTest", "index.html")]);
-});
-
-task ("run-release", ["release"], function()
-{
-    OS.system(["open", FILE.join("Build", "Release", "CPFormatterTest", "index.html")]);
-});
-
-task ("deploy", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Deployment", "CPFormatterTest"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "CPFormatterTest"), FILE.join("Build", "Deployment", "CPFormatterTest")]);
-    printResults("Deployment")
-});
-
-task ("desktop", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Desktop", "CPFormatterTest"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPFormatterTest"), FILE.join("Build", "Desktop", "CPFormatterTest", "CPFormatterTest.app"));
-    printResults("Desktop")
-});
-
-task ("run-desktop", ["desktop"], function()
-{
-    OS.system([FILE.join("Build", "Desktop", "CPFormatterTest", "CPFormatterTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
-});
-
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPFormatterTest"));
-    print("----------------------------");
-}

Tests/Manual/CPFormatterTest/Resources/date-functions.js

@@ -1,471 +0,0 @@
-/*
- * http://code.google.com/p/flexible-js-formatting/
- * 
- * Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>
- *
- * 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.
- */
-
-Date.parseFunctions = {count:0};
-Date.parseRegexes = [];
-Date.formatFunctions = {count:0};
-
-Date.prototype.dateFormat = function(format, ignore_offset) {
-    if (Date.formatFunctions[format] == null) {
-        Date.createNewFormat(format);
-    }
-    var func = Date.formatFunctions[format];
-    if (ignore_offset || ! this.offset) {
-      return this[func]();
-    } else {
-      return (new Date(this.valueOf() - this.offset))[func]();
-    }
-};
-
-Date.createNewFormat = function(format) {
-    var funcName = "format" + Date.formatFunctions.count++;
-    Date.formatFunctions[format] = funcName;
-    var code = "Date.prototype." + funcName + " = function(){return ";
-    var special = false;
-    var ch = '';
-    for (var i = 0; i < format.length; ++i) {
-        ch = format.charAt(i);
-		// escape character start
-        if (!special && ch == "\\") {
-            special = true;
-        }
-		// escaped string
-        else if (!special && ch == '"') {
-			var end = format.indexOf('"', i+1);
-			if (end==-1)
-			{
-				end = format.length;
-			}
-            code += "'" + String.escape(format.substring(i+1, end)) + "' + ";
-			i = end;
-        }
-		// escaped character
-        else if (special) {
-            special = false;
-            code += "'" + String.escape(ch) + "' + ";
-        }
-        else {
-            code += Date.getFormatCode(ch);
-        }
-    }
-    eval(code.substring(0, code.length - 3) + ";}");
-};
-
-Date.getFormatCode = function(character) {
-    switch (character) {
-    case "d":
-        return "String.leftPad(this.getDate(), 2, '0') + ";
-    case "D":
-        return "Date.dayNames[this.getDay()].substring(0, 3) + ";
-    case "j":
-        return "this.getDate() + ";
-    case "l":
-        return "Date.dayNames[this.getDay()] + ";
-    case "S":
-        return "this.getSuffix() + ";
-    case "w":
-        return "this.getDay() + ";
-    case "z":
-        return "this.getDayOfYear() + ";
-    case "W":
-        return "this.getWeekOfYear() + ";
-    case "F":
-        return "Date.monthNames[this.getMonth()] + ";
-    case "m":
-        return "String.leftPad(this.getMonth() + 1, 2, '0') + ";
-    case "M":
-        return "Date.monthNames[this.getMonth()].substring(0, 3) + ";
-    case "n":
-        return "(this.getMonth() + 1) + ";
-    case "t":
-        return "this.getDaysInMonth() + ";
-    case "L":
-        return "(this.isLeapYear() ? 1 : 0) + ";
-    case "Y":
-        return "this.getFullYear() + ";
-    case "y":
-        return "('' + this.getFullYear()).substring(2, 4) + ";
-    case "a":
-        return "(this.getHours() < 12 ? 'am' : 'pm') + ";
-    case "A":
-        return "(this.getHours() < 12 ? 'AM' : 'PM') + ";
-    case "g":
-        return "((this.getHours() %12) ? this.getHours() % 12 : 12) + ";
-    case "G":
-        return "this.getHours() + ";
-    case "h":
-        return "String.leftPad((this.getHours() %12) ? this.getHours() % 12 : 12, 2, '0') + ";
-    case "H":
-        return "String.leftPad(this.getHours(), 2, '0') + ";
-    case "i":
-        return "String.leftPad(this.getMinutes(), 2, '0') + ";
-    case "s":
-        return "String.leftPad(this.getSeconds(), 2, '0') + ";
-    case "X":
-        return "String.leftPad(this.getMilliseconds(), 3, '0') + ";
-    case "O":
-        return "this.getGMTOffset() + ";
-    case "T":
-        return "this.getTimezone() + ";
-    case "Z":
-        return "(this.getTimezoneOffset() * -60) + ";
-    case "q":	// quarter num, Q for name?
-        return "this.getQuarter() + ";
-    default:
-        return "'" + String.escape(character) + "' + ";
-    }
-};
-
-Date.parseDate = function(input, format) {
-    if (Date.parseFunctions[format] == null) {
-        Date.createParser(format);
-    }
-    var func = Date.parseFunctions[format];
-    return Date[func](input);
-};
-
-Date.createParser = function(format) {
-    var funcName = "parse" + Date.parseFunctions.count++;
-    var regexNum = Date.parseRegexes.length;
-    var currentGroup = 1;
-    Date.parseFunctions[format] = funcName;
-
-    var code = "Date." + funcName + " = function(input){\n"
-        + "var y = -1, m = -1, d = -1, h = -1, i = -1, s = -1, ms = -1, z = 0;\n"
-        + "var d = new Date();\n"
-        + "y = d.getFullYear();\n"
-        + "m = d.getMonth();\n"
-        + "d = d.getDate();\n"
-        + "var results = input.match(Date.parseRegexes[" + regexNum + "]);\n"
-        + "if (results && results.length > 0) {" ;
-    var regex = "";
-
-    var special = false;
-    var ch = '';
-    for (var i = 0; i < format.length; ++i) {
-        ch = format.charAt(i);
-        if (!special && ch == "\\") {
-            special = true;
-        }
-        else if (special) {
-            special = false;
-            regex += String.escape(ch);
-        }
-        else {
-            obj = Date.formatCodeToRegex(ch, currentGroup);
-            currentGroup += obj.g;
-            regex += obj.s;
-            if (obj.g && obj.c) {
-                code += obj.c;
-            }
-        }
-    }
-
-    code += "if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0 && ms >= 0)\n"
-        + "{return new Date(y, m, d, h, i, s, ms).applyOffset(z);}\n"
-        + "if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n"
-        + "{return new Date(y, m, d, h, i, s).applyOffset(z);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n"
-        + "{return new Date(y, m, d, h, i).applyOffset(z);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0)\n"
-        + "{return new Date(y, m, d, h).applyOffset(z);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0)\n"
-        + "{return new Date(y, m, d).applyOffset(z);}\n"
-        + "else if (y > 0 && m >= 0)\n"
-        + "{return new Date(y, m).applyOffset(z);}\n"
-        + "else if (y > 0)\n"
-        + "{return new Date(y).applyOffset(z);}\n"
-        + "}return null;}";
-
-    Date.parseRegexes[regexNum] = new RegExp("^" + regex + "$");
-    eval(code);
-};
-
-Date.formatCodeToRegex = function(character, currentGroup) {
-    switch (character) {
-    case "D":
-        return {g:0,
-        c:null,
-        s:"(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)"};
-    case "j":
-    case "d":
-        return {g:1,
-            c:"d = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{1,2})"};
-    case "l":
-        return {g:0,
-            c:null,
-            s:"(?:" + Date.dayNames.join("|") + ")"};
-    case "S":
-        return {g:0,
-            c:null,
-            s:"(?:st|nd|rd|th)"};
-    case "w":
-        return {g:0,
-            c:null,
-            s:"\\d"};
-    case "z":
-        return {g:0,
-            c:null,
-            s:"(?:\\d{1,3})"};
-    case "W":
-        return {g:0,
-            c:null,
-            s:"(?:\\d{2})"};
-    case "F":
-        return {g:1,
-            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "].substring(0, 3)], 10);\n",
-            s:"(" + Date.monthNames.join("|") + ")"};
-    case "M":
-        return {g:1,
-            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "]], 10);\n",
-            s:"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"};
-    case "n":
-    case "m":
-        return {g:1,
-            c:"m = parseInt(results[" + currentGroup + "], 10) - 1;\n",
-            s:"(\\d{1,2})"};
-    case "t":
-        return {g:0,
-            c:null,
-            s:"\\d{1,2}"};
-    case "L":
-        return {g:0,
-            c:null,
-            s:"(?:1|0)"};
-    case "Y":
-        return {g:1,
-            c:"y = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{4})"};
-    case "y":
-        return {g:1,
-            c:"var ty = parseInt(results[" + currentGroup + "], 10);\n"
-                + "y = ty > Date.y2kYear ? 1900 + ty : 2000 + ty;\n",
-            s:"(\\d{1,2})"};
-    case "a":
-        return {g:1,
-            c:"if (results[" + currentGroup + "] == 'am') {\n"
-                + "if (h == 12) { h = 0; }\n"
-                + "} else { if (h < 12) { h += 12; }}",
-            s:"(am|pm)"};
-    case "A":
-        return {g:1,
-            c:"if (results[" + currentGroup + "] == 'AM') {\n"
-                + "if (h == 12) { h = 0; }\n"
-                + "} else { if (h < 12) { h += 12; }}",
-            s:"(AM|PM)"};
-    case "g":
-    case "G":
-    case "h":
-    case "H":
-        return {g:1,
-            c:"h = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{1,2})"};
-    case "i":
-        return {g:1,
-            c:"i = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{2})"};
-    case "s":
-        return {g:1,
-            c:"s = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{2})"};
-    case "X":
-      return {g:1,
-          c:"ms = parseInt(results[" + currentGroup + "], 10);\n",
-          s:"(\\d{3})"};
-    case "O":
-    case "P":
-        return {g:1,
-            c:"z = Date.parseOffset(results[" + currentGroup + "], 10);\n",
-            s:"(Z|[+-]\\d{2}:?\\d{2})"}; // "Z", "+05:00", "+0500" all acceptable.
-    case "T":
-        return {g:0,
-            c:null,
-            s:"[A-Z]{3}"};
-    case "Z":
-        return {g:1,
-            c:"s = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"([+-]\\d{1,5})"};
-    default:
-        return {g:0,
-            c:null,
-            s:String.escape(character)};
-    }
-};
-
-Date.parseOffset = function(str) {
-  if (str == "Z") { return 0 ; } // UTC, no offset.
-  var seconds ;
-  seconds = parseInt(str[0] + str[1] + str[2]) * 3600 ; // e.g., "+05" or "-08"
-  if (str[3] == ":") {            // "+HH:MM" is preferred iso8601 format ("O")
-    seconds += parseInt(str[4] + str[5]) * 60;
-  } else {                      // "+HHMM" is frequently used, though. ("P")
-    seconds += parseInt(str[3] + str[4]) * 60;
-  }
-  return seconds ;
-};
-
-// convert the parsed date into UTC, but store the offset so we can optionally use it in dateFormat()
-Date.prototype.applyOffset = function(offset_seconds) {
-  this.offset = offset_seconds * 1000 ;
-  this.setTime(this.valueOf() + this.offset);
-  return this ;
-};
-
-Date.prototype.getTimezone = function() {
-    return this.toString().replace(
-        /^.*? ([A-Z]{3}) [0-9]{4}.*$/, "$1").replace(
-        /^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, "$1$2$3").replace(
-        /^.*?[0-9]{4} \(([A-Z]{3})\)/, "$1");
-};
-
-Date.prototype.getGMTOffset = function() {
-    return (this.getTimezoneOffset() > 0 ? "-" : "+")
-        + String.leftPad(Math.floor(this.getTimezoneOffset() / 60), 2, "0")
-        + String.leftPad(this.getTimezoneOffset() % 60, 2, "0");
-};
-
-Date.prototype.getDayOfYear = function() {
-    var num = 0;
-    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
-    for (var i = 0; i < this.getMonth(); ++i) {
-        num += Date.daysInMonth[i];
-    }
-    return num + this.getDate() - 1;
-};
-
-Date.prototype.getWeekOfYear = function() {
-    // Skip to Thursday of this week
-    var now = this.getDayOfYear() + (4 - this.getDay());
-    // Find the first Thursday of the year
-    var jan1 = new Date(this.getFullYear(), 0, 1);
-    var then = (7 - jan1.getDay() + 4);
-    document.write(then);
-    return String.leftPad(((now - then) / 7) + 1, 2, "0");
-};
-
-Date.prototype.isLeapYear = function() {
-    var year = this.getFullYear();
-    return ((year & 3) == 0 && (year % 100 || (year % 400 == 0 && year)));
-};
-
-Date.prototype.getFirstDayOfMonth = function() {
-    var day = (this.getDay() - (this.getDate() - 1)) % 7;
-    return (day < 0) ? (day + 7) : day;
-};
-
-Date.prototype.getLastDayOfMonth = function() {
-    var day = (this.getDay() + (Date.daysInMonth[this.getMonth()] - this.getDate())) % 7;
-    return (day < 0) ? (day + 7) : day;
-};
-
-Date.prototype.getDaysInMonth = function() {
-    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
-    return Date.daysInMonth[this.getMonth()];
-};
-Date.prototype.getQuarter = function() {
-    return Date.quarterFromMonthNum[this.getMonth()];
-};
-
-Date.prototype.getSuffix = function() {
-    switch (this.getDate()) {
-        case 1:
-        case 21:
-        case 31:
-            return "st";
-        case 2:
-        case 22:
-            return "nd";
-        case 3:
-        case 23:
-            return "rd";
-        default:
-            return "th";
-    }
-};
-
-String.escape = function(string) {
-    return string.replace(/('|\\)/g, "\\$1");
-};
-
-String.leftPad = function (val, size, ch) {
-    var result = new String(val);
-    if (ch == null) {
-        ch = " ";
-    }
-    while (result.length < size) {
-        result = ch + result;
-    }
-    return result;
-};
-
-Date.quarterFromMonthNum = [1,1,1,2,2,2,3,3,3,4,4,4];
-Date.daysInMonth = [31,28,31,30,31,30,31,31,30,31,30,31];
-Date.monthNames =
-   ["January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December"];
-Date.dayNames =
-   ["Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"];
-Date.y2kYear = 50;
-Date.monthNumbers = {
-    Jan:0,
-    Feb:1,
-    Mar:2,
-    Apr:3,
-    May:4,
-    Jun:5,
-    Jul:6,
-    Aug:7,
-    Sep:8,
-    Oct:9,
-    Nov:10,
-    Dec:11};
-Date.patterns = {
-    ISO8601LongPattern: "Y\\-m\\-d\\TH\\:i\\:sO",
-    ISO8601ShortPattern: "Y\\-m\\-d",
-    ShortDatePattern: "n/j/Y",
-    LongDatePattern: "l, F d, Y",
-    FullDateTimePattern: "l, F d, Y g:i:s A",
-    MonthDayPattern: "F d",
-    ShortTimePattern: "g:i A",
-    LongTimePattern: "g:i:s A",
-    SortableDateTimePattern: "Y-m-d\\TH:i:s",
-    UniversalSortableDateTimePattern: "Y-m-d H:i:sO",
-    YearMonthPattern: "F, Y"};

Tests/Manual/CPFormatterTest/index-debug.html

@@ -1,105 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index-debug.html
- CPFormatterTest
-
- Created by aparajita on June 30, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>CPFormatterTest</title>
-        
-        <script src="Resources/date-functions.js" type="text/javascript" charset="utf-8"></script>
-        
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
-        </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:
-
-            // 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);
-        </script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading CPFormatterTest...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/CPFormatterTest/index.html

@@ -1,79 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index.html
- CPFormatterTest
-
- Created by aparajita on June 30, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>CPFormatterTest</title>
-        
-        <script src="Resources/date-functions.js" type="text/javascript" charset="utf-8"></script>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading CPFormatterTest...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/CPFormatterTest/main.j

@@ -1,23 +0,0 @@
-/*
- * AppController.j
- * CPFormatterTest
- *
- * Created by aparajita on June 30, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
-
-@import "AppController.j"
-
-function formatter(aString, aLevel, aTitle)
-{
-    return aString;
-}
-
-function main(args, namedArgs)
-{
-    CPLogRegister(CPLogConsole, null, formatter);
-    CPApplicationMain(args, namedArgs);
-}

Tests/Manual/RuntimeAttributesTest/AppController.j

@@ -1,43 +0,0 @@
-/*
- * AppController.j
- * RuntimeAttributesTest
- *
- * Created by Aparajita Fishman on March 26, 2011.
- * Copyright 2009, 280 North, Inc. All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-
-
-@implementation AppController : CPObject
-{
-    CPWindow    theWindow; //this "outlet" is connected automatically by the Cib
-    CPView      firstResponder;
-}
-
-- (void)applicationDidFinishLaunching:(CPNotification)aNotification
-{
-    // This is called when the application is done loading.
-}
-
-- (void)awakeFromCib
-{
-    // This is called when the cib is done loading.
-    // You can implement this method on any object instantiated from a Cib.
-    // It's a useful hook for setting up current UI values, and other things.
-
-    // In this case, we want the window from Cib to become our full browser window
-    //[theWindow setFullPlatformWindow:YES];
-}
-
-- (void)setInitialResponder:(CPInteger)tag
-{
-    [theWindow setInitialFirstResponder:[[theWindow contentView] viewWithTag:tag]];
-}
-
-- (void)setValue:(id)value forUndefinedKey:(CPString)key
-{
-    console.log("setValue:" + value + " forKey:" + key);
-}
-
-@end

Tests/Manual/RuntimeAttributesTest/Info.plist

@@ -1,10 +0,0 @@
-<?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>RuntimeAttributesTest</string>
-</dict>
-</plist>

Tests/Manual/RuntimeAttributesTest/Jakefile

@@ -1,94 +0,0 @@
-/*
- * Jakefile
- * test
- *
- * Created by aparajita on March 26, 2011.
- * Copyright 2011, Victory-Heart Productions 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");
-
-app ("test", function(task)
-{
-    task.setBuildIntermediatesPath(FILE.join("Build", "test.build", configuration));
-    task.setBuildPath(FILE.join("Build", configuration));
-
-    task.setProductName("test");
-    task.setIdentifier("com.aparajitaworld.test");
-    task.setVersion("1.0");
-    task.setAuthor("Victory-Heart Productions");
-    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("test");
-    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/**"));
-    task.setIndexFilePath("index.html");
-    task.setInfoPlistPath("Info.plist");
-    task.setNib2CibFlags("-R Resources/");
-
-    if (configuration === "Debug")
-        task.setCompilerFlags("-DDEBUG -g");
-    else
-        task.setCompilerFlags("-O");
-});
-
-task ("default", ["test"], function()
-{
-    printResults(configuration);
-});
-
-task ("build", ["default"]);
-
-task ("debug", function()
-{
-    ENV["CONFIGURATION"] = "Debug";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("release", function()
-{
-    ENV["CONFIGURATION"] = "Release";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("run", ["debug"], function()
-{
-    OS.system(["open", FILE.join("Build", "Debug", "test", "index.html")]);
-});
-
-task ("run-release", ["release"], function()
-{
-    OS.system(["open", FILE.join("Build", "Release", "test", "index.html")]);
-});
-
-task ("deploy", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Deployment", "test"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "test"), FILE.join("Build", "Deployment", "test")]);
-    printResults("Deployment")
-});
-
-task ("desktop", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Desktop", "test"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "test"), FILE.join("Build", "Desktop", "test", "test.app"));
-    printResults("Desktop")
-});
-
-task ("run-desktop", ["desktop"], function()
-{
-    OS.system([FILE.join("Build", "Desktop", "test", "test.app", "Contents", "MacOS", "NativeHost"), "-i"]);
-});
-
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "test"));
-    print("----------------------------");
-}

Tests/Manual/RuntimeAttributesTest/Resources/MainMenu.xib

@@ -1,609 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<integer value="24"/>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">NSObject</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="673890665">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSWindowTemplate" id="917316023">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{162, 992}, {548, 314}}</string>
-				<int key="NSWTFlags">611844096</int>
-				<string key="NSWindowTitle">RuntimeAttributes Test</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<object class="NSView" key="NSWindowView" id="412280178">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSButton" id="332976459">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{37, 187}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="941203667">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">button</string>
-								<object class="NSFont" key="NSSupport" id="28800349">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="332976459"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="361072273">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{37, 148}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="431597734">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">disabled</string>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="361072273"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSTextField" id="920139093">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{37, 99}, {118, 22}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<int key="NSTag">1</int>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="224672534">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="920139093"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<object class="NSColor" key="NSBackgroundColor" id="339930237">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textBackgroundColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="702864141">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textColor</string>
-									<object class="NSColor" key="NSColor" id="369941818">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-						</object>
-						<object class="NSTextField" id="138511613">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{37, 53}, {118, 22}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<int key="NSTag">2</int>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="515815898">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="138511613"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="339930237"/>
-								<reference key="NSTextColor" ref="702864141"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="957450672">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{179, 194}, {166, 17}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="536930828">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">This button's title was set</string>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="957450672"/>
-								<object class="NSColor" key="NSBackgroundColor" id="893262643">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="1038132650">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<reference key="NSColor" ref="369941818"/>
-								</object>
-							</object>
-						</object>
-						<object class="NSTextField" id="529909268">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{34, 249}, {389, 45}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1030502695">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">See the User Defined Runtime Attributes for each view below and for the AppController to see the effect.</string>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="529909268"/>
-								<reference key="NSBackgroundColor" ref="893262643"/>
-								<reference key="NSTextColor" ref="1038132650"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="1027602674">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{179, 156}, {166, 17}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="861810273">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">This button was disabled</string>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="1027602674"/>
-								<reference key="NSBackgroundColor" ref="893262643"/>
-								<reference key="NSTextColor" ref="1038132650"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="440736310">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{179, 101}, {255, 17}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="464063783">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">This ordinarily would be first responder</string>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="440736310"/>
-								<reference key="NSBackgroundColor" ref="893262643"/>
-								<reference key="NSTextColor" ref="1038132650"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="646490210">
-							<reference key="NSNextResponder" ref="412280178"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{179, 22}, {352, 51}}</string>
-							<reference key="NSSuperview" ref="412280178"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="393618729">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string type="base64-UTF8" key="NSContents">VGhpcyB3YXMgc2V0IHRvIGJlIGZpcnN0IHJlc3BvbmRlciBieSB0aGUKQXBwQ29udHJvbGxlciAtc2V0
-SW5pdGlhbEZpcnN0UmVzcG9uZGVyIG1ldGhvZA</string>
-								<reference key="NSSupport" ref="28800349"/>
-								<reference key="NSControlView" ref="646490210"/>
-								<reference key="NSBackgroundColor" ref="893262643"/>
-								<reference key="NSTextColor" ref="1038132650"/>
-							</object>
-						</object>
-					</array>
-					<string key="NSFrameSize">{548, 314}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="673890665"/>
-					</object>
-					<int key="connectionID">10</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">theWindow</string>
-						<reference key="source" ref="673890665"/>
-						<reference key="destination" ref="917316023"/>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="673890665"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">App Controller</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="917316023"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="412280178"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="412280178"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="332976459"/>
-							<reference ref="361072273"/>
-							<reference ref="920139093"/>
-							<reference ref="138511613"/>
-							<reference ref="1027602674"/>
-							<reference ref="440736310"/>
-							<reference ref="646490210"/>
-							<reference ref="957450672"/>
-							<reference ref="529909268"/>
-						</array>
-						<reference key="parent" ref="917316023"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="332976459"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="941203667"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">27</int>
-						<reference key="object" ref="941203667"/>
-						<reference key="parent" ref="332976459"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">32</int>
-						<reference key="object" ref="920139093"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="224672534"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">33</int>
-						<reference key="object" ref="224672534"/>
-						<reference key="parent" ref="920139093"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">34</int>
-						<reference key="object" ref="138511613"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="515815898"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">35</int>
-						<reference key="object" ref="515815898"/>
-						<reference key="parent" ref="138511613"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">36</int>
-						<reference key="object" ref="361072273"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="431597734"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">37</int>
-						<reference key="object" ref="431597734"/>
-						<reference key="parent" ref="361072273"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="957450672"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="536930828"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">40</int>
-						<reference key="object" ref="536930828"/>
-						<reference key="parent" ref="957450672"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">41</int>
-						<reference key="object" ref="1027602674"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="861810273"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="861810273"/>
-						<reference key="parent" ref="1027602674"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">43</int>
-						<reference key="object" ref="440736310"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="464063783"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="464063783"/>
-						<reference key="parent" ref="440736310"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">45</int>
-						<reference key="object" ref="646490210"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="393618729"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">46</int>
-						<reference key="object" ref="393618729"/>
-						<reference key="parent" ref="646490210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">47</int>
-						<reference key="object" ref="529909268"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1030502695"/>
-						</array>
-						<reference key="parent" ref="412280178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="1030502695"/>
-						<reference key="parent" ref="529909268"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="23.IBEditorWindowLastContentRect">{{719, 660}, {548, 314}}</string>
-				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="23.IBWindowTemplateEditedContentRect">{{719, 660}, {548, 314}}</string>
-				<boolean value="YES" key="23.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="26.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">IBUserDefinedRuntimeAttributesPlaceholderName</string>
-					<object class="IBUserDefinedRuntimeAttributesPlaceholder" key="NS.object.0">
-						<string key="name">IBUserDefinedRuntimeAttributesPlaceholderName</string>
-						<reference key="object" ref="332976459"/>
-						<array key="userDefinedRuntimeAttributes">
-							<object class="IBUserDefinedRuntimeAttribute">
-								<string key="typeIdentifier">com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.boolean</string>
-								<string key="keyPath">hidden</string>
-								<boolean value="NO" key="value"/>
-							</object>
-							<object class="IBUserDefinedRuntimeAttribute">
-								<string key="typeIdentifier">com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.string</string>
-								<string key="keyPath">title</string>
-								<string key="value">Hello!</string>
-							</object>
-						</array>
-					</object>
-				</object>
-				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="26.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABCDAAAw3IAAA</bytes>
-				</object>
-				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="32.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABCFAAAwsgAAA</bytes>
-				</object>
-				<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="34.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABCDAAAwtIAAA</bytes>
-				</object>
-				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="36.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">IBUserDefinedRuntimeAttributesPlaceholderName</string>
-					<object class="IBUserDefinedRuntimeAttributesPlaceholder" key="NS.object.0">
-						<string key="name">IBUserDefinedRuntimeAttributesPlaceholderName</string>
-						<reference key="object" ref="361072273"/>
-						<array key="userDefinedRuntimeAttributes">
-							<object class="IBUserDefinedRuntimeAttribute">
-								<string key="typeIdentifier">com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.boolean</string>
-								<string key="keyPath">enabled</string>
-								<boolean value="NO" key="value"/>
-							</object>
-						</array>
-					</object>
-				</object>
-				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="36.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABCDAAAw0sAAA</bytes>
-				</object>
-				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="39.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDMwAAwzwAAA</bytes>
-				</object>
-				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="41.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDMQAAw0oAAA</bytes>
-				</object>
-				<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="43.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDMQAAwxQAAA</bytes>
-				</object>
-				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="45.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDMQAAws4AAA</bytes>
-				</object>
-				<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="47.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABCCAAAw5MAAA</bytes>
-				</object>
-				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="9.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">IBUserDefinedRuntimeAttributesPlaceholderName</string>
-					<object class="IBUserDefinedRuntimeAttributesPlaceholder" key="NS.object.0">
-						<string key="name">IBUserDefinedRuntimeAttributesPlaceholderName</string>
-						<reference key="object" ref="673890665"/>
-						<array key="userDefinedRuntimeAttributes">
-							<object class="IBUserDefinedRuntimeAttribute">
-								<string key="typeIdentifier">com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.number</string>
-								<string key="keyPath">initialResponder</string>
-								<real value="2" key="value"/>
-							</object>
-							<object class="IBUserDefinedRuntimeAttribute">
-								<string key="typeIdentifier">com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.string</string>
-								<string key="keyPath">localized</string>
-								<string key="value">foo</string>
-								<bool key="localized">YES</bool>
-							</object>
-							<object class="IBUserDefinedRuntimeAttribute">
-								<string key="typeIdentifier">com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.nil</string>
-								<string key="keyPath">null</string>
-								<nil key="value"/>
-							</object>
-						</array>
-					</object>
-				</object>
-				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">48</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">theWindow</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">theWindow</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">theWindow</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">delegate</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">delegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">delegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3200" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>

Tests/Manual/RuntimeAttributesTest/index-debug.html

@@ -1,103 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index-debug.html
- test
-
- Created by aparajita on March 26, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>RuntimeAttributesTest</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
-        </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:
-
-            // 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);
-        </script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading test...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/RuntimeAttributesTest/index.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index.html
- test
-
- Created by aparajita on March 26, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>RuntimeAttributesTest</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading test...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/RuntimeAttributesTest/main.j

@@ -1,18 +0,0 @@
-/*
- * AppController.j
- * test
- *
- * Created by aparajita on March 26, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
-
-@import "AppController.j"
-
-
-function main(args, namedArgs)
-{
-    CPApplicationMain(args, namedArgs);
-}

Tests/Manual/performKeyEquivalentTest/AppController.j

@@ -1,145 +0,0 @@
-/*
- * AppController.j
- * performKeyEquivalentTest
- *
- * Created by aparajita on May 22, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-@import <AppKit/CPEvent.j>
-
-
-var usesNewCode = YES;
-
-@implementation AppController : CPObject
-{
-    CPWindow    theWindow;
-    CPWindow    theOtherWindow;
-    CPCheckBox  useNewCode;
-    CPTextField textField;
-}
-
-- (void)applicationDidFinishLaunching:(CPNotification)aNotification
-{
-    // This is called when the application is done loading.
-}
-
-- (void)awakeFromCib
-{
-    // This is called when the cib is done loading.
-    // You can implement this method on any object instantiated from a Cib.
-    // It's a useful hook for setting up current UI values, and other things.
-
-    [theOtherWindow orderFront:nil];
-    [theWindow setInitialFirstResponder:textField];
-    [theWindow makeKeyAndOrderFront:nil];
-}
-
-- (void)setUsesNewCode:(id)sender
-{
-    usesNewCode = [sender state] === CPOnState;
-}
-
-@end
-
-@implementation MyTextField : CPTextField
-
-- (void)keyDown:(CPEvent)anEvent
-{
-    CPLog("keyDown:%s", [self description]);
-
-    if (!usesNewCode)
-    {
-        if ([anEvent _couldBeKeyEquivalent] && [self performKeyEquivalent:anEvent])
-            return;
-    }
-
-    // CPTextField uses an HTML input element to take the input so we need to
-    // propagate the dom event so the element is updated. This has to be done
-    // before interpretKeyEvents: though so individual commands have a chance
-    // to override this (escape to clear the text in a search field for example).
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-
-    [self interpretKeyEvents:[anEvent]];
-
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}
-
-- (BOOL)performKeyEquivalent:(CPEvent)anEvent
-{
-    CPLog("performKeyEquivalent:%s", [self description]);
-
-    return [super performKeyEquivalent:anEvent];
-}
-
-@end
-
-@implementation CPEvent (test)
-
-- (BOOL)_couldBeKeyEquivalent
-{
-    if (_type !== CPKeyDown)
-        return NO;
-
-    var characterCount = _characters.length;
-
-    if (!characterCount)
-        return NO;
-
-    if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
-        return YES;
-
-    // Cocoa does not consider space, backspace, or escape a key equivalent
-    // if the first responder is a text field (presumably a subclass of NSText).
-    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
-
-    for (var i = 0; i < characterCount; i++)
-    {
-        if (usesNewCode)
-        {
-            var c = _characters.charAt(i);
-
-            if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-                c === CPEnterCharacter ||
-                c === CPNewlineCharacter ||
-                c === CPCarriageReturnCharacter ||
-                (!firstResponderIsText &&
-                    (c === CPSpaceFunctionKey ||
-                     c === CPDeleteCharacter ||
-                     c === CPBackspaceCharacter ||
-                     c === CPEscapeFunctionKey)))
-            {
-                return YES;
-            }
-        }
-        else
-        {
-            switch (_characters.charAt(i))
-            {
-                case CPBackspaceCharacter:
-                case CPDeleteCharacter:
-                case CPDeleteFunctionKey:
-                case CPTabCharacter:
-                case CPCarriageReturnCharacter:
-                case CPNewlineCharacter:
-                case CPSpaceFunctionKey:
-                case CPEscapeFunctionKey:
-                case CPPageUpFunctionKey:
-                case CPPageDownFunctionKey:
-                case CPLeftArrowFunctionKey:
-                case CPUpArrowFunctionKey:
-                case CPRightArrowFunctionKey:
-                case CPDownArrowFunctionKey:
-                case CPEndFunctionKey:
-                case CPHomeFunctionKey:
-                    return YES;
-            }
-        }
-    }
-
-    // FIXME: More cases?
-    return NO;
-}
-
-@end

Tests/Manual/performKeyEquivalentTest/Info.plist

@@ -1,10 +0,0 @@
-<?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>performKeyEquivalentTest</string>
-</dict>
-</plist>

Tests/Manual/performKeyEquivalentTest/Jakefile

@@ -1,94 +0,0 @@
-/*
- * Jakefile
- * performKeyEquivalentTest
- *
- * Created by aparajita on May 22, 2011.
- * Copyright 2011, Victory-Heart Productions 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");
-
-app ("performKeyEquivalentTest", function(task)
-{
-    task.setBuildIntermediatesPath(FILE.join("Build", "performKeyEquivalentTest.build", configuration));
-    task.setBuildPath(FILE.join("Build", configuration));
-
-    task.setProductName("performKeyEquivalentTest");
-    task.setIdentifier("com.aparajita.performKeyEquivalentTest");
-    task.setVersion("1.0");
-    task.setAuthor("Victory-Heart Productions");
-    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("performKeyEquivalentTest");
-    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/**"));
-    task.setIndexFilePath("index.html");
-    task.setInfoPlistPath("Info.plist");
-    task.setNib2CibFlags("-R Resources/");
-
-    if (configuration === "Debug")
-        task.setCompilerFlags("-DDEBUG -g");
-    else
-        task.setCompilerFlags("-O");
-});
-
-task ("default", ["performKeyEquivalentTest"], function()
-{
-    printResults(configuration);
-});
-
-task ("build", ["default"]);
-
-task ("debug", function()
-{
-    ENV["CONFIGURATION"] = "Debug";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("release", function()
-{
-    ENV["CONFIGURATION"] = "Release";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("run", ["debug"], function()
-{
-    OS.system(["open", FILE.join("Build", "Debug", "performKeyEquivalentTest", "index.html")]);
-});
-
-task ("run-release", ["release"], function()
-{
-    OS.system(["open", FILE.join("Build", "Release", "performKeyEquivalentTest", "index.html")]);
-});
-
-task ("deploy", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Deployment", "performKeyEquivalentTest"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "performKeyEquivalentTest"), FILE.join("Build", "Deployment", "performKeyEquivalentTest")]);
-    printResults("Deployment")
-});
-
-task ("desktop", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Desktop", "performKeyEquivalentTest"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "performKeyEquivalentTest"), FILE.join("Build", "Desktop", "performKeyEquivalentTest", "performKeyEquivalentTest.app"));
-    printResults("Desktop")
-});
-
-task ("run-desktop", ["desktop"], function()
-{
-    OS.system([FILE.join("Build", "Desktop", "performKeyEquivalentTest", "performKeyEquivalentTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
-});
-
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "performKeyEquivalentTest"));
-    print("----------------------------");
-}

Tests/Manual/performKeyEquivalentTest/Resources/MainMenu.xib

@@ -1,862 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="371"/>
-			<integer value="475"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">7</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{100, 1000}, {480, 360}}</string>
-				<int key="NSWTFlags">1946157056</int>
-				<string key="NSWindowTitle">Text + Buttons</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="160623561">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{189, 290}, {96, 22}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="46991665">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents"/>
-								<object class="NSFont" key="NSSupport" id="455972270">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="160623561"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<object class="NSColor" key="NSBackgroundColor" id="465635440">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textBackgroundColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="403720344">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-						</object>
-						<object class="NSTextField" id="215024340">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{189, 237}, {96, 22}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="894772288">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="215024340"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="465635440"/>
-								<reference key="NSTextColor" ref="403720344"/>
-							</object>
-						</object>
-						<object class="NSButton" id="962787846">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{187, 178}, {109, 18}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="679700256">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Use new code</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="962787846"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSSwitch</string>
-								</object>
-								<object class="NSButtonImageSource" key="NSAlternateImage">
-									<string key="NSImageName">NSSwitch</string>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="995743194">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{106, 99}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="599889457">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Escape</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="995743194"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="610457973">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{258, 99}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="432442054">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Backspace</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="610457973"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"></string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="905278565">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{106, 58}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="527208717">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Space</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="905278565"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">IA</string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="106930791">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{258, 58}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="165714669">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Down arrow</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="106930791"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"></string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{480, 360}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
-			<object class="NSCustomObject" id="635946545">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSWindowTemplate" id="264185350">
-				<int key="NSWindowStyleMask">7</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{700, 1000}, {480, 360}}</string>
-				<int key="NSWTFlags">1946157056</int>
-				<string key="NSWindowTitle">Buttons</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<object class="NSView" key="NSWindowView" id="841164116">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSButton" id="1039086975">
-							<reference key="NSNextResponder" ref="841164116"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{106, 99}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="841164116"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="536067330">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Escape</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="1039086975"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="949576017">
-							<reference key="NSNextResponder" ref="841164116"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{258, 99}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="841164116"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="1006898495">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Backspace</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="949576017"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"></string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="928640245">
-							<reference key="NSNextResponder" ref="841164116"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{106, 58}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="841164116"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="246606737">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Space</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="928640245"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">IA</string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="37863177">
-							<reference key="NSNextResponder" ref="841164116"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{258, 58}, {118, 25}}</string>
-							<reference key="NSSuperview" ref="841164116"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="160250892">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Down arrow</string>
-								<reference key="NSSupport" ref="455972270"/>
-								<reference key="NSControlView" ref="37863177"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"></string>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{480, 360}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="635946545"/>
-					</object>
-					<int key="connectionID">451</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">theWindow</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">459</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">useNewCode</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="962787846"/>
-					</object>
-					<int key="connectionID">465</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">setUsesNewCode:</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="962787846"/>
-					</object>
-					<int key="connectionID">466</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">theOtherWindow</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="264185350"/>
-					</object>
-					<int key="connectionID">492</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="160623561"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="439893737"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="160623561"/>
-							<reference ref="215024340"/>
-							<reference ref="962787846"/>
-							<reference ref="995743194"/>
-							<reference ref="610457973"/>
-							<reference ref="905278565"/>
-							<reference ref="106930791"/>
-						</object>
-						<reference key="parent" ref="972006081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">450</int>
-						<reference key="object" ref="635946545"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">456</int>
-						<reference key="object" ref="160623561"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="46991665"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">457</int>
-						<reference key="object" ref="46991665"/>
-						<reference key="parent" ref="160623561"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">460</int>
-						<reference key="object" ref="215024340"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="894772288"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">461</int>
-						<reference key="object" ref="894772288"/>
-						<reference key="parent" ref="215024340"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">462</int>
-						<reference key="object" ref="962787846"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="679700256"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">463</int>
-						<reference key="object" ref="679700256"/>
-						<reference key="parent" ref="962787846"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">467</int>
-						<reference key="object" ref="995743194"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="599889457"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">468</int>
-						<reference key="object" ref="599889457"/>
-						<reference key="parent" ref="995743194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">469</int>
-						<reference key="object" ref="610457973"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="432442054"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">470</int>
-						<reference key="object" ref="432442054"/>
-						<reference key="parent" ref="610457973"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">471</int>
-						<reference key="object" ref="905278565"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="527208717"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">472</int>
-						<reference key="object" ref="106930791"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="165714669"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">473</int>
-						<reference key="object" ref="165714669"/>
-						<reference key="parent" ref="106930791"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">474</int>
-						<reference key="object" ref="527208717"/>
-						<reference key="parent" ref="905278565"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">475</int>
-						<reference key="object" ref="264185350"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="841164116"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">476</int>
-						<reference key="object" ref="841164116"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="37863177"/>
-							<reference ref="928640245"/>
-							<reference ref="949576017"/>
-							<reference ref="1039086975"/>
-						</object>
-						<reference key="parent" ref="264185350"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">477</int>
-						<reference key="object" ref="37863177"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="160250892"/>
-						</object>
-						<reference key="parent" ref="841164116"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">478</int>
-						<reference key="object" ref="928640245"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="246606737"/>
-						</object>
-						<reference key="parent" ref="841164116"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">479</int>
-						<reference key="object" ref="949576017"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1006898495"/>
-						</object>
-						<reference key="parent" ref="841164116"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">480</int>
-						<reference key="object" ref="1039086975"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="536067330"/>
-						</object>
-						<reference key="parent" ref="841164116"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">487</int>
-						<reference key="object" ref="536067330"/>
-						<reference key="parent" ref="1039086975"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">488</int>
-						<reference key="object" ref="1006898495"/>
-						<reference key="parent" ref="949576017"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">489</int>
-						<reference key="object" ref="246606737"/>
-						<reference key="parent" ref="928640245"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="160250892"/>
-						<reference key="parent" ref="37863177"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-3.IBPluginDependency</string>
-					<string>371.IBEditorWindowLastContentRect</string>
-					<string>371.IBPluginDependency</string>
-					<string>371.IBWindowTemplateEditedContentRect</string>
-					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>371.editorWindowContentRectSynchronizationRect</string>
-					<string>372.IBPluginDependency</string>
-					<string>456.CustomClassName</string>
-					<string>456.IBPluginDependency</string>
-					<string>456.IBViewBoundsToFrameTransform</string>
-					<string>457.IBPluginDependency</string>
-					<string>460.CustomClassName</string>
-					<string>460.IBPluginDependency</string>
-					<string>460.IBViewBoundsToFrameTransform</string>
-					<string>461.IBPluginDependency</string>
-					<string>462.IBPluginDependency</string>
-					<string>462.IBViewBoundsToFrameTransform</string>
-					<string>463.IBPluginDependency</string>
-					<string>467.IBPluginDependency</string>
-					<string>467.IBViewBoundsToFrameTransform</string>
-					<string>468.IBPluginDependency</string>
-					<string>469.IBPluginDependency</string>
-					<string>469.IBViewBoundsToFrameTransform</string>
-					<string>470.IBPluginDependency</string>
-					<string>471.IBPluginDependency</string>
-					<string>471.IBViewBoundsToFrameTransform</string>
-					<string>472.IBPluginDependency</string>
-					<string>472.IBViewBoundsToFrameTransform</string>
-					<string>473.IBPluginDependency</string>
-					<string>474.IBPluginDependency</string>
-					<string>475.IBEditorWindowLastContentRect</string>
-					<string>475.IBPluginDependency</string>
-					<string>475.IBWindowTemplateEditedContentRect</string>
-					<string>475.NSWindowTemplate.visibleAtLaunch</string>
-					<string>475.editorWindowContentRectSynchronizationRect</string>
-					<string>476.IBPluginDependency</string>
-					<string>477.IBPluginDependency</string>
-					<string>477.IBViewBoundsToFrameTransform</string>
-					<string>478.IBPluginDependency</string>
-					<string>478.IBViewBoundsToFrameTransform</string>
-					<string>479.IBPluginDependency</string>
-					<string>479.IBViewBoundsToFrameTransform</string>
-					<string>480.IBPluginDependency</string>
-					<string>480.IBViewBoundsToFrameTransform</string>
-					<string>487.IBPluginDependency</string>
-					<string>488.IBPluginDependency</string>
-					<string>489.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{438, 784}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{438, 784}, {480, 360}}</string>
-					<boolean value="NO"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>MyTextField</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDQAAAw4IAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>MyTextField</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDQAAAw08AAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDPgAAwxAAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABC1AAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDgQAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABC1AAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDgQAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{940, 784}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{940, 784}, {480, 360}}</string>
-					<boolean value="NO"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDgQAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABC1AAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDgQAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABC1AAAwvQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">493</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">theWindow</string>
-						<string key="NS.object.0">NSWindow</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">theWindow</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">theWindow</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">setUsesNewCode:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">setUsesNewCode:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">setUsesNewCode:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>textField</string>
-							<string>theOtherWindow</string>
-							<string>useNewCode</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>NSWindow</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>textField</string>
-							<string>theOtherWindow</string>
-							<string>useNewCode</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">textField</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">theOtherWindow</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">useNewCode</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MyTextField</string>
-					<string key="superclassName">NSTextField</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">NSSwitch</string>
-			<string key="NS.object.0">{15, 15}</string>
-		</object>
-	</data>
-</archive>

Tests/Manual/performKeyEquivalentTest/index-debug.html

@@ -1,103 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index-debug.html
- performKeyEquivalentTest
-
- Created by aparajita on May 22, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>performKeyEquivalentTest</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
-        </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:
-
-            // 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);
-        </script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading performKeyEquivalentTest...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/performKeyEquivalentTest/index.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index.html
- performKeyEquivalentTest
-
- Created by aparajita on May 22, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>performKeyEquivalentTest</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading performKeyEquivalentTest...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/performKeyEquivalentTest/main.j

@@ -1,23 +0,0 @@
-/*
- * AppController.j
- * performKeyEquivalentTest
- *
- * Created by aparajita on May 22, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
-
-@import "AppController.j"
-
-var formatter = function(aString, aTitle, aLevel)
-{
-    return aString;
-};
-
-function main(args, namedArgs)
-{
-    CPLogRegister(CPLogConsole, nil, formatter);
-    CPApplicationMain(args, namedArgs);
-}

Tests/Manual/predicateWithFormat/AppController.j

@@ -1,150 +0,0 @@
-/*
- * AppController.j
- * predicateWithFormat
- *
- * Created by aparajita on May 25, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-
-var usesNewCode = NO;
-
-@implementation AppController : CPObject
-{
-    CPWindow        theWindow;
-    CPPopUpButton   dataMenu;
-    CPPopUpButton   comparisonMenu;
-    CPPopUpButton   nameMenu;
-    CPTextField     resultsField;
-}
-
-- (void)applicationDidFinishLaunching:(CPNotification)aNotification
-{
-    useNewCode = usesNewCode;
-}
-
-- (void)awakeFromCib
-{
-}
-
-- (BOOL)useNewCode
-{
-    return usesNewCode;
-}
-
-- (void)setUseNewCode:(BOOL)flag
-{
-    usesNewCode = flag;
-}
-
-- (void)search:(id)sender
-{
-    var results = @"";
-
-    try
-    {
-        var format = [CPString stringWithFormat:@"SELF %@ %%@", [comparisonMenu titleOfSelectedItem]],
-            predicate = [CPPredicate predicateWithFormat:format, [nameMenu titleOfSelectedItem]],
-            data = [[dataMenu titleOfSelectedItem]],
-            searchResults = [data filteredArrayUsingPredicate:predicate],
-
-        results = searchResults.join("\n");
-        [resultsField setTextColor:[CPColor blackColor]];
-    }
-    catch (ex)
-    {
-        results = [ex reason];
-        [resultsField setTextColor:[CPColor redColor]];
-    }
-
-    [resultsField setStringValue:@"Result: " + results];
-}
-
-@end
-
-var CPComparisonPredicateModifier,
-    CPPredicateOperatorType;
-
-@implementation CPComparisonPredicate (test)
-
-- (BOOL)_evaluateValue:lhs rightValue:rhs
-{
-    var leftIsNil = (lhs == nil || [lhs isEqual:[CPNull null]]),
-        rightIsNil = (rhs == nil || [rhs isEqual:[CPNull null]]);
-
-    if ((leftIsNil || rightIsNil) && _type != CPCustomSelectorPredicateOperatorType)
-        return (leftIsNil == rightIsNil &&
-               (_type == CPEqualToPredicateOperatorType ||
-                _type == CPLessThanOrEqualToPredicateOperatorType ||
-                _type == CPGreaterThanOrEqualToPredicateOperatorType));
-
-    var string_compare_options = 0;
-
-    // left and right should be casted first [CAST()] following 10.5 rules.
-    switch (_type)
-    {
-        case CPLessThanPredicateOperatorType:               return ([lhs compare:rhs] == CPOrderedAscending);
-        case CPLessThanOrEqualToPredicateOperatorType:      return ([lhs compare:rhs] != CPOrderedDescending);
-        case CPGreaterThanPredicateOperatorType:            return ([lhs compare:rhs] == CPOrderedDescending);
-        case CPGreaterThanOrEqualToPredicateOperatorType:   return ([lhs compare:rhs] != CPOrderedAscending);
-        case CPEqualToPredicateOperatorType:                return [lhs isEqual:rhs];
-        case CPNotEqualToPredicateOperatorType:             return (![lhs isEqual:rhs]);
-
-        case CPMatchesPredicateOperatorType:                var commut = (_options & CPCaseInsensitivePredicateOption) ? "gi":"g";
-                                                            if (_options & CPDiacriticInsensitivePredicateOption)
-                                                            {
-                                                                lhs = lhs.stripDiacritics();
-                                                                rhs = rhs.stripDiacritics();
-                                                            }
-                                                            return (new RegExp(rhs,commut)).test(lhs);
-
-        case CPLikePredicateOperatorType:                   if (_options & CPDiacriticInsensitivePredicateOption)
-                                                            {
-                                                                lhs = lhs.stripDiacritics();
-                                                                rhs = rhs.stripDiacritics();
-                                                            }
-                                                            var commut = (_options & CPCaseInsensitivePredicateOption) ? "gi":"g",
-                                                                reg = new RegExp(rhs.escapeForRegExp(),commut);
-                                                            return reg.test(lhs);
-
-        case CPBeginsWithPredicateOperatorType:             var range = usesNewCode ? CPMakeRange(0, MIN([lhs length], [rhs length])) : CPMakeRange(0,[rhs length]);
-                                                            if (_options & CPCaseInsensitivePredicateOption) string_compare_options |= CPCaseInsensitiveSearch;
-                                                            if (_options & CPDiacriticInsensitivePredicateOption) string_compare_options |= CPDiacriticInsensitiveSearch;
-                                                            return ([lhs compare:rhs options:string_compare_options range:range] == CPOrderedSame);
-
-        case CPEndsWithPredicateOperatorType:               var range = usesNewCode ? CPMakeRange(MAX([lhs length] - [rhs length], 0), MIN([lhs length], [rhs length])) : CPMakeRange([lhs length] - [rhs length],[rhs length]);
-                                                            if (_options & CPCaseInsensitivePredicateOption) string_compare_options |= CPCaseInsensitiveSearch;
-                                                            if (_options & CPDiacriticInsensitivePredicateOption) string_compare_options |= CPDiacriticInsensitiveSearch;
-                                                            return ([lhs compare:rhs options:string_compare_options range:range] == CPOrderedSame);
-
-        case CPCustomSelectorPredicateOperatorType:         return [lhs performSelector:_customSelector withObject:rhs];
-
-        case CPInPredicateOperatorType:                     var a = lhs; // swap
-                                                            lhs = rhs;
-                                                            rhs = a;
-        case CPContainsPredicateOperatorType:               if (![lhs isKindOfClass:[CPString class]])
-                                                            {
-                                                                 if (![lhs respondsToSelector: @selector(objectEnumerator)])
-                                                                     [CPException raise:CPInvalidArgumentException reason:@"The left/right hand side for a CONTAINS/IN  operator must be a collection or a string"];
-
-                                                                 return [lhs containsObject:rhs];
-                                                            }
-
-                                                            if (_options & CPCaseInsensitivePredicateOption)
-                                                                string_compare_options |= CPCaseInsensitiveSearch;
-                                                            if (_options & CPDiacriticInsensitivePredicateOption)
-                                                                string_compare_options |= CPDiacriticInsensitiveSearch;
-
-                                                            return ([lhs rangeOfString:rhs options:string_compare_options].location != CPNotFound);
-
-        case CPBetweenPredicateOperatorType:                if ([rhs count] < 2)
-                                                                [CPException raise:CPInvalidArgumentException reason:@"The right hand side for a BETWEEN operator must contain 2 objects"];
-
-                                                            return ([lhs compare:rhs[0]] == CPOrderedDescending && [lhs compare:rhs[1]] == CPOrderedAscending);
-
-        default:                                            return NO;
-    }
-}
-
-@end

Tests/Manual/predicateWithFormat/Info.plist

@@ -1,10 +0,0 @@
-<?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>test</string>
-</dict>
-</plist>

Tests/Manual/predicateWithFormat/Jakefile

@@ -1,94 +0,0 @@
-/*
- * Jakefile
- * test
- *
- * Created by aparajita on May 25, 2011.
- * Copyright 2011, Victory-Heart Productions 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");
-
-app ("test", function(task)
-{
-    task.setBuildIntermediatesPath(FILE.join("Build", "test.build", configuration));
-    task.setBuildPath(FILE.join("Build", configuration));
-
-    task.setProductName("test");
-    task.setIdentifier("com.aparajita.test");
-    task.setVersion("1.0");
-    task.setAuthor("Victory-Heart Productions");
-    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("test");
-    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/**"));
-    task.setIndexFilePath("index.html");
-    task.setInfoPlistPath("Info.plist");
-    task.setNib2CibFlags("-R Resources/");
-
-    if (configuration === "Debug")
-        task.setCompilerFlags("-DDEBUG -g");
-    else
-        task.setCompilerFlags("-O");
-});
-
-task ("default", ["test"], function()
-{
-    printResults(configuration);
-});
-
-task ("build", ["default"]);
-
-task ("debug", function()
-{
-    ENV["CONFIGURATION"] = "Debug";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("release", function()
-{
-    ENV["CONFIGURATION"] = "Release";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("run", ["debug"], function()
-{
-    OS.system(["open", FILE.join("Build", "Debug", "test", "index.html")]);
-});
-
-task ("run-release", ["release"], function()
-{
-    OS.system(["open", FILE.join("Build", "Release", "test", "index.html")]);
-});
-
-task ("deploy", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Deployment", "test"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "test"), FILE.join("Build", "Deployment", "test")]);
-    printResults("Deployment")
-});
-
-task ("desktop", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Desktop", "test"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "test"), FILE.join("Build", "Desktop", "test", "test.app"));
-    printResults("Desktop")
-});
-
-task ("run-desktop", ["desktop"], function()
-{
-    OS.system([FILE.join("Build", "Desktop", "test", "test.app", "Contents", "MacOS", "NativeHost"), "-i"]);
-});
-
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "test"));
-    print("----------------------------");
-}

Tests/Manual/predicateWithFormat/Resources/MainMenu.xib

@@ -1,927 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="372"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">7</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{335, 571}, {571, 179}}</string>
-				<int key="NSWTFlags">1946157056</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="306506021">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{38, 34}, {321, 17}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="786364694">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Result:</string>
-								<object class="NSFont" key="NSSupport" id="180276567">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="306506021"/>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-						</object>
-						<object class="NSPopUpButton" id="831737273">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{302, 127}, {100, 26}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="502372116">
-								<int key="NSCellFlags">-2076049856</int>
-								<int key="NSCellFlags2">2048</int>
-								<reference key="NSSupport" ref="180276567"/>
-								<reference key="NSControlView" ref="831737273"/>
-								<int key="NSButtonFlags">109199615</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="396781444">
-									<reference key="NSMenu" ref="438705379"/>
-									<string key="NSTitle">To</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<object class="NSCustomResource" key="NSOnImage" id="102193233">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">NSMenuCheckmark</string>
-									</object>
-									<object class="NSCustomResource" key="NSMixedImage" id="364966873">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">NSMenuMixedState</string>
-									</object>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="502372116"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="438705379">
-									<string key="NSTitle">OtherViews</string>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="396781444"/>
-										<object class="NSMenuItem" id="435766921">
-											<reference key="NSMenu" ref="438705379"/>
-											<string key="NSTitle">om</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="502372116"/>
-										</object>
-										<object class="NSMenuItem" id="422515943">
-											<reference key="NSMenu" ref="438705379"/>
-											<string key="NSTitle">Tomb</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="502372116"/>
-										</object>
-										<object class="NSMenuItem" id="1055002259">
-											<reference key="NSMenu" ref="438705379"/>
-											<string key="NSTitle">boy</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="502372116"/>
-										</object>
-									</object>
-									<reference key="NSMenuFont" ref="180276567"/>
-								</object>
-								<int key="NSPreferredEdge">1</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">2</int>
-							</object>
-						</object>
-						<object class="NSPopUpButton" id="226492283">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{153, 127}, {129, 26}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="485690623">
-								<int key="NSCellFlags">-2076049856</int>
-								<int key="NSCellFlags2">2048</int>
-								<reference key="NSSupport" ref="180276567"/>
-								<reference key="NSControlView" ref="226492283"/>
-								<int key="NSButtonFlags">109199615</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="241755795">
-									<reference key="NSMenu" ref="671309887"/>
-									<string key="NSTitle">beginsWith</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="102193233"/>
-									<reference key="NSMixedImage" ref="364966873"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="485690623"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="671309887">
-									<string key="NSTitle">OtherViews</string>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="241755795"/>
-										<object class="NSMenuItem" id="573953194">
-											<reference key="NSMenu" ref="671309887"/>
-											<string key="NSTitle">endsWith</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="485690623"/>
-										</object>
-									</object>
-									<reference key="NSMenuFont" ref="180276567"/>
-								</object>
-								<int key="NSPreferredEdge">1</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">2</int>
-							</object>
-						</object>
-						<object class="NSButton" id="986079495">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{424, 128}, {77, 25}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="820767418">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Search</string>
-								<reference key="NSSupport" ref="180276567"/>
-								<reference key="NSControlView" ref="986079495"/>
-								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSPopUpButton" id="148001902">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{32, 127}, {100, 26}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="884253365">
-								<int key="NSCellFlags">-2076049856</int>
-								<int key="NSCellFlags2">2048</int>
-								<reference key="NSSupport" ref="180276567"/>
-								<reference key="NSControlView" ref="148001902"/>
-								<int key="NSButtonFlags">109199615</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="17817692">
-									<reference key="NSMenu" ref="15076045"/>
-									<string key="NSTitle">To</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="102193233"/>
-									<reference key="NSMixedImage" ref="364966873"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="884253365"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="15076045">
-									<string key="NSTitle">OtherViews</string>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="17817692"/>
-										<object class="NSMenuItem" id="232326310">
-											<reference key="NSMenu" ref="15076045"/>
-											<string key="NSTitle">Tom</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="884253365"/>
-										</object>
-										<object class="NSMenuItem" id="874646600">
-											<reference key="NSMenu" ref="15076045"/>
-											<string key="NSTitle">Tomb</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="884253365"/>
-										</object>
-										<object class="NSMenuItem" id="358035610">
-											<reference key="NSMenu" ref="15076045"/>
-											<string key="NSTitle">Tomboy</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="102193233"/>
-											<reference key="NSMixedImage" ref="364966873"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="884253365"/>
-										</object>
-									</object>
-									<reference key="NSMenuFont" ref="180276567"/>
-								</object>
-								<int key="NSPreferredEdge">1</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">2</int>
-							</object>
-						</object>
-						<object class="NSButton" id="979095863">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{39, 87}, {109, 18}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="847409339">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Use new code</string>
-								<reference key="NSSupport" ref="180276567"/>
-								<reference key="NSControlView" ref="979095863"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSSwitch</string>
-								</object>
-								<object class="NSButtonImageSource" key="NSAlternateImage">
-									<string key="NSImageName">NSSwitch</string>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{571, 179}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
-			<object class="NSCustomObject" id="635946545">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSObjectController" id="680044224">
-				<object class="NSMutableArray" key="NSDeclaredKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>useNewCode</string>
-				</object>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="635946545"/>
-					</object>
-					<int key="connectionID">451</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">resultsField</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="306506021"/>
-					</object>
-					<int key="connectionID">474</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nameMenu</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="831737273"/>
-					</object>
-					<int key="connectionID">475</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">search:</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="986079495"/>
-					</object>
-					<int key="connectionID">476</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">theWindow</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">477</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">comparisonMenu</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="226492283"/>
-					</object>
-					<int key="connectionID">484</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataMenu</string>
-						<reference key="source" ref="635946545"/>
-						<reference key="destination" ref="148001902"/>
-					</object>
-					<int key="connectionID">498</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">content</string>
-						<reference key="source" ref="680044224"/>
-						<reference key="destination" ref="635946545"/>
-					</object>
-					<int key="connectionID">503</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.useNewCode</string>
-						<reference key="source" ref="979095863"/>
-						<reference key="destination" ref="680044224"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="979095863"/>
-							<reference key="NSDestination" ref="680044224"/>
-							<string key="NSLabel">value: selection.useNewCode</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.useNewCode</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">505</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="439893737"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="986079495"/>
-							<reference ref="226492283"/>
-							<reference ref="831737273"/>
-							<reference ref="148001902"/>
-							<reference ref="979095863"/>
-							<reference ref="306506021"/>
-						</object>
-						<reference key="parent" ref="972006081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">450</int>
-						<reference key="object" ref="635946545"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">464</int>
-						<reference key="object" ref="831737273"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="502372116"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">465</int>
-						<reference key="object" ref="502372116"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="438705379"/>
-						</object>
-						<reference key="parent" ref="831737273"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">466</int>
-						<reference key="object" ref="438705379"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="396781444"/>
-							<reference ref="435766921"/>
-							<reference ref="422515943"/>
-							<reference ref="1055002259"/>
-						</object>
-						<reference key="parent" ref="502372116"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">467</int>
-						<reference key="object" ref="396781444"/>
-						<reference key="parent" ref="438705379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">468</int>
-						<reference key="object" ref="435766921"/>
-						<reference key="parent" ref="438705379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">469</int>
-						<reference key="object" ref="422515943"/>
-						<reference key="parent" ref="438705379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">470</int>
-						<reference key="object" ref="986079495"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="820767418"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">471</int>
-						<reference key="object" ref="820767418"/>
-						<reference key="parent" ref="986079495"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">472</int>
-						<reference key="object" ref="306506021"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="786364694"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">473</int>
-						<reference key="object" ref="786364694"/>
-						<reference key="parent" ref="306506021"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">478</int>
-						<reference key="object" ref="226492283"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="485690623"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">479</int>
-						<reference key="object" ref="485690623"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="671309887"/>
-						</object>
-						<reference key="parent" ref="226492283"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">480</int>
-						<reference key="object" ref="671309887"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="573953194"/>
-							<reference ref="241755795"/>
-						</object>
-						<reference key="parent" ref="485690623"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">482</int>
-						<reference key="object" ref="573953194"/>
-						<reference key="parent" ref="671309887"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">483</int>
-						<reference key="object" ref="241755795"/>
-						<reference key="parent" ref="671309887"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">485</int>
-						<reference key="object" ref="1055002259"/>
-						<reference key="parent" ref="438705379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="148001902"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="884253365"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="884253365"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="15076045"/>
-						</object>
-						<reference key="parent" ref="148001902"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">493</int>
-						<reference key="object" ref="15076045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="358035610"/>
-							<reference ref="874646600"/>
-							<reference ref="232326310"/>
-							<reference ref="17817692"/>
-						</object>
-						<reference key="parent" ref="884253365"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="358035610"/>
-						<reference key="parent" ref="15076045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">495</int>
-						<reference key="object" ref="874646600"/>
-						<reference key="parent" ref="15076045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">496</int>
-						<reference key="object" ref="232326310"/>
-						<reference key="parent" ref="15076045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="17817692"/>
-						<reference key="parent" ref="15076045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">499</int>
-						<reference key="object" ref="979095863"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="847409339"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">500</int>
-						<reference key="object" ref="847409339"/>
-						<reference key="parent" ref="979095863"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">502</int>
-						<reference key="object" ref="680044224"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-3.IBPluginDependency</string>
-					<string>371.IBEditorWindowLastContentRect</string>
-					<string>371.IBPluginDependency</string>
-					<string>371.IBWindowTemplateEditedContentRect</string>
-					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>371.editorWindowContentRectSynchronizationRect</string>
-					<string>372.IBPluginDependency</string>
-					<string>464.IBPluginDependency</string>
-					<string>464.IBViewBoundsToFrameTransform</string>
-					<string>465.IBPluginDependency</string>
-					<string>466.IBEditorWindowLastContentRect</string>
-					<string>466.IBPluginDependency</string>
-					<string>467.IBPluginDependency</string>
-					<string>468.IBPluginDependency</string>
-					<string>469.IBPluginDependency</string>
-					<string>470.IBPluginDependency</string>
-					<string>471.IBPluginDependency</string>
-					<string>472.IBPluginDependency</string>
-					<string>472.IBViewBoundsToFrameTransform</string>
-					<string>473.IBPluginDependency</string>
-					<string>478.IBPluginDependency</string>
-					<string>478.IBViewBoundsToFrameTransform</string>
-					<string>479.IBPluginDependency</string>
-					<string>480.IBEditorWindowLastContentRect</string>
-					<string>480.IBPluginDependency</string>
-					<string>482.IBPluginDependency</string>
-					<string>483.IBPluginDependency</string>
-					<string>485.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>491.IBViewBoundsToFrameTransform</string>
-					<string>492.IBPluginDependency</string>
-					<string>493.IBEditorWindowLastContentRect</string>
-					<string>493.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>495.IBPluginDependency</string>
-					<string>496.IBPluginDependency</string>
-					<string>497.IBPluginDependency</string>
-					<string>499.IBPluginDependency</string>
-					<string>500.IBPluginDependency</string>
-					<string>502.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{441, 973}, {571, 179}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{441, 973}, {571, 179}}</string>
-					<integer value="1"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDlwAAwzQAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{732, 1043}, {122, 83}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCAAAAwiwAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDAgAAwzIAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{560, 1083}, {142, 43}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCLAAAwzEAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{462, 1043}, {122, 83}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">505</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">theWindow</string>
-						<string key="NS.object.0">NSWindow</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">theWindow</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">theWindow</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">search:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">search:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">search:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>comparisonMenu</string>
-							<string>dataMenu</string>
-							<string>nameMenu</string>
-							<string>resultsField</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>comparisonMenu</string>
-							<string>dataMenu</string>
-							<string>nameMenu</string>
-							<string>resultsField</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">comparisonMenu</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">dataMenu</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">nameMenu</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">resultsField</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-				<string>NSSwitch</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-				<string>{15, 15}</string>
-			</object>
-		</object>
-	</data>
-</archive>

Tests/Manual/predicateWithFormat/index-debug.html

@@ -1,103 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index-debug.html
- test
-
- Created by aparajita on May 25, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>test</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
-        </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:
-
-            // 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);
-        </script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading test...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/predicateWithFormat/index.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
- index.html
- test
-
- Created by aparajita on May 25, 2011.
- Copyright 2011, Victory-Heart Productions All rights reserved.
--->
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
-
-        <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>test</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading test...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>

Tests/Manual/predicateWithFormat/main.j

@@ -1,18 +0,0 @@
-/*
- * AppController.j
- * test
- *
- * Created by aparajita on May 25, 2011.
- * Copyright 2011, Victory-Heart Productions All rights reserved.
- */
-
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
-
-@import "AppController.j"
-
-
-function main(args, namedArgs)
-{
-    CPApplicationMain(args, namedArgs);
-}

Tests/Objective-J/MethodDispatchTest.j

@@ -1,326 +0,0 @@
-
-@import <Foundation/Foundation.j>
-
-
-@implementation RootClass
-{
-}
-
-+ (id)alloc
-{
-    return class_createInstance(self);
-}
-
-@end
-
-@implementation RootClassWithDoesNotRecognizeSelector
-{
-}
-
-+ (id)alloc
-{
-    return class_createInstance(self);
-}
-
-- (void)doesNotRecognizeSelector:(SEL)aSelector
-{
-    throw "ERROR";
-}
-
-@end
-
-@implementation Subclass : CPObject
-{
-}
-
-@end
-
-@implementation RootClassWithForwardingTarget
-{
-}
-
-+ (void)initialize
-{
-}
-
-+ (id)alloc
-{
-    return class_createInstance(self);
-}
-
-- (id)forwardingTargetForSelector:(SEL)aSelector
-{
-    if (aSelector !== @selector(doesNotExist))
-        return nil;
-
-    if (class_isMetaClass(isa))
-        return GlobalMethodDispatchTest;
-
-    return GlobalMethodDispatchTest;
-}
-
-@end
-
-@implementation SubclassWithForwardingTarget : CPObject
-{
-}
-
-+ (id)forwardingTargetForSelector:(SEL)aSelector
-{
-    if (aSelector !== @selector(doesNotExist))
-        return [super forwardingTargetForSelector:aSelector];
-
-    return GlobalMethodDispatchTest;
-}
-
-- (id)forwardingTargetForSelector:(SEL)aSelector
-{
-    if (aSelector !== @selector(doesNotExist))
-        return [super forwardingTargetForSelector:aSelector];
-
-    return GlobalMethodDispatchTest;
-}
-
-@end
-
-@implementation RootClassWithForwardInvocation
-{
-}
-
-+ (void)initialize
-{
-}
-
-+ (id)alloc
-{
-    return class_createInstance(self);
-}
-
-- (CPMethodSignature)methodSignatureForSelector:(SEL)aSelector
-{
-    if (aSelector === @selector(doesNotExist))
-        return 1;
-
-    return nil;
-}
-
-- (void)forwardInvocation:(CPInvocation)anInvocation
-{
-    [anInvocation setTarget:GlobalMethodDispatchTest];
-    [anInvocation invoke];
-}
-
-@end
-
-@implementation SubclassWithForwardInvocation : CPObject
-{
-}
-
-+ (CPMethodSignature)methodSignatureForSelector:(SEL)aSelector
-{
-    if (aSelector === @selector(doesNotExist))
-        return 1;
-
-    return nil;
-}
-
-+ (void)forwardInvocation:(CPInvocation)anInvocation
-{
-    [anInvocation setTarget:GlobalMethodDispatchTest];
-    [anInvocation invoke];
-}
-
-- (CPMethodSignature)methodSignatureForSelector:(SEL)aSelector
-{
-    if (aSelector === @selector(doesNotExist))
-        return 1;
-
-    return nil;
-}
-
-- (void)forwardInvocation:(CPInvocation)anInvocation
-{
-    [anInvocation setTarget:GlobalMethodDispatchTest];
-    [anInvocation invoke];
-}
-
-@end
-
-var GlobalMethodDispatchTest;
-
-@implementation MethodDispatchTest : OJTestCase
-{
-}
-
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-        GlobalMethodDispatchTest = self;
-
-    return self;
-}
-
-- (BOOL)doesNotExist
-{
-    return YES;
-}
-
-- (void)test_RootClass_class_doesNotRecognizeSelector_
-{
-    try
-    {
-        [RootClass doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:anException equals:"RootClass does not implement doesNotRecognizeSelector:. Did you forget a superclass for RootClass?"];
-    }
-}
-
-- (void)test_RootClass_instance_doesNotRecognizeSelector_
-{
-    var object = [RootClass alloc];
-
-    try
-    {
-        [object doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:anException equals:"RootClass does not implement doesNotRecognizeSelector:. Did you forget a superclass for RootClass?"];
-    }
-}
-
-- (void)test_RootClassWithDoesNotRecognizeSelector_class_doesNotRecognizeSelector_
-{
-    try
-    {
-        [RootClassWithDoesNotRecognizeSelector doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:anException equals:"ERROR"];
-    }
-}
-
-- (void)test_RootClassWithDoesNotRecognizeSelector_instance_doesNotRecognizeSelector_
-{
-    var object = [RootClassWithDoesNotRecognizeSelector alloc];
-
-    try
-    {
-        [object doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:anException equals:"ERROR"];
-    }
-}
-
-- (void)test_CPObject_class_doesNotRecognizeSelector_
-{
-    try
-    {
-        [CPObject doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:[anException name] equals:CPInvalidArgumentException];
-        [self assert:[anException reason] equals:@"+ [CPObject doesNotExist] unrecognized selector sent to class CPObject"];
-    }
-}
-
-- (void)test_CPObject_instance_doesNotRecognizeSelector_
-{
-    var object = [CPObject alloc];
-
-    try
-    {
-        [object doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:[anException name] equals:CPInvalidArgumentException];
-        [self assert:[anException reason] equals:@"- [CPObject doesNotExist] unrecognized selector sent to instance 0x" + [CPString stringWithHash:[object UID]]];
-    }
-}
-
-- (void)test_Subclass_class_doesNotRecognizeSelector_
-{
-    try
-    {
-        [Subclass doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:[anException name] equals:CPInvalidArgumentException];
-        [self assert:[anException reason] equals:@"+ [Subclass doesNotExist] unrecognized selector sent to class Subclass"];
-    }
-}
-
-- (void)test_Subclass_instance_doesNotRecognizeSelector_
-{
-    var object = [Subclass alloc];
-
-    try
-    {
-        [object doesNotExist];
-    }
-    catch (anException)
-    {
-        [self assert:[anException name] equals:CPInvalidArgumentException];
-        [self assert:[anException reason] equals:@"- [Subclass doesNotExist] unrecognized selector sent to instance 0x" + [CPString stringWithHash:[object UID]]];
-    }
-}
-
-- (void)test_RootClassWithForwardingTarget_class_forwardingTargetForSelector_
-{
-    [self assert:YES equals:[RootClassWithForwardingTarget doesNotExist]];
-}
-
-- (void)test_RootClassWithForwardingTarget_instance_forwardingTargetForSelector_
-{
-    var object = [RootClassWithForwardingTarget alloc];
-
-    [self assert:YES equals:[object doesNotExist]];
-}
-
-- (void)test_SubclassWithForwardingTarget_class_forwardingTargetForSelector_
-{
-    [self assert:YES equals:[SubclassWithForwardingTarget doesNotExist]];
-}
-
-- (void)test_SubclassWithForwardingTarget_instance_forwardingTargetForSelector_
-{
-    var object = [[SubclassWithForwardingTarget alloc] init];
-
-    [self assert:YES equals:[object doesNotExist]];
-}
-
-- (void)test_RootClassWithForwardInvocation_class_forwardInvocation_
-{
-    [self assert:YES equals:[RootClassWithForwardInvocation doesNotExist]];
-}
-
-- (void)test_RootClassWithForwardInvocation_instance_forwardInvocation_
-{
-    var object = [RootClassWithForwardInvocation alloc];
-
-    [self assert:YES equals:[object doesNotExist]];
-}
-
-- (void)test_SubclassWithForwardInvocation_class_forwardInvocation_
-{
-    [self assert:YES equals:[SubclassWithForwardInvocation doesNotExist]];
-}
-
-- (void)test_SubclassWithForwardInvocation_instance_forwardInvocation_
-{
-    var object = [[SubclassWithForwardInvocation alloc] init];
-
-    [self assert:YES equals:[object doesNotExist]];
-}
-
-@end