gistfile1.txt

diff -u new/SPPredicateEditor old/SPPredicateEditor/ 
Common subdirectories: new/SPPredicateEditor/Resources and old/SPPredicateEditor//Resources
diff -u new/SPPredicateEditor/SPPredicateEditor.j old/SPPredicateEditor//SPPredicateEditor.j
--- new/SPPredicateEditor/SPPredicateEditor.j	2014-02-03 11:11:18.000000000 +0100
+++ old/SPPredicateEditor//SPPredicateEditor.j	2012-06-16 07:57:24.000000000 +0200
@@ -29,13 +29,6 @@
     CPArray _compoundCriteriaRoot;
 }
 
-+ (int)version
-{
-    var bundle = [CPBundle bundleForClass:[self class]];
-
-    return [bundle objectForInfoDictionaryKey:@"CPBundleVersion"];
-}
-
 #pragma mark public methods
 /*!
     @ingroup appkit
@@ -276,7 +269,7 @@
 	var type=[predicate compoundPredicateType];
 	var count=[_compoundCriteriaRoot count];
 	
-	var rootItem;
+	var rootItem=nil;
 	var criterionItem;
 	var aTemplate;
 	
@@ -339,8 +332,7 @@
 	var criterionItem;
 	var keypath=[expression keyPath];
 	var count=[_simpleCriteriaRoot count];
-	var rootItem;
-
+	
 	for(var i=0;i<count;i++)
 	{
 		criterionItem=[_simpleCriteriaRoot objectAtIndex:i];
@@ -734,7 +726,7 @@
 
 	    if([view respondsToSelector:@selector(setObjectValue:)])
 		{
-	        [view setObjectValue:displayValue];
+	        [view setObjectValue:objectValue];
 	        return;
 		}
 	}
@@ -862,7 +854,7 @@
 
 @implementation SPPredicateEditor (CPCoding)
 
-- (id)initWithCoder:(CPCoder)aCoder
+- (id)initWithCoder:(id)aCoder
 {
     self=[super initWithCoder:aCoder];
     if (self != nil)
@@ -873,7 +865,7 @@
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)aCoder
+- (void)encodeWithCoder:(id)aCoder
 {
     [super encodeWithCoder:aCoder];
     [aCoder encodeObject:_rowTemplates forKey:CPPredicateTemplatesKey];
diff -u new/SPPredicateEditor/SPPredicateEditorClass.j old/SPPredicateEditor//SPPredicateEditorClass.j
--- new/SPPredicateEditor/SPPredicateEditorClass.j	2014-02-03 11:11:08.000000000 +0100
+++ old/SPPredicateEditor//SPPredicateEditorClass.j	2012-06-16 07:57:24.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+ * SPPredicateEditorClass.j
+ * SPPredicateEditor
+ *
+ * Created by You on May 23, 2012.
+ *
+ * Copyright 2012, Your Company. 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>
+
+
+/*!
+    This class is defined to make it easier to find the bundle,
+    for example to get an image from the framework like this:
+
+    @code
+    var path = [[CPBundle bundleForClass:SPPredicateEditor] pathForResource:@"email-action.png"];
+    @endcode
+
+    You can also use [SPPredicateEditor version] to get the current version.
+*/
+@implementation SPPredicateEditor : CPObject
+
++ (CPString)version
+{
+    var bundle = [CPBundle bundleForClass:[self class]];
+
+    return [bundle objectForInfoDictionaryKey:@"CPBundleVersion"];
+}
+
+@end
diff -u new/SPPredicateEditor/SPPredicateEditorRowTemplate.j old/SPPredicateEditor//SPPredicateEditorRowTemplate.j
--- new/SPPredicateEditor/SPPredicateEditorRowTemplate.j	2014-02-03 10:12:18.000000000 +0100
+++ old/SPPredicateEditor//SPPredicateEditorRowTemplate.j	2012-06-16 07:57:24.000000000 +0200
@@ -21,11 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
  
