From 01852d8075d870225ec609e66557e129ea279b50 Mon Sep 17 00:00:00 2001 From: Paul Baumgart Date: Tue, 5 Oct 2010 15:54:25 -0700 Subject: [PATCH] Fix a bunch of missing @imports. All classes (excluding the ones prefixed with underscores) in Foundation and AppKit can now be loaded individually except CPOpenPanel and CPSavePanel. These two classes have some sort of dependency cycle that seems impossible to resolve without forward declarations (which we don't have). --- AppKit/CPAccordionView.j | 1 + AppKit/CPArrayController.j | 2 ++ AppKit/CPBrowser.j | 5 +++++ AppKit/CPColorPanel.j | 1 + AppKit/CPColorPicker.j | 2 +- AppKit/CPController.j | 2 ++ AppKit/CPCursor.j | 2 ++ AppKit/CPDocument.j | 1 + AppKit/CPDragServer.j | 6 ++++-- AppKit/CPFont.j | 5 +++++ AppKit/CPGraphicsContext.j | 3 +++ AppKit/CPKeyBinding.j | 1 + AppKit/CPMenu/_CPMenuBarWindow.j | 1 + AppKit/CPMenu/_CPMenuWindow.j | 1 + AppKit/CPMenuItem/_CPMenuItemMenuBarView.j | 2 ++ AppKit/CPMenuItem/_CPMenuItemStandardView.j | 2 ++ AppKit/CPMenuItem/_CPMenuItemView.j | 4 +++- AppKit/CPScrollView.j | 3 ++- AppKit/CPSearchField.j | 1 + AppKit/CPSliderColorPicker.j | 1 + AppKit/CPTabView.j | 4 +++- AppKit/CPTableColumn.j | 3 ++- AppKit/CPTableHeaderView.j | 4 +++- AppKit/CPTableView.j | 1 + AppKit/CPText.j | 2 -- AppKit/CPTokenField.j | 7 +++++++ AppKit/CPView.j | 1 + AppKit/CPViewController.j | 4 ++++ AppKit/CPWebView.j | 1 + AppKit/CPWindow/CPWindow.j | 2 +- AppKit/CPWindow/_CPWindowView.j | 2 +- AppKit/Cib/_CPCibWindowTemplate.j | 3 +++ AppKit/CoreGraphics/CGContext.j | 3 ++- AppKit/_CPDisplayServer.j | 2 ++ AppKit/_CPToolbarShowColorsItem.j | 1 + Foundation/CPCharacterSet.j | 1 + Foundation/CPKeyedUnarchiver.j | 6 ++++++ Foundation/CPOperation.j | 1 + Foundation/CPOperationQueue.j | 1 + Foundation/CPUndoManager.j | 1 + Foundation/CPWebDAVManager.j | 4 ++++ 41 files changed, 87 insertions(+), 13 deletions(-) diff --git a/AppKit/CPAccordionView.j b/AppKit/CPAccordionView.j index 4762499ec..8cb047c22 100644 --- a/AppKit/CPAccordionView.j +++ b/AppKit/CPAccordionView.j @@ -27,6 +27,7 @@ @import @import +@import #import "CoreGraphics/CGGeometry.h" diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j index b4f3365e3..382d474b7 100644 --- a/AppKit/CPArrayController.j +++ b/AppKit/CPArrayController.j @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import + @import @import diff --git a/AppKit/CPBrowser.j b/AppKit/CPBrowser.j index c89076114..7e2b50960 100644 --- a/AppKit/CPBrowser.j +++ b/AppKit/CPBrowser.j @@ -20,9 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import + @import "CPControl.j" @import "CPImage.j" @import "CPTableView.j" +@import "CPTextField.j" @import "CPScrollView.j" /*! @@ -808,6 +811,8 @@ var _CPBrowserResizeControlBackgroundImage = nil; @end +@import + @implementation _CPBrowserTableDelegate : CPObject { CPBrowser _browser @accessors; diff --git a/AppKit/CPColorPanel.j b/AppKit/CPColorPanel.j index b361dcc84..1e883fce8 100644 --- a/AppKit/CPColorPanel.j +++ b/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" diff --git a/AppKit/CPColorPicker.j b/AppKit/CPColorPicker.j index 8d4ed20c4..0619b9363 100644 --- a/AppKit/CPColorPicker.j +++ b/AppKit/CPColorPicker.j @@ -21,7 +21,7 @@ */ @import -@import "CPColorPanel.j" +@import #include "Platform/Platform.h" diff --git a/AppKit/CPController.j b/AppKit/CPController.j index a4edd6660..476fc9243 100644 --- a/AppKit/CPController.j +++ b/AppKit/CPController.j @@ -11,6 +11,8 @@ // +@import + var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey"; @implementation CPController : CPObject diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j index d550fb10c..6a525e6e6 100755 --- a/AppKit/CPCursor.j +++ b/AppKit/CPCursor.j @@ -14,6 +14,8 @@ Implemented class methods: #include "Platform/Platform.h" +@import + var currentCursor = nil, cursorStack = [], cursors = {}, diff --git a/AppKit/CPDocument.j b/AppKit/CPDocument.j index d6ddd55b9..2a52905d0 100644 --- a/AppKit/CPDocument.j +++ b/AppKit/CPDocument.j @@ -23,6 +23,7 @@ @import @import +@import "CPApplication.j" @import "CPResponder.j" @import "CPSavePanel.j" @import "CPViewController.j" diff --git a/AppKit/CPDragServer.j b/AppKit/CPDragServer.j index adb529706..c3e25b0c3 100644 --- a/AppKit/CPDragServer.j +++ b/AppKit/CPDragServer.j @@ -20,10 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import +@import @import -@import @import +@import +@import +@import #import "CoreGraphics/CGGeometry.h" #import "Platform/Platform.h" diff --git a/AppKit/CPFont.j b/AppKit/CPFont.j index 74da13339..eeebca263 100644 --- a/AppKit/CPFont.j +++ b/AppKit/CPFont.j @@ -20,6 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import +@import + +@import + var _CPFonts = {}, _CPFontSystemFontFace = @"Arial, sans-serif", _CPWrapRegExp = new RegExp("\\s*,\\s*", "g"); diff --git a/AppKit/CPGraphicsContext.j b/AppKit/CPGraphicsContext.j index 60d6d35b9..4b2f15682 100644 --- a/AppKit/CPGraphicsContext.j +++ b/AppKit/CPGraphicsContext.j @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import +@import + var CPGraphicsContextCurrent = nil; /*! diff --git a/AppKit/CPKeyBinding.j b/AppKit/CPKeyBinding.j index 5cc46b422..196785f03 100644 --- a/AppKit/CPKeyBinding.j +++ b/AppKit/CPKeyBinding.j @@ -21,6 +21,7 @@ */ @import +@import CPStandardKeyBindings = { diff --git a/AppKit/CPMenu/_CPMenuBarWindow.j b/AppKit/CPMenu/_CPMenuBarWindow.j index 29e582016..dc7cbb4bd 100644 --- a/AppKit/CPMenu/_CPMenuBarWindow.j +++ b/AppKit/CPMenu/_CPMenuBarWindow.j @@ -2,6 +2,7 @@ #include "../CoreGraphics/CGGeometry.h" #include "../Platform/Platform.h" +@import "CPPanel.j" @import "_CPMenuWindow.j" diff --git a/AppKit/CPMenu/_CPMenuWindow.j b/AppKit/CPMenu/_CPMenuWindow.j index 1d0889789..216853206 100644 --- a/AppKit/CPMenu/_CPMenuWindow.j +++ b/AppKit/CPMenu/_CPMenuWindow.j @@ -1,6 +1,7 @@ #include "../CoreGraphics/CGGeometry.h" +@import var _CPMenuWindowPool = [], _CPMenuWindowPoolCapacity = 5, diff --git a/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j b/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j index 4490c669e..5308ee35c 100644 --- a/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j +++ b/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j @@ -1,3 +1,5 @@ +@import + var HORIZONTAL_MARGIN = 8.0, SUBMENU_INDICATOR_MARGIN = 3.0, VERTICAL_MARGIN = 4.0; diff --git a/AppKit/CPMenuItem/_CPMenuItemStandardView.j b/AppKit/CPMenuItem/_CPMenuItemStandardView.j index f41a42150..04b581ae8 100644 --- a/AppKit/CPMenuItem/_CPMenuItemStandardView.j +++ b/AppKit/CPMenuItem/_CPMenuItemStandardView.j @@ -1,3 +1,5 @@ +@import + var LEFT_MARGIN = 3.0, RIGHT_MARGIN = 14.0 + 3.0, STATE_COLUMN_WIDTH = 14.0, diff --git a/AppKit/CPMenuItem/_CPMenuItemView.j b/AppKit/CPMenuItem/_CPMenuItemView.j index 7b5438a17..645ae004e 100644 --- a/AppKit/CPMenuItem/_CPMenuItemView.j +++ b/AppKit/CPMenuItem/_CPMenuItemView.j @@ -1,4 +1,6 @@ +@import + @import "_CPMenuItemSeparatorView.j" @import "_CPMenuItemStandardView.j" @import "_CPMenuItemMenuBarView.j" @@ -252,4 +254,4 @@ var _CPMenuItemSelectionColor = nil, CGContextFillPath(context); } -@end \ No newline at end of file +@end diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j index 1838cb406..5d8e4afba 100644 --- a/AppKit/CPScrollView.j +++ b/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" diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index 1035110b9..4df6d4722 100644 --- a/AppKit/CPSearchField.j +++ b/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" diff --git a/AppKit/CPSliderColorPicker.j b/AppKit/CPSliderColorPicker.j index 3934b89db..be7a92643 100644 --- a/AppKit/CPSliderColorPicker.j +++ b/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" diff --git a/AppKit/CPTabView.j b/AppKit/CPTabView.j index 2ce552ff3..7a9f86697 100644 --- a/AppKit/CPTabView.j +++ b/AppKit/CPTabView.j @@ -1,5 +1,7 @@ -@import +@import +@import @import +@import /* Places tabs on top with a bezeled border. diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index 28808a2b5..8e4d34968 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -22,6 +22,7 @@ @import @import +@import @import @import @@ -550,4 +551,4 @@ var CPTableColumnIdentifierKey = @"CPTableColumnIdentifierKey", reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."]; } -@end \ No newline at end of file +@end diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index 5656e83b7..84272017a 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import + @import "CPTableColumn.j" @import "CPTableView.j" @import "CPView.j" @@ -681,4 +683,4 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey", [aCoder encodeBool:_drawsColumnLines forKey:CPTableHeaderViewDrawsColumnLines]; } -@end \ No newline at end of file +@end diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index d532cf4b1..45edbf1a0 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -21,6 +21,7 @@ */ @import +@import @import @import "CPControl.j" diff --git a/AppKit/CPText.j b/AppKit/CPText.j index 4ac6354d4..3bda6b40b 100644 --- a/AppKit/CPText.j +++ b/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"; diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index 0ce29eced..334d8b41f 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -20,7 +20,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import +@import + +@import +@import +@import @import +@import #include "Platform/Platform.h" diff --git a/AppKit/CPView.j b/AppKit/CPView.j index 9b13084f0..d78204687 100644 --- a/AppKit/CPView.j +++ b/AppKit/CPView.j @@ -22,6 +22,7 @@ @import @import +@import @import "CGAffineTransform.j" @import "CGGeometry.j" diff --git a/AppKit/CPViewController.j b/AppKit/CPViewController.j index b5c18de9f..fb734a5f3 100644 --- a/AppKit/CPViewController.j +++ b/AppKit/CPViewController.j @@ -20,6 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import + +@import +@import @import var CPViewControllerCachedCibs; diff --git a/AppKit/CPWebView.j b/AppKit/CPWebView.j index dca2637ab..698620efd 100644 --- a/AppKit/CPWebView.j +++ b/AppKit/CPWebView.j @@ -21,6 +21,7 @@ */ @import +@import #include "Platform/Platform.h" diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j index 3fafc77bd..d03e53e58 100644 --- a/AppKit/CPWindow/CPWindow.j +++ b/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" diff --git a/AppKit/CPWindow/_CPWindowView.j b/AppKit/CPWindow/_CPWindowView.j index c73a2c6cd..77314d44d 100644 --- a/AppKit/CPWindow/_CPWindowView.j +++ b/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" diff --git a/AppKit/Cib/_CPCibWindowTemplate.j b/AppKit/Cib/_CPCibWindowTemplate.j index 9c792c4bd..9cfb437df 100644 --- a/AppKit/Cib/_CPCibWindowTemplate.j +++ b/AppKit/Cib/_CPCibWindowTemplate.j @@ -1,6 +1,9 @@ @import +@import +@import + var _CPCibWindowTemplateMinSizeKey = @"_CPCibWindowTemplateMinSizeKey", _CPCibWindowTemplateMaxSizeKey = @"_CPCibWindowTemplateMaxSizeKey", diff --git a/AppKit/CoreGraphics/CGContext.j b/AppKit/CoreGraphics/CGContext.j index fd28689d1..38c33c2ab 100644 --- a/AppKit/CoreGraphics/CGContext.j +++ b/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; diff --git a/AppKit/_CPDisplayServer.j b/AppKit/_CPDisplayServer.j index 294e06898..74caa3f29 100644 --- a/AppKit/_CPDisplayServer.j +++ b/AppKit/_CPDisplayServer.j @@ -24,6 +24,8 @@ #include "CoreGraphics/CGAffineTransform.h" #include "Platform/DOM/CPDOMDisplayServer.h" +@import + PREPARE_DOM_OPTIMIZATION(); var displayObjects = [], diff --git a/AppKit/_CPToolbarShowColorsItem.j b/AppKit/_CPToolbarShowColorsItem.j index 7238e06ff..42c76ecf2 100644 --- a/AppKit/_CPToolbarShowColorsItem.j +++ b/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" diff --git a/Foundation/CPCharacterSet.j b/Foundation/CPCharacterSet.j index 48aa76ea4..fcc5c04d9 100644 --- a/Foundation/CPCharacterSet.j +++ b/Foundation/CPCharacterSet.j @@ -6,6 +6,7 @@ // Please see Cappuccino's LICENSE file for details. @import +@import // CPCharacterSet is a class cluster. Concrete implementations // follow after the main abstract class. diff --git a/Foundation/CPKeyedUnarchiver.j b/Foundation/CPKeyedUnarchiver.j index 4737a1705..e5c0823f5 100644 --- a/Foundation/CPKeyedUnarchiver.j +++ b/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"; diff --git a/Foundation/CPOperation.j b/Foundation/CPOperation.j index 710dc5961..1bf66426c 100644 --- a/Foundation/CPOperation.j +++ b/Foundation/CPOperation.j @@ -20,6 +20,7 @@ */ @import "CPObject.j" +@import "CPArray.j" /*! Operations receive very low priority for execution. diff --git a/Foundation/CPOperationQueue.j b/Foundation/CPOperationQueue.j index b849cdd43..f0991b248 100644 --- a/Foundation/CPOperationQueue.j +++ b/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; diff --git a/Foundation/CPUndoManager.j b/Foundation/CPUndoManager.j index fb6865f7c..0504a9ab5 100644 --- a/Foundation/CPUndoManager.j +++ b/Foundation/CPUndoManager.j @@ -23,6 +23,7 @@ @import "CPInvocation.j" @import "CPObject.j" @import "CPProxy.j" +@import "CPRunLoop.j" var CPUndoManagerNormal = 0, diff --git a/Foundation/CPWebDAVManager.j b/Foundation/CPWebDAVManager.j index 6b821fb08..a32a857fd 100644 --- a/Foundation/CPWebDAVManager.j +++ b/Foundation/CPWebDAVManager.j @@ -20,6 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import +@import +@import + var setURLResourceValuesForKeysFromProperties = function(aURL, keys, properties) { var resourceType = [properties objectForKey:@"resourcetype"];