Added @accessor support, @import, and fixed spacing bug with @selector.

Reviewed by ross.

AppKit/AppKit.j

@@ -20,44 +20,44 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CALayer.j"
-import "CPAnimation.j"
-import "CPApplication.j"
-import "CPButton.j"
-import "CPClipView.j"
-import "CPCollectionView.j"
-import "CPColor.j"
-import "CPColorPanel.j"
-import "CPColorWell.j"
-import "CPCompatibility.j"
-import "CPControl.j"
-import "CPCookie.j"
-import "CPDocument.j"
-import "CPDocumentController.j"
-import "CPEvent.j"
-import "CPFont.j"
-import "CPFontManager.j"
-import "CPGeometry.j"
-import "CPImage.j"
-import "CPImageView.j"
-import "CPMenu.j"
-import "CPMenuItem.j"
-import "CPPanel.j"
-import "CPPasteboard.j"
-import "CPPopUpButton.j"
-import "CPProgressIndicator.j"
-import "CPResponder.j"
-import "CPScroller.j"
-import "CPScrollView.j"
-import "CPSecureTextField.j"
-import "CPSegmentedControl.j"
-import "CPShadow.j"
-import "CPSlider.j"
-import "CPSplitView.j"
-import "CPTextField.j"
-import "CPToolbar.j"
-import "CPToolbarItem.j"
-import "CPView.j"
-import "CPWebView.j"
-import "CPWindow.j"
-import "CPWindowController.j"
+@import "CALayer.j"
+@import "CPAnimation.j"
+@import "CPApplication.j"
+@import "CPButton.j"
+@import "CPClipView.j"
+@import "CPCollectionView.j"
+@import "CPColor.j"
+@import "CPColorPanel.j"
+@import "CPColorWell.j"
+@import "CPCompatibility.j"
+@import "CPControl.j"
+@import "CPCookie.j"
+@import "CPDocument.j"
+@import "CPDocumentController.j"
+@import "CPEvent.j"
+@import "CPFont.j"
+@import "CPFontManager.j"
+@import "CPGeometry.j"
+@import "CPImage.j"
+@import "CPImageView.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
+@import "CPPanel.j"
+@import "CPPasteboard.j"
+@import "CPPopUpButton.j"
+@import "CPProgressIndicator.j"
+@import "CPResponder.j"
+@import "CPScroller.j"
+@import "CPScrollView.j"
+@import "CPSecureTextField.j"
+@import "CPSegmentedControl.j"
+@import "CPShadow.j"
+@import "CPSlider.j"
+@import "CPSplitView.j"
+@import "CPTextField.j"
+@import "CPToolbar.j"
+@import "CPToolbarItem.j"
+@import "CPView.j"
+@import "CPWebView.j"
+@import "CPWindow.j"
+@import "CPWindowController.j"

AppKit/CPAnimation.j

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
+
+@import "CAMediaTimingFunction.j"
 