-@import <Foundation/CPObject.j>
-@import <Foundation/CPCompoundPredicate.j>
-@import <Foundation/CPComparisonPredicate.j>
-@import <AppKit/CPPopUpButton.j>
-@import <AppKit/CPDatePicker.j>
 @import "SPPredicateEditorFloatTextField.j"
 @import "SPPredicateEditorIntegerTextField.j"
 
@@ -45,8 +40,8 @@
 @implementation SPPredicateEditorRowTemplate : CPObject
 {
     int            _templateType @accessors(readwrite, getter=_templateType, setter=_setTemplateType:);
-    unsigned int  _predicateOptions @accessors(readwrite, setter=_setOptions:);
-    unsigned int _predicateModifier @accessors(readwrite, setter=_setModifier:);
+    unsigned   _predicateOptions @accessors(readwrite, setter=_setOptions:);
+    unsigned  _predicateModifier @accessors(readwrite, setter=_setModifier:);
     unsigned  _leftAttributeType @accessors(readwrite, getter=leftAttributeType, setter=_setLeftAttributeType:);
     unsigned _rightAttributeType @accessors(readwrite, getter=rightAttributeType, setter=_setRightAttributeType:);
     BOOL         _leftIsWildcard @accessors(property=leftIsWildcard);
@@ -509,7 +504,6 @@
 
 - (CPExpression)_expressionFromView:(CPView)aView forAttributeType:(CPAttributeType)attributeType
 {
-	var exprvalue;
  	switch(attributeType)
 	{
 		case CPUndefinedAttributeType :
@@ -518,32 +512,32 @@
 		case CPInteger32AttributeType :
 		case CPInteger64AttributeType :
 		case CPDecimalAttributeType :
-	        exprvalue = [aView intValue];
+	        value = [aView intValue];
 	    break;
 		case CPDoubleAttributeType :
 		case CPFloatAttributeType :
-	        exprvalue = [aView doubleValue];
+	        value = [aView doubleValue];
 	    break;
 		case CPStringAttributeType :
-	        exprvalue = [aView stringValue];
+	        value = [aView stringValue];
 	    break;
 		case CPBooleanAttributeType :
-	        exprvalue = [[aView selectedItem] representedObject];
+	        value = [[aView selectedItem] representedObject];
 	    break;
 		case CPDateAttributeType :
-	        exprvalue = [aView objectValue];
+	        value = [aView objectValue];
 	    break;
 	    default :
 	    	if([aView respondsToSelector:@selector(objectValue)])
-		        exprvalue = [aView objectValue];
+		        value = [aView objectValue];
 		    else
 	    	if([aView respondsToSelector:@selector(stringValue)])
-		        exprvalue = [aView stringValue];
+		        value = [aView stringValue];
 		    else
 		    	return nil;
 	}
 
-    return [CPExpression expressionForConstantValue:exprvalue];
+    return [CPExpression expressionForConstantValue:value];
 }
 
 - (int)_rowType
diff -u new/SPPredicateEditor/SPRuleEditor.j old/SPPredicateEditor//SPRuleEditor.j
--- new/SPPredicateEditor/SPRuleEditor.j	2014-02-03 11:09:39.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditor.j	2012-06-16 07:57:24.000000000 +0200
@@ -69,14 +69,14 @@
     id              	_delegate @accessors(property=delegate);
     CPPredicate     	_predicate @accessors(readonly,property=predicate);
 
-    Class        	_rowClass @accessors(property=rowClass);
+    CPString        	_rowClass @accessors(property=rowClass);
     CPString        	_rowTypeKeyPath @accessors(property=rowTypeKeyPath);
     CPString        	_subrowsKeyPath @accessors(property=subrowsKeyPath);
     CPString        	_criteriaKeyPath @accessors(property=criteriaKeyPath);
     CPString        	_displayValuesKeyPath @accessors(property=displayValuesKeyPath);
 
     CPString        	_stringsFilename;
-    //id              	_standardLocalizer @accessors(property=standardLocalizer);
+    id              	_standardLocalizer @accessors(property=standardLocalizer);
     
     SPRuleEditorView	_contentView;
 }
@@ -88,7 +88,7 @@
     return @"rule-editor";
 }
 
