Merge branch 'fix-imports' of http://github.com/paulbaumgart/cappuccino into paulbaumgart-fix-imports

AppKit/CPAccordionView.j

@@ -27,6 +27,7 @@
 @import <Foundation/CPString.j>
 
 @import <AppKit/CPView.j>
+@import <AppKit/CPButton.j>
 
 #import "CoreGraphics/CGGeometry.h"
 

AppKit/CPArrayController.j

@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPIndexSet.j>
+
 @import <AppKit/CPObjectController.j>
 @import <AppKit/CPKeyValueBinding.j>
 

AppKit/CPBrowser.j

@@ -20,9 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPIndexSet.j>
+
 @import "CPControl.j"
 @import "CPImage.j"
 @import "CPTableView.j"
+@import "CPTextField.j"
 @import "CPScrollView.j"
 
 /*!
@@ -808,6 +811,8 @@ var _CPBrowserResizeControlBackgroundImage = nil;
 
 @end
 
+@import <Foundation/CPObject.j>
+
 @implementation _CPBrowserTableDelegate : CPObject
 {
     CPBrowser   _browser @accessors;

AppKit/CPColorPanel.j

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

AppKit/CPColorPicker.j

@@ -21,7 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPColorPanel.j"
+@import <AppKit/CPView.j>
 
 #include "Platform/Platform.h"
 

AppKit/CPController.j

@@ -11,6 +11,8 @@
 // 
 
 
+@import <Foundation/CPObject.j>
+
 var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
 
 @implementation CPController : CPObject

AppKit/CPCursor.j

@@ -14,6 +14,8 @@ Implemented class methods:
 
 #include "Platform/Platform.h"
 
+@import <Foundation/CPObject.j>
+
 var currentCursor = nil,
     cursorStack = [],
     cursors = {},

AppKit/CPDocument.j

@@ -23,6 +23,7 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPArray.j>
 
+@import "CPApplication.j"
 @import "CPResponder.j"
 @import "CPSavePanel.j"
 @import "CPViewController.j"

AppKit/CPDragServer.j

@@ -20,10 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <AppKit/CPView.j>
+@import <AppKit/CPApplication.j>
 @import <AppKit/CPEvent.j>
-@import <AppKit/CPPasteboard.j>
 @import <AppKit/CPImageView.j>
+@import <AppKit/CPPasteboard.j>
+@import <AppKit/CPView.j>
+@import <AppKit/CPWindow.j>
 
 #import "CoreGraphics/CGGeometry.h"
 #import "Platform/Platform.h"

AppKit/CPFont.j

@@ -20,6 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
+@import <Foundation/CPBundle.j>
+
+@import <AppKit/CPView.j>
+
 var _CPFonts                = {},
     _CPFontSystemFontFace   = @"Arial, sans-serif",
     _CPWrapRegExp           = new RegExp("\\s*,\\s*", "g");

AppKit/CPGraphicsContext.j

@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
+@import <AppKit/CGContext.j>
+
 var CPGraphicsContextCurrent    = nil;
 
 /*!

AppKit/CPKeyBinding.j

@@ -21,6 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
+@import <AppKit/CPEvent.j>
 
 
 CPStandardKeyBindings = {

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -2,6 +2,7 @@
 #include "../CoreGraphics/CGGeometry.h"
 #include "../Platform/Platform.h"
 
+@import "CPPanel.j"
 @import "_CPMenuWindow.j"
 
 

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,6 +1,7 @@
 
 #include "../CoreGraphics/CGGeometry.h"
 
+@import <AppKit/CPWindow.j>
 
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,3 +1,5 @@
+@import <AppKit/CPView.j>
+
 var HORIZONTAL_MARGIN           = 8.0,
     SUBMENU_INDICATOR_MARGIN    = 3.0,
     VERTICAL_MARGIN             = 4.0;

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,3 +1,5 @@
+@import <AppKit/CPControl.j>
+
 var LEFT_MARGIN                 = 3.0,
     RIGHT_MARGIN                = 14.0 + 3.0,
     STATE_COLUMN_WIDTH          = 14.0,

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,4 +1,6 @@
 
+@import <AppKit/CPControl.j>
+
 @import "_CPMenuItemSeparatorView.j"
 @import "_CPMenuItemStandardView.j"
 @import "_CPMenuItemMenuBarView.j"
@@ -252,4 +254,4 @@ var _CPMenuItemSelectionColor                   = nil,
     CGContextFillPath(context);
 }
 
-@end
+@end

AppKit/CPScrollView.j

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPView.j"
+@import "CPBox.j"
 @import "CPClipView.j"
 @import "CPScroller.j"
+@import "CPView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 

AppKit/CPSearchField.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPButton.j"
 @import "CPTextField.j"
 
 #include "CoreGraphics/CGGeometry.h"

AppKit/CPSliderColorPicker.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPView.j"
 @import "CPColorPicker.j"
 
 #include "Platform/Platform.h"

AppKit/CPTabView.j

@@ -1,5 +1,7 @@
-@import <AppKit/CPView.j>
+@import <AppKit/CPBox.j>
+@import <AppKit/CPSegmentedControl.j>
 @import <AppKit/CPTabViewItem.j>
+@import <AppKit/CPView.j>
 
 /*
     Places tabs on top with a bezeled border.

AppKit/CPTableColumn.j

@@ -22,6 +22,7 @@
 
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPObject.j>
+@import <Foundation/CPIndexSet.j>
 @import <Foundation/CPSortDescriptor.j>
 @import <Foundation/CPString.j>
 
@@ -550,4 +551,4 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
                 reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];
 }
 
-@end
+@end

AppKit/CPTableHeaderView.j

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPIndexSet.j>
+
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPView.j"
@@ -681,4 +683,4 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey",
     [aCoder encodeBool:_drawsColumnLines forKey:CPTableHeaderViewDrawsColumnLines];
 }
 
-@end
+@end

AppKit/CPTableView.j

@@ -21,6 +21,7 @@
  */
 
 @import <Foundation/CPArray.j>