-import "CAMediaTimingFunction.j"
 
 /*
     @global

AppKit/CPApplication.j

@@ -20,13 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPBundle.j>
+@import <Foundation/CPBundle.j>
+
+@import "CPCompatibility.j"
+@import "CPEvent.j"
+@import "CPMenu.j"
+@import "CPResponder.j"
+@import "CPDocumentController.j"
 
-import "CPCompatibility.j"
-import "CPEvent.j"
-import "CPMenu.j"
-import "CPResponder.j"
-import "CPDocumentController.j"
 
 CPApp = nil;
 

AppKit/CPButton.j

@@ -20,13 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "_CPImageAndTitleView.j"
-import "CGGeometry.j"
+@import "_CPImageAndTitleView.j"
+@import "CGGeometry.j"
 
-import "CPControl.j"
+@import "CPControl.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
+
 CPScaleProportionally   = 0;
 CPScaleToFit            = 1;
 CPScaleNone             = 2;

AppKit/CPClipView.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPView.j"
+@import "CPView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
+
 /*! @class CPClipView
 
     <objj>CPClipView</objj> allows you to define a clip rect and display only that portion of its containing view.  

AppKit/CPCollectionView.j

@@ -20,13 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPArray.j>
-import <Foundation/CPData.j>
-import <Foundation/CPIndexSet.j>
-import <Foundation/CPKeyedArchiver.j>
-import <Foundation/CPKeyedUnarchiver.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPData.j>
+@import <Foundation/CPIndexSet.j>
+@import <Foundation/CPKeyedArchiver.j>
+@import <Foundation/CPKeyedUnarchiver.j>
+
+@import <AppKit/CPView.j>
 
-import <AppKit/CPView.j>
 
 /*! @class CPCollectionView
 

AppKit/CPColor.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
 
-import "CGColor.j"
+@import "CGColor.j"
+
+@import "CPCompatibility.j"
+@import "CPImage.j"
 
-import "CPCompatibility.j"
-import "CPImage.j"
 
 var _redComponent        = 0,
     _greenComponent      = 1,

AppKit/CPColorPanel.j

@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPButton.j"
-import "CPColorPicker.j"
-import "CPCookie.j"
-import "CPPanel.j"
-import "CPSliderColorPicker.j"
-import "CPView.j"
+@import "CPButton.j"
+@import "CPColorPicker.j"
+@import "CPCookie.j"
+@import "CPPanel.j"
+@import "CPSliderColorPicker.j"
+@import "CPView.j"
 
 
 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";

AppKit/CPColorPicker.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/Foundation.j>
-import <AppKit/CPView.j>
-import <AppKit/CPImage.j>
-import <AppKit/CPImageView.j>
+@import <Foundation/Foundation.j>
+@import <AppKit/CPView.j>
+@import <AppKit/CPImage.j>
+@import <AppKit/CPImageView.j>
+
 
 /*! @class CPColorPicker
 

AppKit/CPColorWell.j

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPString.j>
+@import <Foundation/CPString.j>
 
-import "CPView.j"
-import "CPColor.j"
-import "CPColorPanel.j"
+@import "CPView.j"
+@import "CPColor.j"
+@import "CPColorPanel.j"
 
 
 var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiveNotification";

AppKit/CPCompatibility.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPEvent.j"
+@import "CPEvent.j"
 
 // Browser Engines
 CPUnknownBrowserEngine                  = 0;

AppKit/CPControl.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPFont.j"
-import "CPShadow.j"
-import "CPView.j"
+@import "CPFont.j"
+@import "CPShadow.j"
+@import "CPView.j"
 
 #include "Platform/Platform.h"
 
+
 /*
     @global
     @group CPTextAlignment

AppKit/CPCookie.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
 
 /*! @class CPCookie

AppKit/CPDocument.j

@@ -20,11 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPString.j>
-import <Foundation/CPArray.j>
+@import <Foundation/CPString.j>
+@import <Foundation/CPArray.j>
+
+@import "CPResponder.j"
+@import "CPWindowController.j"
 
-import "CPResponder.j"
-import "CPWindowController.j"
 
 /*
     @global

AppKit/CPDocumentController.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPBundle.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPBundle.j>
+
+@import "CPDocument.j"
 
-import "CPDocument.j"
 
 var CPSharedDocumentController = nil;
 

AppKit/CPDragServer.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <AppKit/CPView.j>
-import <AppKit/CPEvent.j>
-import <AppKit/CPPasteboard.j>
-import <AppKit/CPImageView.j>
+@import <AppKit/CPView.j>
+@import <AppKit/CPEvent.j>
+@import <AppKit/CPPasteboard.j>
+@import <AppKit/CPImageView.j>
+
 
 var CPSharedDragServer     = nil;
     

AppKit/CPEvent.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
 
 #include "CoreGraphics/CGGeometry.h"
 
+
 /*
     @global
     @group CPEventType

AppKit/CPFlashMovie.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
 
 
 @implementation CPFlashMovie : CPObject

AppKit/CPFlashView.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPDOMWindowBridge.j"
-import "CPFlashMovie.j"
-import "CPView.j"
+@import "CPDOMWindowBridge.j"
+@import "CPFlashMovie.j"
+@import "CPView.j"
 
 
 @implementation CPFlashView : CPView

AppKit/CPFontManager.j

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

AppKit/CPGeometry.j

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

AppKit/CPImage.j

@@ -20,13 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
  
-import <Foundation/CPBundle.j>
-import <Foundation/CPNotificationCenter.j>
-import <Foundation/CPObject.j>
-import <Foundation/CPRunLoop.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPBundle.j>
+@import <Foundation/CPNotificationCenter.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPRunLoop.j>
+@import <Foundation/CPString.j>
 
-import "CPGeometry.j"
+@import "CPGeometry.j"
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;

AppKit/CPImageView.j

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPNotificationCenter.j>
+@import <Foundation/CPNotificationCenter.j>
 
-import "CPControl.j"
-import "CPImage.j"
-import "CPShadowView.j"
+@import "CPControl.j"
+@import "CPImage.j"
+@import "CPShadowView.j"
 
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"

AppKit/CPMenu.j

@@ -20,16 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPArray.j>
-import <Foundation/CPDictionary.j>
-import <Foundation/CPNotificationCenter.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPNotificationCenter.j>
+@import <Foundation/CPString.j>
 
-import "_CPImageAndTitleView.j"
-import "CPApplication.j"
-import "CPClipView.j"
-import "CPMenuItem.j"
-import "CPPanel.j"
+@import "_CPImageAndTitleView.j"
+@import "CPApplication.j"
+@import "CPClipView.j"
+@import "CPMenuItem.j"
+@import "CPPanel.j"
 
 #include "Platform/Platform.h"
 

AppKit/CPMenuItem.j

@@ -20,13 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPCoder.j>
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPCoder.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
-import <AppKit/CPImage.j>
-import <AppKit/CPMenu.j>
-import <AppKit/CPView.j>
+@import <AppKit/CPImage.j>
+@import <AppKit/CPMenu.j>
+@import <AppKit/CPView.j>
 
 /*! @class CPMenuItem
 

AppKit/CPOutlineView.j

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

AppKit/CPPanel.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPWindow.j"
+@import "CPWindow.j"
 
 
 CPOKButton      = 1;

AppKit/CPPasteboard.j

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPArray.j>
-import <Foundation/CPDictionary.j>
-import <Foundation/CPPropertyListSerialization.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPPropertyListSerialization.j>
 
 
 CPGeneralPboard         = @"CPGeneralPboard";

AppKit/CPPopUpButton.j

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPButton.j"
-import "CPGeometry.j"
-import "CPMenu.j"
-import "CPMenuItem.j"
+@import "CPButton.j"
+@import "CPGeometry.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
 
 
 var VISIBLE_MARGIN  = 7.0;

AppKit/CPProgressIndicator.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <AppKit/CGGeometry.j>
-import <AppKit/CPImageView.j>
-import <AppKit/CPView.j>
+@import <AppKit/CGGeometry.j>
+@import <AppKit/CPImageView.j>
+@import <AppKit/CPView.j>
 
 #include "CoreGraphics/CGGeometry.h"
 
+
 /*
     @global
     @group CPProgressIndicatorStyle

AppKit/CPResponder.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
+
 
 CPDeleteKeyCode     = 8;
 CPUpArrowKeyCode    = 63232;

AppKit/CPScrollView.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPView.j"
-import "CPClipView.j"
-import "CPScroller.j"
+@import "CPView.j"
+@import "CPClipView.j"
+@import "CPScroller.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
+
 /*! @class CPScrollView
 
     Used to display views that are too large for the viewing area. the <objj>CPScrollView</objj>

AppKit/CPScroller.j

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

AppKit/CPSecureTextField.j

@@ -1,4 +1,4 @@
-import "CPTextField.j"
+@import "CPTextField.j"
 
 #include "Platform/Platform.h"
 

AppKit/CPSegmentedControl.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPArray.j>
+@import <Foundation/CPArray.j>
 
-import "CPControl.j"
+@import "CPControl.j"
 
 /*
     @global

AppKit/CPShadow.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
+
 
 /*! @class CPShadow
 

AppKit/CPShadowView.j

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

AppKit/CPSlider.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPControl.j"
+@import "CPControl.j"
+
 
 var CPSliderHorizontalKnobImage         = nil,
     CPSliderHorizontalBarLeftImage      = nil,

AppKit/CPSliderColorPicker.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/Foundation.j>
+@import <Foundation/Foundation.j>
+
+@import <AppKit/CPView.j>
+@import <AppKit/CPSlider.j>
+@import <AppKit/CPColorPicker.j>
+@import <AppKit/CPColorPanel.j>
 
-import <AppKit/CPView.j>
-import <AppKit/CPSlider.j>
-import <AppKit/CPColorPicker.j>
-import <AppKit/CPColorPanel.j>
 
 /*
     @ignore

AppKit/CPSplitView.j

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

AppKit/CPStringDrawing.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPString.j>
+@import <Foundation/CPString.j>
 
 
 var CPStringReferenceElement    = nil;

AppKit/CPTabView.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPImageView.j"
-import "CPTabViewItem.j"
-import "CPView.j"
+@import "CPImageView.j"
+@import "CPTabViewItem.j"
+@import "CPView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
+
 /*
     Places tabs on top with a bezeled border.
     @global

AppKit/CPTabViewItem.j

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
+
+@import <AppKit/CPView.j>
 
-import <AppKit/CPView.j>
 
 /*
     The tab is currently selected.

AppKit/CPTableColumn.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/Foundation.j>
 
-import <Foundation/Foundation.j>
 
 /*
 @ignore

AppKit/CPTextField.j

@@ -20,12 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPControl.j"
-import "CPStringDrawing.j"
+@import "CPControl.j"
+@import "CPStringDrawing.j"
 
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
 
+
 /*
     @global
     @group CPLineBreakMode

AppKit/CPToolbar.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
+
+@import "CPPopUpButton.j"
+@import "CPToolbarItem.j"
 
-import "CPPopUpButton.j"
-import "CPToolbarItem.j"
 
 /*
     @global

AppKit/CPToolbarItem.j

@@ -20,11 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import <AppKit/CPImage.j>
+@import <AppKit/CPView.j>
 
-import <AppKit/CPImage.j>
-import <AppKit/CPView.j>
 
 /*
     @global

AppKit/CPView.j

@@ -20,17 +20,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPArray.j>
-import <Foundation/CPObjJRuntime.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPObjJRuntime.j>
 
-import "CGAffineTransform.j"
-import "CGGeometry.j"
+@import "CGAffineTransform.j"
+@import "CGGeometry.j"
+
+@import "CPColor.j"
+@import "CPDOMDisplayServer.j"
+@import "CPGeometry.j"
+@import "CPResponder.j"
+@import "CPGraphicsContext.j"
 
-import "CPColor.j"
-import "CPDOMDisplayServer.j"
-import "CPGeometry.j"
-import "CPResponder.j"
-import "CPGraphicsContext.j"
 
 #include "Platform/Platform.h"
 #include "CoreGraphics/CGAffineTransform.h"

AppKit/CPWebView.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPView.j"
+@import "CPView.j"
+
 
 // FIXME: implement these where possible:
 /*

AppKit/CPWindow.j

@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPNotificationCenter.j>
-import <Foundation/CPUndoManager.j>
+@import <Foundation/CPNotificationCenter.j>
+@import <Foundation/CPUndoManager.j>
 
-import "CGGeometry.j"
-import "CPAnimation.j"
-import "CPResponder.j"
+@import "CGGeometry.j"
+@import "CPAnimation.j"
+@import "CPResponder.j"
 
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
@@ -1750,7 +1750,7 @@ var interpolate = function(fromValue, toValue, progress)
 
 @end
 
-import "CPDragServer.j"
-import "CPDOMWindowBridge.j"
-import "_CPWindowView.j"
-import "CPView.j"
+@import "CPDragServer.j"
+@import "CPDOMWindowBridge.j"
+@import "_CPWindowView.j"
+@import "CPView.j"

AppKit/CPWindowController.j

@@ -20,15 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
-import "CPResponder.j"
-import "CPWindow.j"
-import "CPDocument.j"
+@import "CPResponder.j"
+@import "CPWindow.j"
+@import "CPDocument.j"
 
 #include "Platform/Platform.h"
 
+
 /*! @class CPWindowController
 
     An instance of a <objj>CPWindowController</objj> manages a <objj>CPWindow</objj>. It has methods

AppKit/Cib/CPCib.j

@@ -20,15 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPURLConnection.j>
-import <Foundation/CPURLRequest.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPURLConnection.j>
+@import <Foundation/CPURLRequest.j>
+
+@import "_CPCibCustomObject.j"
+@import "_CPCibCustomView.j"
+@import "_CPCibKeyedUnarchiver.j"
+@import "_CPCibObjectData.j"
+@import "_CPCibWindowTemplate.j"
 
-import "_CPCibCustomObject.j"
-import "_CPCibCustomView.j"
-import "_CPCibKeyedUnarchiver.j"
-import "_CPCibObjectData.j"
-import "_CPCibWindowTemplate.j"
 
 CPCibOwner              = @"CPCibOwner",
 CPCibTopLevelObjects    = @"CPCibTopLevelObjects";

AppKit/Cib/_CPCibConnector.j

@@ -1,6 +1,6 @@
 
-import <Foundation/CPObject.j>
-import <Foundation/CPKeyValueCoding.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPKeyValueCoding.j>
 
 
 var _CPCibConnectorSourceKey        = @"_CPCibConnectorSourceKey",

AppKit/Cib/_CPCibCustomObject.j

@@ -1,5 +1,5 @@
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
 
 
 var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";

AppKit/Cib/_CPCibCustomView.j

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

AppKit/Cib/_CPCibKeyedUnarchiver.j

@@ -1,5 +1,5 @@
 
-import <Foundation/CPKeyedUnarchiver.j>
+@import <Foundation/CPKeyedUnarchiver.j>
 
 
 @implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver

AppKit/Cib/_CPCibLoading.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPBundle.j>
-import <Foundation/CPDictionary.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPBundle.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPString.j>
 
 
 var CPCibOwner = @"CPCibOwner";

AppKit/Cib/_CPCibObjectData.j

@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPArray.j>
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
-import "CPCib.j"
-import "_CPCibConnector.j"
+@import "CPCib.j"
+@import "_CPCibConnector.j"
 
 
 @implementation _CPCibObjectData : CPObject

AppKit/Cib/_CPCibWindowTemplate.j

@@ -1,5 +1,5 @@
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
 
 
 var _CPCibWindowTemplateMinSizeKey          = @"_CPCibWindowTemplateMinSizeKey",

AppKit/CoreAnimation/CAAnimation.j

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
-import "CAMediaTimingFunction.j"
+@import "CAMediaTimingFunction.j"
 
 /*
     This is an animation class.

AppKit/CoreAnimation/CABackingStore.j

@@ -20,11 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CGGeometry.j"
-import "CPCompatibility.j"
+@import "CGGeometry.j"
+@import "CPCompatibility.j"
 
 #define PIXEL(pixels) pixels + "px";
 
+
 function CABackingStoreGetContext(aBackingStore)
 {
     return aBackingStore.context;

AppKit/CoreAnimation/CAFlashLayer.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CALayer.j"
-import "CPFlashMovie.j"
+@import "CALayer.j"
+@import "CPFlashMovie.j"
 
 
 @implementation CAFlashLayer : CALayer

AppKit/CoreAnimation/CALayer.j

@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
 
-import <AppKit/CABackingStore.j>
+@import <AppKit/CABackingStore.j>
 
-import <AppKit/CGContext.j>
-import <AppKit/CGGeometry.j>
+@import <AppKit/CGContext.j>
+@import <AppKit/CGGeometry.j>
 
 #include "../CoreGraphics/CGGeometry.h"
 #include "../CoreGraphics/CGAffineTransform.j"

AppKit/CoreAnimation/CAMediaTimingFunction.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPDictionary.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPString.j>
 
 
 kCAMediaTimingFunctionLinear        = @"kCAMediaTimingFunctionLinear";

AppKit/CoreGraphics/CGAffineTransform.j

@@ -25,7 +25,8 @@
 
 #define _function(inline) function inline { return _##inline; }
 
-import "CGGeometry.j"
+@import "CGGeometry.j"
+
 
 _function(CGAffineTransformMake(a, b, c, d, tx, ty))
 _function(CGAffineTransformMakeIdentity())

AppKit/CoreGraphics/CGColor.j

@@ -21,7 +21,8 @@
  */
 
 //import "CGPattern.j"
