Objj2 compiler fixes

- Each file compiles individually with no errors or warnings.
- Added missing imports.
- Fixed imports to remove circularity.
- Removed unnecessary imports.
- Added missing headers.
- Added missing action_button.png.
- Replace CPMakeRect with CGRectMake.

AppKit/CPCursor.j

@@ -161,7 +161,7 @@ var currentCursor = nil,
         if (doesHaveImage)
         {
             var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath];
-            cssString = [CPString stringWithFormat:@"url(%@/cursors/%@.cur), %@", themeResourcePath, cursorName, aString];
+            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.cur), %@", themeResourcePath, cursorName, aString];
         }
 
         else

AppKit/CPEvent.j

@@ -21,10 +21,10 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPGeometry.j>
 @import <Foundation/CPObjJRuntime.j>
 @import <Foundation/CPString.j>
 
+@import "CGGeometry.j"
 @import "CPText.j"
 
 @class CPTextField
@@ -659,7 +659,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         case CPKeyDown:
         case CPKeyUp:
         case CPFlagsChanged:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
         case CPLeftMouseDown:
         case CPLeftMouseUp:
         case CPRightMouseDown:
@@ -669,9 +669,9 @@ var _CPEventPeriodicEventPeriod         = 0,
         case CPRightMouseDragged:
         case CPMouseEntered:
         case CPMouseExited:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
         default:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
     }
 }
 

AppKit/CPGradient.j

@@ -24,9 +24,9 @@
 @import <Foundation/CPException.j>
 @import <Foundation/CPMutableArray.j>
 
-@import "CoreGraphics/CGColor.j"
-@import "CoreGraphics/CGColorSpace.j"
-@import "CoreGraphics/CGGradient.j"
+@import "CGColor.j"
+@import "CGColorSpace.j"
+@import "CGGradient.j"
 @import "CPGraphicsContext.j"
 
 CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;

AppKit/CPImage.j

@@ -21,13 +21,13 @@
  */
 
 @import <Foundation/CPBundle.j>
-@import <Foundation/CPGeometry.j>
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 @import <Foundation/CPString.j>
 @import <Foundation/CPData.j>
 
+@import "CGGeometry.j"
 @import "CPCompatibility.j"
 
 CPImageLoadStatusInitialized    = 0;

AppKit/CPPopUpButton.j

@@ -20,8 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPGeometry.j>
-
+@import "CGGeometry.j"
 @import "CPButton.j"
 @import "CPKeyValueBinding.j"
 @import "CPMenu.j"

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -594,7 +594,7 @@ CPTransformableAttributeType = 1800;
 
 - (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
 {
-    var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)],
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
         count = [expressions count];
 
     for (var i = 0; i < count; i++)

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -2103,7 +2103,7 @@ TODO: implement
     [dragview setBackgroundColor:[firstSlice backgroundColor]];
     [dragview setAlphaValue:0.7];
 
-    dragPoint = CPMakePoint(0, firstIndex * _sliceHeight);
+    dragPoint = CGPointMake(0, firstIndex * _sliceHeight);
 
     [self dragView:dragview
                 at:dragPoint
@@ -2165,7 +2165,7 @@ TODO: implement
         if (_subviewIndexOfDropLine !== CPNotFound && _subviewIndexOfDropLine < numberOfRows)
         {
             var previousBelowSlice = [_slices objectAtIndex:_subviewIndexOfDropLine];
-            [previousBelowSlice setFrameOrigin:CPMakePoint(0, [previousBelowSlice rowIndex] * _sliceHeight)];
+            [previousBelowSlice setFrameOrigin:CGPointMake(0, [previousBelowSlice rowIndex] * _sliceHeight)];
         }
 
         if (indexOfDropLine <= _lastRow && indexOfDropLine < numberOfRows)

AppKit/CPSearchField.j

@@ -679,7 +679,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
         return;
 
     var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+        location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
 
     var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
 

AppKit/CPSplitView.j

@@ -1097,7 +1097,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
     for (var i = 0; i < count; i++)
     {
         var frame = [_subviews[i] frame];
-        [positions addObject:CPStringFromRect(frame)];
+        [positions addObject:CGStringFromRect(frame)];
         [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
     }
 

AppKit/CPStringDrawing.j

@@ -22,7 +22,7 @@
 
 @import <Foundation/CPString.j>
 
-@import "CoreGraphics/CGGeometry.j"
+@import "CGGeometry.j"
 @import "CPPlatformString.j"
 
 

AppKit/CPTableView.j

@@ -4179,7 +4179,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
                                                      tableColumns:tableColumns
                                                             event:currentEvent
                                                            offset:offset];
-                    view = [[CPImageView alloc] initWithFrame:CPMakeRect(0, 0, [image size].width, [image size].height)];
+                    view = [[CPImageView alloc] initWithFrame:CGRectMake(0, 0, [image size].width, [image size].height)];
                     [view setImage:image];
                 }
 