+@import <Foundation/CPIndexSet.j>
 @import <AppKit/CGGradient.j>
 
 @import "CPControl.j"

AppKit/CPText.j

@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPView.j"
-
 CPEnterCharacter                = "\u0003";
 CPBackspaceCharacter            = "\u0008";
 CPTabCharacter                  = "\u0009";

AppKit/CPTokenField.j

@@ -20,7 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPCharacterSet.j>
+@import <Foundation/CPIndexSet.j>
+
+@import <AppKit/CPButton.j>
+@import <AppKit/_CPMenuWindow.j>
+@import <AppKit/CPScrollView.j>
 @import <AppKit/CPTextField.j>
+@import <AppKit/CPWindow.j>
 
 #include "Platform/Platform.h"
 

AppKit/CPView.j

@@ -22,6 +22,7 @@
 
 @import <Foundation/CPArray.j>
 @import <Foundation/CPObjJRuntime.j>
+@import <Foundation/CPSet.j>
 
 @import "CGAffineTransform.j"
 @import "CGGeometry.j"

AppKit/CPViewController.j

@@ -20,6 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPArray.j>
+
+@import <AppKit/CPApplication.j>
+@import <AppKit/CPCib.j>
 @import <AppKit/CPResponder.j>
 
 var CPViewControllerCachedCibs;

AppKit/CPWebView.j

@@ -21,6 +21,7 @@
  */
 
 @import <AppKit/CPView.j>
+@import <AppKit/CPScrollView.j>
 
 #include "Platform/Platform.h"
 

AppKit/CPWindow/CPWindow.j

@@ -26,9 +26,9 @@
 
 @import "CGGeometry.j"
 @import "CPAnimation.j"
+@import "CPPlatformWindow.j"
 @import "CPResponder.j"
 @import "CPScreen.j"
-@import "CPPlatformWindow.j"
 
 #include "../Platform/Platform.h"
 #include "../Platform/DOM/CPDOMDisplayServer.h"

AppKit/CPWindow/_CPWindowView.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPView.j"
 @import "CPImageView.j"
+@import "CPView.j"
 
 #include "../CoreGraphics/CGGeometry.h"
 

AppKit/Cib/_CPCibWindowTemplate.j

@@ -1,6 +1,9 @@
 
 @import <Foundation/CPObject.j>
 
+@import <AppKit/CGGeometry.j>
+@import <AppKit/CPWindow.j>
+
 
 var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinSizeKey",
     _CPCibWindowTemplateMaxSizeKey                  = @"_CPCibWindowTemplateMaxSizeKey",

AppKit/CoreGraphics/CGContext.j

@@ -23,8 +23,9 @@
 #include "CGGeometry.h"
 #include "CGAffineTransform.h"
 
-@import "CGGeometry.j"
 @import "CGAffineTransform.j"
+@import "CPCompatibility.j"
+@import "CGGeometry.j"
 @import "CGPath.j"
 
 kCGLineCapButt              = 0;

AppKit/_CPDisplayServer.j

@@ -24,6 +24,8 @@
 #include "CoreGraphics/CGAffineTransform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
 
+@import <Foundation/CPRunLoop.j>
+
 PREPARE_DOM_OPTIMIZATION();
 
 var displayObjects      = [],

AppKit/_CPToolbarShowColorsItem.j

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

Foundation/CPCharacterSet.j

@@ -6,6 +6,7 @@
 // Please see Cappuccino's LICENSE file for details.
 
 @import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
 // CPCharacterSet is a class cluster. Concrete implementations
 // follow after the main abstract class.

Foundation/CPKeyedUnarchiver.j

@@ -20,8 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPArray.j"
+@import "CPData.j"
+@import "CPDictionary.j"
 @import "CPCoder.j"
+@import "CPKeyedArchiver.j"
 @import "CPNull.j"
+@import "CPNumber.j"
+@import "CPString.j"
 
 
 CPInvalidUnarchiveOperationException    = @"CPInvalidUnarchiveOperationException";

Foundation/CPOperation.j

@@ -20,6 +20,7 @@
  */
 
 @import "CPObject.j"
+@import "CPArray.j"
 
 /*!
     Operations receive very low priority for execution.

Foundation/CPOperationQueue.j

@@ -23,6 +23,7 @@
 @import "CPInvocationOperation.j"
 @import "CPObject.j"
 @import "CPOperation.j"
+@import "CPTimer.j"
 
 // the global queue (mainQueue)
 var cpOperationMainQueue = nil;

Foundation/CPUndoManager.j

@@ -23,6 +23,7 @@
 @import "CPInvocation.j"
 @import "CPObject.j"
 @import "CPProxy.j"
+@import "CPRunLoop.j"
 
 
 var CPUndoManagerNormal     = 0,

Foundation/CPWebDAVManager.j

@@ -20,6 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPURL.j>
+
 var setURLResourceValuesForKeysFromProperties = function(aURL, keys, properties)
 {
     var resourceType = [properties objectForKey:@"resourcetype"];