-import "CGColorSpace.j"
+@import "CGColorSpace.j"
+
 
 // FIXME: Move this to Objective-J.js!!!
 var CFTypeGlobalCount = 0;

AppKit/CoreGraphics/CGContext.j

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

AppKit/CoreGraphics/CGGradient.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CGColor.j"
-import "CGColorSpace.j"
+@import "CGColor.j"
+@import "CGColorSpace.j"
+
 
 kCGGradientDrawsBeforeStartLocation = 1 << 0;
 kCGGradientDrawsAfterEndLocation    = 1 << 1;

AppKit/CoreGraphics/CGPath.j

@@ -23,8 +23,9 @@
 #include "CGGeometry.h"
 #include "CGAffineTransform.h"
 
-import "CGGeometry.j"
-import "CGAffineTransform.j"
+@import "CGGeometry.j"
+@import "CGAffineTransform.j"
+
 
 kCGPathElementMoveToPoint           = 0;
 kCGPathElementAddLineToPoint        = 1;

AppKit/Platform/DOM/CPDOMDisplayServer.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPRunLoop.j>
+@import <Foundation/CPRunLoop.j>
 
 #include "../../CoreGraphics/CGAffineTransform.h"
 #include "CPDOMDisplayServer.h"

AppKit/Platform/DOM/CPDOMWindowBridge.j