-+ (CPDictionary)themeAttributes
++ (id)themeAttributes
 {
     return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
                                        forKeys:[@"alternating-row-colors", @"selected-color", @"slice-top-border-color", @"slice-bottom-border-color", @"slice-last-bottom-border-color", @"font", @"add-image", @"remove-image"]];
@@ -296,25 +296,25 @@
     @return The formatting dictionary for the receiver.
     @see setFormattingDictionary:
     @see setFormattingStringsFilename:
-
+*/
 - (CPDictionary)formattingDictionary
 {
     return [_standardLocalizer dictionary];
 }
-*/
+
 /*!
     @brief Sets the formatting dictionary for the receiver.
     @param dictionary The formatting dictionary for the receiver.
     @discussion If you set the formatting dictionary with this method, it sets the current formatting strings file name to @c nil.
     @see formattingDictionary
     @see formattingStringsFilename
-
+*/
 - (void)setFormattingDictionary:(CPDictionary)dictionary
 {
     [_standardLocalizer setDictionary:dictionary];
     _stringsFilename = nil;
 }
-*/
+
 /*!
     @brief Returns the name of the strings file for the receiver.
     @return The name of the strings file for the receiver.
@@ -331,7 +331,7 @@
     @discussion SPRuleEditor looks for a strings file with the given name in the main bundle and (if appropriate) the bundle containing the nib file from which it was loaded. If it finds a strings file resource with the given name, SPRuleEditor loads it and sets it as the formatting dictionary for the receiver. You can obtain the resulting dictionary using formattingDictionary.
         If you set the formatting dictionary with -#setFormattingDictionary:, it sets the current formatting strings file name nil.
     @see formattingStringsFilename
-
+*/
 - (void)setFormattingStringsFilename:(CPString)stringsFilename
 {
     // Can we set _stringsFilename to nil in cocoa ?
@@ -352,7 +352,7 @@
         }
     }
 }
-*/
+
 /*!
     @name Providing Data
 */
@@ -1015,7 +1015,7 @@
     }
     catch(error)
     {
-        CPLog.debug(@"predicate error: ["+[error description]+"] for row "+row);
+        CPLog.debug(@"predicate error: ["+[error description]+"] for row "+aRow);
         return nil;
     }
 }
@@ -1147,10 +1147,10 @@
 
 -(CPString)localizedString:(CPString)text
 {
-//	if(![self standardLocalizer])
+	if(![self standardLocalizer])
 		return text;
-//	var res=[[self standardLocalizer] localizedStringForString:text];
-//	return res!=nil?res:text;
+	var res=[[self standardLocalizer] localizedStringForString:text];
+	return res!=nil?res:text;
 }
 
 -(BOOL)canMoveRow:(SPRuleEditorModelItem)aRow afterRow:(SPRuleEditorModelItem)anotherRow
@@ -1265,7 +1265,7 @@
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [super encodeWithCoder:coder];
 }
diff -u new/SPPredicateEditor/SPRuleEditorActionButton.j old/SPPredicateEditor//SPRuleEditorActionButton.j
--- new/SPPredicateEditor/SPRuleEditorActionButton.j	2014-02-03 10:24:18.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorActionButton.j	2012-06-16 07:57:24.000000000 +0200
@@ -55,7 +55,7 @@
         [self setAutoresizingMask:CPViewMinXMargin];
         [self setImagePosition:CPImageOnly];
         [self setBordered:NO];
-        var style = self._DOMElement.style;
+        var style = _DOMElement.style;
         style.border = "1px solid rgb(189, 189, 189)";
         style.filter = IE_FILTER;
     }