AppKit/CPView.j

@@ -21,13 +21,11 @@
  */
 
 @import <Foundation/CPArray.j>
-@import <Foundation/CPGeometry.j>
 @import <Foundation/CPObjJRuntime.j>
 @import <Foundation/CPSet.j>
 
 @import "CGAffineTransform.j"
-
-
+@import "CGGeometry.j"
 @import "CPColor.j"
 @import "CPGraphicsContext.j"
 @import "CPResponder.j"

AppKit/CPWindow/_CPAttachedWindowView.j

@@ -20,8 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CPWindowView.j"
+@import <Foundation/CPGeometry.j>
+
 @import "CGGradient.j"
+@import "_CPWindowView.j"
 
 @global CPPopoverAppearanceMinimal
 

AppKit/Cib/CPCib.j

@@ -29,11 +29,10 @@
 @import "_CPCibCustomResource.j"
 @import "_CPCibCustomView.j"
 @import "_CPCibKeyedUnarchiver.j"
+@import "_CPCibObjectData.j"
 @import "_CPCibProxyObject.j"
 @import "_CPCibWindowTemplate.j"
 
-@class _CPCibObjectData
-
 CPCibOwner              = @"CPCibOwner";
 CPCibTopLevelObjects    = @"CPCibTopLevelObjects";
 CPCibReplacementClasses = @"CPCibReplacementClasses";

AppKit/Cib/_CPCibObjectData.j

@@ -24,16 +24,15 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
-@import "CPCib.j"
 @import "CPCibConnector.j"
 @import "CPCibControlConnector.j"
 @import "CPCibOutletConnector.j"
 @import "CPCibBindingConnector.j"
-@import "CPCibRuntimeAttributesConnector.j"
 @import "CPCibHelpConnector.j"
 @import "CPClipView.j"
 
 @class CPScrollView
+@class CPCibRuntimeAttributesConnector
 
 
 @implementation _CPCibObjectData : CPObject

AppKit/CoreGraphics/CGColor.j

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//import "CGPattern.j"
 @import "CGColorSpace.j"
 
 

AppKit/CoreGraphics/CGPath.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CGGeometry.j"
 @import "CGAffineTransform.j"
+@import "CGGeometry.j"
 
 
 kCGPathElementMoveToPoint           = 0;

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -4,11 +4,50 @@
  *
  * Created by Francisco Tolmasky.
  * Copyright 2009, 280 North, Inc. All rights reserved.
+ *
+ * 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 <Foundation/CPObject.j>
-@import <AppKit/AppKit.j>
+@import <Foundation/CPGeometry.j>
+@import <AppKit/CPApplication.j>
+@import <AppKit/CPBrowser.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPButtonBar.j>
+@import <AppKit/CPCheckBox.j>
+@import <AppKit/CPComboBox.j>
+@import <AppKit/CPColorWell.j>
+@import <AppKit/CPLevelIndicator.j>
+@import <AppKit/CPPopUpButton.j>
+@import <AppKit/CPProgressIndicator.j>
+@import <AppKit/CPRadio.j>
+@import <AppKit/CPRuleEditor.j>
+@import <AppKit/CPScroller.j>
+@import <AppKit/CPScrollView.j>
+@import <AppKit/CPSegmentedControl.j>
+@import <AppKit/CPSlider.j>
+@import <AppKit/CPSplitView.j>
+@import <AppKit/CPStepper.j>
 @import <AppKit/CPTableHeaderView.j>