@@ -20,13 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPRunLoop.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPRunLoop.j>
 
-import "CPEvent.j"
-import "CPCompatibility.j"
+@import "CPEvent.j"
+@import "CPCompatibility.j"
 
-import "CPDOMWindowLayer.j"
+@import "CPDOMWindowLayer.j"
 
 #import "../../CoreGraphics/CGGeometry.h"
 

AppKit/Platform/DOM/CPDOMWindowLayer.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPArray.j>
-import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPObject.j>
 
 #include "CPDOMDisplayServer.h"
 

AppKit/_CPImageAndTitleView.j

@@ -20,13 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPString.j>
+@import <Foundation/CPString.j>
 
-import "CPColor.j"
-import "CPFont.j"
-import "CPImage.j"
-import "CPTextField.j"
-import "CPView.j"
+@import "CPColor.j"
+@import "CPFont.j"
+@import "CPImage.j"
+@import "CPTextField.j"
+@import "CPView.j"
 
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"

AppKit/_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"
+@import "CPImageView.j"
 
 
 var _CPWindowViewResizeIndicatorImage = nil;

Foundation/CPArray.j

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPRange.j"
-import "CPEnumerator.j"
-import "CPSortDescriptor.j"
-import "CPException.j"
+@import "CPObject.j"
+@import "CPRange.j"
+@import "CPEnumerator.j"
+@import "CPSortDescriptor.j"
+@import "CPException.j"
 
 /* @ignore */
 @implementation _CPArrayEnumerator : CPEnumerator