@@ -67,7 +67,7 @@
 {
     radius = FLOOR(CGRectGetHeight([self bounds])/2);
 
-    var style = self._DOMElement.style,
+    var style = _DOMElement.style,
         radiusCSS = radius + "px";
 
     style.borderRadius = radiusCSS;
diff -u new/SPPredicateEditor/SPRuleEditorCriterion.j old/SPPredicateEditor//SPRuleEditorCriterion.j
--- new/SPPredicateEditor/SPRuleEditorCriterion.j	2014-02-03 10:52:01.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorCriterion.j	2012-06-16 07:57:24.000000000 +0200
@@ -135,7 +135,7 @@
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [coder encodeObject:_items forKey:ItemsKey];
     [coder encodeObject:_displayValue forKey:DisplayValueKey];
diff -u new/SPPredicateEditor/SPRuleEditorModel.j old/SPPredicateEditor//SPRuleEditorModel.j
--- new/SPPredicateEditor/SPRuleEditorModel.j	2014-02-03 10:52:03.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorModel.j	2012-06-16 07:57:24.000000000 +0200
@@ -21,8 +21,6 @@
  
 @import <Foundation/CPObject.j>
 @import "SPRuleEditorModelItem.j"
-@class SPRuleEditor
-@global SPRuleEditorRowViewMinHeight
 
 SPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
 SPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
@@ -87,7 +85,7 @@
 	return [_rows count]?SPRuleEditorRowTypeSimple:SPRuleEditorRowTypeCompound;
 }
 
--(void)setNestingMode:(CPInteger)nestingMode
+-(void)setNestingMode:(int)nestingMode
 {
 	if(nestingMode==_nestingMode)
 		return;
@@ -230,9 +228,9 @@
 	for(var i=0;i<count;i++)
 	{
 		subrow=subrows[i]
-		var indexVariable=[self indexOfRow:subrow];
-		if(indexVariable!=CPNotFound)
-			[indexSet addIndex:indexVariable];
+		index=[self indexOfRow:subrow];
+		if(index!=CPNotFound)
+			[indexSet addIndex:index];
 	}
 	return indexSet;
 }
@@ -447,7 +445,7 @@
 		parent=[row parent];
 		if(!parent)
 		{
-			[self _removeRowAtIndex:[self indexOfRow:row] keepSubrows:!includeSubrows];
+			[self _removeRowAtIndex:rowIndex keepSubrows:!includeSubrows];
 			continue;
 		}
 		idx=[parent indexOfChild:row];
@@ -528,17 +526,17 @@
     _rows=[coder decodeObjectForKey:RowsKey];
     _rootLess=[coder decodeBoolForKey:RootlessKey];
     _canRemoveAllRows=[coder decodeBoolForKey:CanRemoveAllRowsKey];
-    _nestingMode=[coder decodeIntForKey:NestingModelKey];
+    _nestingMode=[coder decodeIntForKey:NestingModeKey];
 
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [coder encodeObject:_rows forKey:RowsKey];
     [coder encodeBool:_rootLess forKey:RootlessKey];
     [coder encodeBool:_canRemoveAllRows forKey:CanRemoveAllRowsKey];
-    [coder encodeInt:_nestingMode forKey:NestingModelKey];
+    [coder encodeInt:_nestingMode forKey:NestingModeKey];
 }
 
 @end
diff -u new/SPPredicateEditor/SPRuleEditorModelItem.j old/SPPredicateEditor//SPRuleEditorModelItem.j
--- new/SPPredicateEditor/SPRuleEditorModelItem.j	2014-02-03 10:52:06.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorModelItem.j	2012-06-16 07:57:24.000000000 +0200
@@ -20,16 +20,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPArray.j>
-
-
-@global SPRuleEditorRowTypeSimple
-@global SPRuleEditorRowTypeCompound
-@global SPRuleEditorModelRowAdded
-@global SPRuleEditorModelRowRemoved
-@global SPRuleEditorModelRowModified 
-
- 
 
 @implementation SPRuleEditorModelItem : CPObject
 {
@@ -442,7 +432,7 @@
     [copy setCriteria:[[CPArray alloc] initWithArray:_criteria copyItems:YES]];
     [copy setSubrows:[[CPArray alloc] initWithArray:_subrows copyItems:YES]];
     [[copy subrows] makeObjectsPerformSelector:@selector(setParent:) withObject:copy];
-    [copy setData:[_data copy]];
+    [copy setData:_data copy];
 
     return copy;
 }
@@ -474,7 +464,7 @@
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [coder encodeObject:_subrows forKey:SubrowsKey];
     [coder encodeObject:_criteria forKey:CriteriaKey];