+@import <AppKit/CPSearchField.j>
+@import <AppKit/CPTextField.j>
+@import <AppKit/CPTokenField.j>
+@import <AppKit/CPWindow.j>
+@import <AppKit/_CPToolTip.j>
+
+@import <BlendKit/BKThemeDescriptor.j>
 
 var themedButtonValues = nil,
     themedTextFieldValues = nil,

AppKit/Themes/Aristo2/ThemeDescriptors.j

@@ -1,12 +1,51 @@
 /*
  * ThemeDescriptors.j
- * null
+ * AppKit
  *
- * Created by You on December 12, 2012
- * Copyright 2012, Your Company. All rights reserved.
+ * Created by Antoine Mercadal
+ * Copyright 2012 <primalmotion@archipelproject.org>
+ *
+ * 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 <BlendKit/BKThemeDescriptor.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPGeometry.j>
+@import <AppKit/CPApplication.j>
+@import <AppKit/CPBrowser.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPButtonBar.j>
+@import <AppKit/CPCheckBox.j>
+@import <AppKit/CPComboBox.j>
+@import <AppKit/CPColorWell.j>
+@import <AppKit/CPLevelIndicator.j>
+@import <AppKit/CPPopUpButton.j>
+@import <AppKit/CPProgressIndicator.j>
+@import <AppKit/CPRadio.j>
+@import <AppKit/CPRuleEditor.j>
+@import <AppKit/CPScroller.j>
+@import <AppKit/CPScrollView.j>
+@import <AppKit/CPSegmentedControl.j>
+@import <AppKit/CPSlider.j>
+@import <AppKit/CPSplitView.j>
+@import <AppKit/CPStepper.j>
+@import <AppKit/CPTableHeaderView.j>
+@import <AppKit/CPSearchField.j>
+@import <AppKit/CPTextField.j>
+@import <AppKit/CPTokenField.j>
+@import <AppKit/CPWindow.j>
+@import <AppKit/_CPToolTip.j>
 
 var themedButtonValues = nil,
     themedTextFieldValues = nil,

AppKit/Themes/BlendKit/BKShowcaseController.j

@@ -20,19 +20,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/Foundation.j>
+@import <Foundation/CPObject.j>
 @import <AppKit/CPCollectionView.j>
 @import <AppKit/CPColorPanel.j>
 @import <AppKit/CPScrollView.j>
 @import <AppKit/CPSplitView.j>
-@import <AppKit/CPTheme.j>
 @import <AppKit/CPToolbar.j>
 @import <AppKit/CPView.j>
-@import <AppKit/CPWindow.j>
+@import <AppKit/CPWindow_Constants.j>
 
 @import "BKThemeDescriptor.j"
 
+@class CPWindow
 
+@global CPApp
 
 var LEFT_PANEL_WIDTH    = 176.0;
 

AppKit/Themes/BlendKit/BKThemeDescriptor.j

@@ -21,9 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <AppKit/CPWindow.j>
-@import <AppKit/_CPStandardWindowView.j>
-@import <AppKit/_CPToolTipWindowView.j>
 
 
 var ItemSizes               = { },

AppKit/Themes/CommonJS/blendtask.j

@@ -1,7 +1,30 @@
+/*
+ * blendtask.j
+ * BlendKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 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 <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPData.j>
+@import <Foundation/CPKeyedArchiver.j>
+@import <AppKit/CPCib.j>
+@import <AppKit/_CPCibObjectData.j>
 @import <BlendKit/BlendKit.j>
 
 

Foundation/Foundation.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "_CGGeometry.j"
 @import "CPArray.j"
 @import "CPBundle.j"
 @import "CPCharacterSet.j"
@@ -36,7 +37,6 @@
 @import "CPException.j"
 @import "CPExpression.j"
 @import "CPFormatter.j"
-@import "CPGeometry.j"
 @import "CPIndexSet.j"
 @import "CPIndexPath.j"
 @import "CPInvocation.j"

Tools/capp/Generate.j

@@ -1,3 +1,24 @@
+/*
+ * Generate.j
+ * capp
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 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 "Configuration.j"
 

Tools/nib2cib/Converter.j

@@ -20,8 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPData.j>
+@import <Foundation/CPException.j>
+@import <Foundation/CPString.j>
+@import <AppKit/CPRadio.j>
 @import <BlendKit/BlendKit.j>
 
 @global java

Tools/nib2cib/NSButton.j

@@ -27,6 +27,7 @@
 @import <AppKit/CPCheckBox.j>
 @import <AppKit/CPRadio.j>
 
+@import "Converter.j"
 @import "NSCell.j"
 @import "NSControl.j"
 

Tools/nib2cib/NSCell.j

@@ -24,6 +24,7 @@
  */
 
 @import <Foundation/CPObject.j>