Foundation/CPBundle.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPDictionary.j"
+@import "CPObject.j"
+@import "CPDictionary.j"
+
 
 @implementation CPBundle : CPObject
 {

Foundation/CPCoder.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPException.j"
+@import "CPObject.j"
+@import "CPException.j"
+
 
 /*! @class CPCoder
     Top-level class defining methods for use when archiving (encoding) objects to a byte array 

Foundation/CPData.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPString.j"
+@import "CPObject.j"
+@import "CPString.j"
+
 
 @implementation CPData : CPObject
 {

Foundation/CPDate.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPString.j"
+@import "CPObject.j"
+@import "CPString.j"
+
 
 var CPDateReferenceDate = new Date(Date.UTC(2001,1,1,0,0,0,0));
 

Foundation/CPDictionary.j

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//import "CPRange.j"
-import "CPObject.j"
-import "CPEnumerator.j"
-import "CPException.j"
+//@import "CPRange.j"
+@import "CPObject.j"
+@import "CPEnumerator.j"
+@import "CPException.j"
 
 /* @ignore */
 @implementation _CPDictionaryValueEnumerator : CPEnumerator

Foundation/CPEnumerator.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
+@import "CPObject.j"
+
 
 /*! @class CPEnumerator
     CPEnumerator is a superclass (with useless method bodies)

Foundation/CPException.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPCoder.j"
-import "CPObject.j"
-import "CPString.j"
+@import "CPCoder.j"
+@import "CPObject.j"
+@import "CPString.j"
 
 
 CPInvalidArgumentException          = "CPInvalidArgumentException";

Foundation/CPIndexSet.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPRange.j"
-import "CPObject.j"
+@import "CPRange.j"
+@import "CPObject.j"
+
 
 /*! @class CPIndexSet
     Instances of this class are collections of numbers. Each integer can appear in a collection only once.

Foundation/CPInvocation.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPException.j"
+@import "CPObject.j"
+@import "CPException.j"
+
 
 /*! @class CPInvocation
     A CPInvocation is an object representation of a message sent to an object.

Foundation/CPJSONPConnection.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
  
-import <Foundation/CPObject.j>
+@import <Foundation/CPObject.j>
+
 
 CPJSONPConnectionCallbacks = {};
 

Foundation/CPKeyValueCoding.j

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPArray.j"
-import "CPObject.j"
-import "CPDictionary.j"
+@import "CPArray.j"
+@import "CPObject.j"
+@import "CPDictionary.j"
+
 
 var CPObjectAccessorsForClass   = nil,
     CPObjectModifiersForClass   = nil;

Foundation/CPKeyValueObserving.j

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPArray.j"
-import "CPDictionary.j"
-import "CPException.j"
-import "CPObject.j"
+@import "CPArray.j"
+@import "CPDictionary.j"
+@import "CPException.j"
+@import "CPObject.j"
+
 
 @implementation CPObject (KeyValueObserving)
 

Foundation/CPKeyedArchiver.j

@@ -20,13 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPData.j"
-import "CPCoder.j"
-import "CPArray.j"
-import "CPString.j"
-import "CPNumber.j"
-import "CPDictionary.j"
-import "CPValue.j"
+@import "CPData.j"
+@import "CPCoder.j"
+@import "CPArray.j"
+@import "CPString.j"
+@import "CPNumber.j"
+@import "CPDictionary.j"
+@import "CPValue.j"
+
 
 var CPArchiverReplacementClassNames                     = nil;
 

Foundation/CPKeyedUnarchiver.j

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPNull.j"
-import "CPCoder.j"
+@import "CPNull.j"
+@import "CPCoder.j"
 
 
 var _CPKeyedUnarchiverCannotDecodeObjectOfClassNameOriginalClassesSelector  = 1,

Foundation/CPNotification.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPException.j"
+@import "CPObject.j"
+@import "CPException.j"
+
 
 /*! @class CPNotification
     Represents a notification for posting to an CPNotificationCenter. Consists of a name, an object, and an optional dictionary. The notification center will check for observers registered to receive either notifications with the name, the object, or both and pass the notification instance on to them.

Foundation/CPNotificationCenter.j

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPArray.j"
-import "CPDictionary.j"
-import "CPNotification.j"
-import "CPException.j"
+@import "CPArray.j"
+@import "CPDictionary.j"
+@import "CPNotification.j"
+@import "CPException.j"
 
 
 var CPNotificationDefaultCenter = nil;

Foundation/CPNull.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
+@import "CPObject.j"
+
 
 var CPNullSharedNull = nil;
 

Foundation/CPNumber.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPObjJRuntime.j"
+@import "CPObject.j"
+@import "CPObjJRuntime.j"
+
 
 var __placeholder = new Number(),
     _CPNumberHashes = { };

Foundation/CPObjJRuntime.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPLog.j"
+@import "CPLog.j"
+
 
 function CPStringFromSelector(aSelector)
 {

Foundation/CPPropertyListSerialization.j

@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPObject.j"
+
+
 CPPropertyListOpenStepFormat        = kCFPropertyListOpenStepFormat;
 CPPropertyListXMLFormat_v1_0        = kCFPropertyListXMLFormat_v1_0;
 CPPropertyListBinaryFormat_v1_0     = kCFPropertyListBinaryFormat_v1_0;

Foundation/CPRunLoop.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPArray.j"
-import "CPString.j"
+@import "CPObject.j"
+@import "CPArray.j"
+@import "CPString.j"
 
 /*!
     @global

Foundation/CPSortDescriptor.j

@@ -20,8 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPObjJRuntime.j"
+@import "CPObject.j"
+@import "CPObjJRuntime.j"
+
 
 /*!
     The left operand is smaller than the right.

Foundation/CPString.j

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPException.j"
-import "CPSortDescriptor.j"
+@import "CPObject.j"
+@import "CPException.j"
+@import "CPSortDescriptor.j"
+
 
 /*!
     A case insensitive search

Foundation/CPURLConnection.j

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
-import "CPRunLoop.j"
-import "CPURLRequest.j"
-import "CPURLResponse.j"
+@import "CPObject.j"
+@import "CPRunLoop.j"
+@import "CPURLRequest.j"
+@import "CPURLResponse.j"
 
 
 var XMLHTTPRequestUninitialized = 0,

Foundation/CPURLRequest.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import "CPObject.j"
+@import "CPObject.j"
+
 
 /*! @class CPURLRequest
     A helper object for CPURLConnection, that contains