diff -u new/SPPredicateEditor/SPRuleEditorPopUpButton.j old/SPPredicateEditor//SPRuleEditorPopUpButton.j
--- new/SPPredicateEditor/SPRuleEditorPopUpButton.j	2014-02-03 10:24:27.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorPopUpButton.j	2012-06-16 07:57:24.000000000 +0200
@@ -19,10 +19,6 @@
  * 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 <AppKit/CPBezierPath.j>
-@import <AppKit/CPPopUpButton.j>
 
 var GRADIENT_NORMAL,
     GRADIENT_HIGHLIGHTED,
@@ -51,8 +47,8 @@
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
-    {    
-        var style = self._DOMElement.style;
+    {
+        var style = _DOMElement.style;
         style.backgroundImage = GRADIENT_NORMAL;
         style.border = "1px solid rgb(189, 189, 189)";
         style.filter = IE_FILTER;
@@ -79,7 +75,7 @@
 
 - (void)setHighlighted:(BOOL)shouldHighlight
 {
-    self._DOMElement.style.backgroundImage = (shouldHighlight) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+    _DOMElement.style.backgroundImage = (shouldHighlight) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
 }
 
 - (CGRect)contentRectForBounds:(CGRect)bounds
@@ -95,7 +91,7 @@
 {
     _radius = FLOOR(CGRectGetHeight([self bounds])/2);
 
-    var style = self._DOMElement.style,
+    var style = _DOMElement.style,
         radiusCSS = _radius + "px";
 
     style.borderRadius=radiusCSS;
diff -u new/SPPredicateEditor/SPRuleEditorRowView.j old/SPPredicateEditor//SPRuleEditorRowView.j
--- new/SPPredicateEditor/SPRuleEditorRowView.j	2014-02-03 10:49:14.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorRowView.j	2012-06-16 07:57:24.000000000 +0200
@@ -20,7 +20,6 @@
  */
  
 @import <Foundation/CPObject.j>
-@import <Foundation/CPDictionary.j>
 @import <AppKit/CPView.j>
 @import <AppKit/CPButton.j>
 @import <AppKit/CPTextField.j>
@@ -31,14 +30,6 @@
 @import "SPRuleEditorPopUpButton.j"
 @import "SPRuleEditorActionButton.j"
 
-@class SPRuleEditor
-@global SPRuleEditorRowViewMinHeight
-@global SPRuleEditorRowTypeSimple
-@global SPRuleEditorRowTypeCompound
-@global SPRuleEditorNestingModeCompound
-@global SPRuleEditorNestingModeSingle
-@global SPRuleEditorRowViewIndent
-@global SPRuleEditorItemPBoardType
 
 var GRADIENT_NORMAL;
 var GRADIENT_HIGHLIGHTED;
@@ -71,8 +62,9 @@
 	BOOL 					_editable @accessors(property=editable);
 	CGFloat					_rowHeight @accessors(property=rowHeight);
 	BOOL 					_showDragIndicator @accessors(property=showDragIndicator);
+	CPImage                 _alternateAddButtonImage; 
 	CPNotificationCenter	_notificationCenter;
-	CPImage 				_alternateAddButtonImage;
+	CPImage 				_alternateAddButtonImage=nil;
 	
 	BOOL 					_frozenActions;
 	BOOL 					_updating;
@@ -80,7 +72,7 @@
 
 #pragma mark Theming
 
-+ (CPDictionary)themeAttributes
++ (id)themeAttributes
 {
 	return [SPRuleEditor themeAttributes];
 }
@@ -218,7 +210,7 @@
 	_frozenActions=NO;
 }
 
--(void)setNestingMode:(int)nestingMode
+-(void)setNestingMode:(CPInteger)nestingMode
 {
 	if(nestingMode==_nestingMode)
 		return;
@@ -307,7 +299,7 @@
 	var subviews;
 	var subview;
 
-	var subviews=[_contentView subviews];
+	subviews=[_contentView subviews];
 	var count=[subviews count];
 	for(var i=0;i<count;i++)	
 	{
@@ -738,7 +730,7 @@
     [_removeButton setFrame:rect];
     [_removeButton setHidden:(!_editable||(_delegate&&(![_delegate isRowRemoveable:_item]||[_delegate nestingMode]==SPRuleEditorNestingModeSingle)))];
 
-	var subviews=[_contentView subviews];
+	subviews=[_contentView subviews];
 	count=[subviews count];
 
 	for(var i=0;i<count;i++)
@@ -804,7 +796,7 @@
     var indicatorHeight=_showDragIndicator?SPRuleEditorRowViewDragIndicatorHeight:0;
     if(indicatorHeight)
     {
-	    var indent=[_item rowType]==SPRuleEditorRowTypeSimple?SPRuleEditorRowViewIndent*[_item depth]:SPRuleEditorRowViewIndent*([_item depth]+1);
+	    indent=[_item rowType]==SPRuleEditorRowTypeSimple?SPRuleEditorRowViewIndent*[_item depth]:SPRuleEditorRowViewIndent*([_item depth]+1);
 
 	    CGContextBeginPath(context);
 	    CGContextMoveToPoint(context,indent,vOffset+frame.origin.y+_rowHeight+(indicatorHeight/2)+-0.5);
@@ -935,7 +927,7 @@
 
 #pragma mark Drag & Drop
 
-- (CPView)hitTest:(CGPoint)aPoint
+- (CPView)hitTest:(CPPoint)aPoint
 {
 	var res=[super hitTest:aPoint];
 	if(res==_contentView)
@@ -943,7 +935,7 @@
 	return res;
 }
 
-- (CPView)viewAtPoint:(CGPoint)aPoint
+- (CPView)viewAtPoint:(CPPoint)aPoint
 {
 	var point=[self convertPoint:aPoint fromView:nil];
 	var rect=[_contentView frame];
diff -u new/SPPredicateEditor/SPRuleEditorView.j old/SPPredicateEditor//SPRuleEditorView.j
--- new/SPPredicateEditor/SPRuleEditorView.j	2014-02-03 10:59:24.000000000 +0100
+++ old/SPPredicateEditor//SPRuleEditorView.j	2012-06-16 07:57:24.000000000 +0200
@@ -21,14 +21,7 @@
  
 @import <Foundation/CPObject.j>
 @import <AppKit/CPView.j>
-#import <CPDraggingInfo.j>
-//#import <AppKit/CPDraggingInfo.j>
-
 @import "SPRuleEditorRowView.j"
-@global SPRuleEditorItemPBoardType
-@global SPRuleEditorModelRowAdded
-@global SPRuleEditorModelRowRemoved
-@global SPRuleEditorModelRowModified 
 
 SPRuleEditorRowViewMinHeight=26;
 SPRuleEditorRowViewIndent=30;
@@ -44,7 +37,7 @@
 	BOOL 				_forcedRedraw;
 }
 
-+ (CPDictionary)themeAttributes
++ (id)themeAttributes
 {
 	return [SPRuleEditor themeAttributes];
 }
@@ -411,7 +404,7 @@
 
 #pragma mark Borders drawing
 
--(void)drawRect:(CGRect)rect
+-(void)drawRect:(CPRect)rect
 {
 	var subviews=[self subviews];
 	var count=[subviews count];
@@ -491,8 +484,7 @@
 
 #pragma mark Drag & drop
 
-- (CPDragOperation)draggingEntered:(CPDraggingInfo)sender
-
+- (CPDragOperation)draggingEntered:(id < CPDraggingInfo >)sender
 {
 	if(_dragging)
 		return CPDragOperationNone;
@@ -516,7 +508,7 @@
 	[self updateDropTarget:nil];
 }
 
-- (CPDragOperation)draggingUpdated:(CPDraggingInfo)sender
+- (CPDragOperation)draggingUpdated:(id <CPDraggingInfo>)sender
 {
 	if(!_dragging)
 		return;
@@ -551,7 +543,7 @@
     return CPDragOperationMove;
 }
 
-- (BOOL)performDragOperation:(CPDraggingInfo)sender
+- (BOOL)performDragOperation:(id < CPDraggingInfo >)sender
 {
     var view=[self rowViewAtPoint:[sender draggingLocation]];