+@import <AppKit/CPControl.j>
 
 @import "NSFont.j"
 

Tools/nib2cib/NSComboBox.j

@@ -23,6 +23,7 @@
 @import <AppKit/CPTextField.j>
 @import <AppKit/CPComboBox.j>
 
+@import "Converter.j"
 @import "NSTextField.j"
 
 

Tools/nib2cib/NSDictionary.j

@@ -23,6 +23,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
+@import <Foundation/CPDictionary.j>
+
+
 @implementation NSDictionary : CPObject
 {
 }

Tools/nib2cib/NSFormatter.j

@@ -1,3 +1,27 @@
+/*
+ * NSFont.j
+ * nib2cib
+ *
+ * Created by Klaas Pieter Annema.
+ * Copyright 2010 Cappuccino Foundation.
+ *
+ * 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 <Foundation/CPObject.j>
+
 @implementation NSFormatter : CPObject
 {
 }

Tools/nib2cib/NSImageView.j

@@ -22,6 +22,8 @@
 
 @import <AppKit/CPImageView.j>
 
+@import "NSCell.j"
+
 
 @implementation CPImageView (NSCoding)
 

Tools/nib2cib/NSLevelIndicator.j

@@ -22,6 +22,9 @@
 
 @import <AppKit/CPLevelIndicator.j>
 
+@import "NSCell.j"
+
+
 @implementation CPLevelIndicator (CPCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSMatrix.j

@@ -21,6 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
+@import <AppKit/CPRadio.j>
 @import <AppKit/CPView.j>
 
 @import "NSView.j"

Tools/nib2cib/NSMenu.j

@@ -22,8 +22,6 @@
 
 @import <AppKit/CPMenu.j>
 
-@import "NSMenuItem.j"
-
 
 NS_CPMenuNameMap =
 {

Tools/nib2cib/NSMenuItem.j

@@ -26,7 +26,6 @@
 @import "NSEvent.j"
 @import "NSMenu.j"
 
-
 @implementation CPMenuItem (NSCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSMutableString.j

@@ -23,6 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
+
+
 @implementation NSMutableString : CPObject
 {
 }

Tools/nib2cib/NSNibConnector.j

@@ -20,11 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <AppKit/CPCibBindingConnector.j>
 @import <AppKit/CPCibConnector.j>
 @import <AppKit/CPCibControlConnector.j>
 @import <AppKit/CPCibOutletConnector.j>
 @import <AppKit/CPCibRuntimeAttributesConnector.j>
 @import <AppKit/CPCibHelpConnector.j>
+@import <AppKit/CPKeyValueBinding.j>
 
 NIB_CONNECTION_EQUIVALENCY_TABLE = {};
 

Tools/nib2cib/NSPopUpButton.j

@@ -23,6 +23,7 @@
 @import <AppKit/CPPopUpButton.j>
 
 @import "NSMenu.j"
+@import "NSMenuItem.j"
 
 
 @implementation CPPopUpButton (CPCoding)

Tools/nib2cib/NSSearchField.j

@@ -21,6 +21,8 @@
  */
 
 @import <AppKit/CPSearchField.j>
+
+@import "Converter.j"
 @import "NSTextField.j"
 
 

Tools/nib2cib/NSSegmentedControl.j

@@ -21,8 +21,11 @@
  */
 
 @import <AppKit/CPSegmentedControl.j>
+
+@import "Converter.j"
 @import "NSCell.j"
 
+
 @implementation CPSegmentedControl (CPCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSSlider.j

@@ -22,6 +22,9 @@
 
 @import <AppKit/CPSlider.j>
 
+@import "NSCell.j"
+
+
 @implementation CPSlider (CPCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSSortDescriptor.j

@@ -1,3 +1,25 @@
+/*
+ * NSSortDescriptor.j
+ * nib2cib
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 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 <Foundation/CPSortDescriptor.j>
 
 @implementation CPSortDescriptor (NSCoding)
@@ -32,4 +54,4 @@
     return [CPSortDescriptor class];
 }
 
-@end
+@end

Tools/nib2cib/NSStepper.j

@@ -22,6 +22,9 @@
 
 @import <AppKit/CPStepper.j>
 
+@import "NSCell.j"
+
+
 @implementation CPStepper (CPCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSTableColumn.j

@@ -20,11 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
+@import <AppKit/CPLevelIndicator.j>
 @import <AppKit/CPTableColumn.j>
 @import <AppKit/CPTableHeaderView.j>
 @import <AppKit/CPButton.j>
 
+@import "NSButton.j"
+@import "NSImageView.j"
+@import "NSLevelIndicator.j"
+@import "NSTextField.j"
+
 @implementation CPTableColumn (NSCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSTableHeaderView.j

@@ -22,6 +22,11 @@
 
 @import <AppKit/CPTableHeaderView.j>
 
+@import "Converter.j"
+
+@class CPTableView
+
+
 @implementation CPTableHeaderView (NSCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSTableView.j

@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 @import <AppKit/CPTableView.j>
 
+@import "Converter.j"
+
+
 @implementation CPTableView (NSCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder

Tools/nib2cib/NSTextField.j

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <AppKit/CPFont.j>
 @import <AppKit/CPTextField.j>
 
-@import "NSControl.j"
 @import "NSCell.j"
-@import <AppKit/CPFont.j>
+@import "NSControl.j"
 
 @implementation CPTextField (NSCoding)
 

Tools/nib2cib/NSTokenField.j

@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <AppKit/CPFont.j>
 @import <AppKit/CPTokenField.j>
 
 @import "NSControl.j"
 @import "NSCell.j"
 @import "NSTextField.j"
-@import <AppKit/CPFont.j>
 
 @implementation CPTokenField (NSCoding)
 

Tools/nib2cib/NSWindowTemplate.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <AppKit/CPPanel.j>
 @import <AppKit/_CPCibWindowTemplate.j>
 
 @global CP_NSMapClassName

Tools/nib2cib/Nib2Cib.j

@@ -20,13 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-@import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPString.j>
 @import <BlendKit/BlendKit.j>
 
-@import "NSFoundation.j"
-@import "NSAppKit.j"
-
 @import "Nib2CibKeyedUnarchiver.j"
 @import "Converter.j"
 @import "Converter+Mac.j"

Tools/nib2cib/_NSCornerView.j

@@ -21,6 +21,7 @@
  */
 
 @import <AppKit/CPTableHeaderView.j>
+@import <AppKit/_CPCornerView.j>
 
 @implementation _CPCornerView (NSCoding)