Revision: 3853
http://skim-app.svn.sourceforge.net/skim-app/?rev=3853&view=rev
Author: hofman
Date: 2008-05-06 05:39:53 -0700 (Tue, 06 May 2008)
Log Message:
-----------
Rename class method swizziling functions and arguments.
Modified Paths:
--------------
trunk/NSCell_SKExtensions.m
trunk/NSScrollView_SKExtensions.m
trunk/NSURL_SKExtensions.m
trunk/OBUtilities.h
trunk/OBUtilities.m
trunk/PDFAnnotation_SKExtensions.m
trunk/PDFDisplayView_SKExtensions.m
trunk/PDFDocument_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/SKFindTableView.m
trunk/SKThumbnailTableView.m
trunk/SKTypeSelectHelper.m
Modified: trunk/NSCell_SKExtensions.m
===================================================================
--- trunk/NSCell_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/NSCell_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -55,7 +55,7 @@
}
+ (void)load {
- originalHighlightColorWithFrameInView =
OBReplaceMethodImplementationWithSelector(self,
@selector(highlightColorWithFrame:inView:),
@selector(replacementHighlightColorWithFrame:inView:));
+ originalHighlightColorWithFrameInView =
SKReplaceMethodImplementationWithSelector(self,
@selector(highlightColorWithFrame:inView:),
@selector(replacementHighlightColorWithFrame:inView:));
}
@end
Modified: trunk/NSScrollView_SKExtensions.m
===================================================================
--- trunk/NSScrollView_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/NSScrollView_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -183,12 +183,12 @@
}
+ (void)load{
- originalSetHasHorizontalScroller =
OBReplaceMethodImplementationWithSelector(self,
@selector(setHasHorizontalScroller:),
@selector(replacementSetHasHorizontalScroller:));
- originalSetHasVerticalScroller =
OBReplaceMethodImplementationWithSelector(self,
@selector(setHasVerticalScroller:),
@selector(replacementSetHasVerticalScroller:));
- originalHasHorizontalScroller =
(typeof(originalHasHorizontalScroller))OBReplaceMethodImplementationWithSelector(self,
@selector(hasHorizontalScroller), @selector(replacementHasHorizontalScroller));
- originalHasVerticalScroller =
(typeof(originalHasVerticalScroller))OBReplaceMethodImplementationWithSelector(self,
@selector(hasVerticalScroller), @selector(replacementHasVerticalScroller));
- originalDealloc = OBReplaceMethodImplementationWithSelector(self,
@selector(dealloc), @selector(replacementDealloc));
- originalTile = OBReplaceMethodImplementationWithSelector(self,
@selector(tile), @selector(replacementTile));
+ originalSetHasHorizontalScroller =
SKReplaceMethodImplementationWithSelector(self,
@selector(setHasHorizontalScroller:),
@selector(replacementSetHasHorizontalScroller:));
+ originalSetHasVerticalScroller =
SKReplaceMethodImplementationWithSelector(self,
@selector(setHasVerticalScroller:),
@selector(replacementSetHasVerticalScroller:));
+ originalHasHorizontalScroller =
(typeof(originalHasHorizontalScroller))SKReplaceMethodImplementationWithSelector(self,
@selector(hasHorizontalScroller), @selector(replacementHasHorizontalScroller));
+ originalHasVerticalScroller =
(typeof(originalHasVerticalScroller))SKReplaceMethodImplementationWithSelector(self,
@selector(hasVerticalScroller), @selector(replacementHasVerticalScroller));
+ originalDealloc = SKReplaceMethodImplementationWithSelector(self,
@selector(dealloc), @selector(replacementDealloc));
+ originalTile = SKReplaceMethodImplementationWithSelector(self,
@selector(tile), @selector(replacementTile));
// set doesn't retain, so no retain cycles; pointer equality used to
compare views
scrollViewsWithHorizontalScrollers =
CFSetCreateMutable(CFAllocatorGetDefault(), 0, NULL);
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/NSURL_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -55,8 +55,8 @@
}
+ (void)load {
- originalInitFileURLWithPath =
OBReplaceMethodImplementationWithSelector(self,
@selector(initFileURLWithPath:), @selector(replacementInitFileURLWithPath:));
- originalInitWithString = OBReplaceMethodImplementationWithSelector(self,
@selector(initWithString:), @selector(replacementInitWithString:));
+ originalInitFileURLWithPath =
SKReplaceMethodImplementationWithSelector(self,
@selector(initFileURLWithPath:), @selector(replacementInitFileURLWithPath:));
+ originalInitWithString = SKReplaceMethodImplementationWithSelector(self,
@selector(initWithString:), @selector(replacementInitWithString:));
}
+ (NSURL *)URLFromPasteboardAnyType:(NSPasteboard *)pasteboard {
Modified: trunk/OBUtilities.h
===================================================================
--- trunk/OBUtilities.h 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/OBUtilities.h 2008-05-06 12:39:53 UTC (rev 3853)
@@ -4,7 +4,7 @@
//
// Created by Christiaan Hofman on 2/15/07.
-/* Following functions are from OmniBase/OBUtilities.h and subject to the
following copyright */
+/* Some of the following functions are inspired by OmniBase/OBUtilities.h and
subject to the following copyright */
// Copyright 1997-2008 Omni Development, Inc. All rights reserved.
//
@@ -17,9 +17,9 @@
#import <objc/objc-class.h>
#import <objc/objc-runtime.h>
-IMP OBReplaceMethodImplementation(Class aClass, SEL oldSelector, IMP newImp);
-IMP OBReplaceMethodImplementationWithSelector(Class aClass, SEL oldSelector,
SEL newSelector);
-void OBAddMethodImplementationWithSelector(Class aClass, SEL newSelector, SEL
oldSelector);
+IMP SKReplaceMethodImplementation(Class aClass, SEL aSelector, IMP anImp);
+IMP SKReplaceMethodImplementationWithSelector(Class aClass, SEL aSelector, SEL
impSelector);
+void SKAddMethodImplementationWithSelector(Class aClass, SEL aSelector, SEL
impSelector);
#define OBINITIALIZE \
do { \
Modified: trunk/OBUtilities.m
===================================================================
--- trunk/OBUtilities.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/OBUtilities.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -4,7 +4,7 @@
//
// Created by Christiaan Hofman on 2/15/07.
-/* Following functions are from OmniBase/OBUtilities.h and subject to the
following copyright */
+/* Some of the following functions are inspired by OmniBase/OBUtilities.h and
subject to the following copyright */
// Copyright 1997-2008 Omni Development, Inc. All rights reserved.
//
@@ -63,24 +63,24 @@
}
}
-IMP OBReplaceMethodImplementation(Class aClass, SEL oldSelector, IMP newImp)
+IMP SKReplaceMethodImplementation(Class aClass, SEL aSelector, IMP anImp)
{
Method localMethod, superMethod = NULL;
IMP oldImp = NULL;
Class superCls = Nil;
extern void _objc_flush_caches(Class);
- if ((localMethod = class_getInstanceMethod(aClass, oldSelector))) {
+ if ((localMethod = class_getInstanceMethod(aClass, aSelector))) {
if (superCls = SK_class_getSuperclass(aClass))
- superMethod = class_getInstanceMethod(superCls, oldSelector);
+ superMethod = class_getInstanceMethod(superCls, aSelector);
if (superMethod == localMethod) {
// We are inheriting this method from the superclass. We do *not*
want to clobber the superclass's Method structure as that would replace the
implementation on a greater scope than the caller wanted. In this case,
install a new method at this class and return the superclass's implementation
as the old implementation (which it is).
oldImp = SK_method_getImplementation(localMethod);
- SK_class_addMethod(aClass, oldSelector, newImp,
SK_method_getTypeEncoding(localMethod));
+ SK_class_addMethod(aClass, aSelector, anImp,
SK_method_getTypeEncoding(localMethod));
} else {
// Replace the method in place
- oldImp = SK_method_setImplementation(localMethod, newImp);
+ oldImp = SK_method_setImplementation(localMethod, anImp);
}
// Flush the method cache, deprecated on 10.5
@@ -91,13 +91,13 @@
return oldImp;
}
-IMP OBReplaceMethodImplementationWithSelector(Class aClass, SEL oldSelector,
SEL newSelector)
+IMP SKReplaceMethodImplementationWithSelector(Class aClass, SEL aSelector, SEL
impSelector)
{
- return OBReplaceMethodImplementation(aClass, oldSelector,
SK_method_getImplementation(class_getInstanceMethod(aClass, newSelector)));
+ return SKReplaceMethodImplementation(aClass, aSelector,
SK_method_getImplementation(class_getInstanceMethod(aClass, impSelector)));
}
-void OBAddMethodImplementationWithSelector(Class aClass, SEL newSelector, SEL
oldSelector)
+void SKAddMethodImplementationWithSelector(Class aClass, SEL aSelector, SEL
impSelector)
{
- Method method = class_getInstanceMethod(aClass, oldSelector);
- SK_class_addMethod(aClass, newSelector,
SK_method_getImplementation(method), SK_method_getTypeEncoding(method));
+ Method method = class_getInstanceMethod(aClass, impSelector);
+ SK_class_addMethod(aClass, aSelector, SK_method_getImplementation(method),
SK_method_getTypeEncoding(method));
}
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/PDFAnnotation_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -605,7 +605,7 @@
+ (void)load {
if ([self instancesRespondToSelector:@selector(toolTip)])
- originalToolTip = OBReplaceMethodImplementationWithSelector(self,
@selector(toolTip), @selector(replacementToolTip));
+ originalToolTip = SKReplaceMethodImplementationWithSelector(self,
@selector(toolTip), @selector(replacementToolTip));
}
- (BOOL)isLink { return YES; }
Modified: trunk/PDFDisplayView_SKExtensions.m
===================================================================
--- trunk/PDFDisplayView_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/PDFDisplayView_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -253,27 +253,27 @@
}
+ (void)load {
- originalResetCursorRects = OBReplaceMethodImplementationWithSelector(self,
@selector(resetCursorRects), @selector(replacementResetCursorRects));
+ originalResetCursorRects = SKReplaceMethodImplementationWithSelector(self,
@selector(resetCursorRects), @selector(replacementResetCursorRects));
if ([self instancesRespondToSelector:@selector(passwordEntered:)])
- originalPasswordEntered =
OBReplaceMethodImplementationWithSelector(self, @selector(passwordEntered:),
@selector(replacementPasswordEntered:));
+ originalPasswordEntered =
SKReplaceMethodImplementationWithSelector(self, @selector(passwordEntered:),
@selector(replacementPasswordEntered:));
if ([self
instancesRespondToSelector:@selector(accessibilityAttributeNames)])
- originalAccessibilityAttributeNames =
OBReplaceMethodImplementationWithSelector(self,
@selector(accessibilityAttributeNames),
@selector(replacementAccessibilityAttributeNames));
+ originalAccessibilityAttributeNames =
SKReplaceMethodImplementationWithSelector(self,
@selector(accessibilityAttributeNames),
@selector(replacementAccessibilityAttributeNames));
if ([self
instancesRespondToSelector:@selector(accessibilityParameterizedAttributeNames)])
- originalAccessibilityParameterizedAttributeNames =
OBReplaceMethodImplementationWithSelector(self,
@selector(accessibilityParameterizedAttributeNames),
@selector(replacementAccessibilityParameterizedAttributeNames));
+ originalAccessibilityParameterizedAttributeNames =
SKReplaceMethodImplementationWithSelector(self,
@selector(accessibilityParameterizedAttributeNames),
@selector(replacementAccessibilityParameterizedAttributeNames));
if ([self
instancesRespondToSelector:@selector(accessibilityAttributeValue:)])
- originalAccessibilityAttributeValue =
OBReplaceMethodImplementationWithSelector(self,
@selector(accessibilityAttributeValue:),
@selector(replacementAccessibilityAttributeValue:));
+ originalAccessibilityAttributeValue =
SKReplaceMethodImplementationWithSelector(self,
@selector(accessibilityAttributeValue:),
@selector(replacementAccessibilityAttributeValue:));
if ([self instancesRespondToSelector:@selector(accessibilityHitTest:)])
- originalAccessibilityHitTest =
OBReplaceMethodImplementationWithSelector(self,
@selector(accessibilityHitTest:), @selector(replacementAccessibilityHitTest:));
+ originalAccessibilityHitTest =
SKReplaceMethodImplementationWithSelector(self,
@selector(accessibilityHitTest:), @selector(replacementAccessibilityHitTest:));
if ([self
instancesRespondToSelector:@selector(accessibilityFocusedUIElement)])
- originalAccessibilityFocusedUIElement =
OBReplaceMethodImplementationWithSelector(self,
@selector(accessibilityFocusedUIElement),
@selector(replacementAccessibilityFocusedUIElement));
+ originalAccessibilityFocusedUIElement =
SKReplaceMethodImplementationWithSelector(self,
@selector(accessibilityFocusedUIElement),
@selector(replacementAccessibilityFocusedUIElement));
if ([self
instancesRespondToSelector:@selector(accessibilityRangeForPositionAttributeForParameter:)]
== NO)
- OBAddMethodImplementationWithSelector(self,
@selector(accessibilityRangeForPositionAttributeForParameter:),
@selector(replacementAccessibilityRangeForPositionAttributeForParameter:));
+ SKAddMethodImplementationWithSelector(self,
@selector(accessibilityRangeForPositionAttributeForParameter:),
@selector(replacementAccessibilityRangeForPositionAttributeForParameter:));
if ([self
instancesRespondToSelector:@selector(accessibilityRTFForRangeAttributeForParameter:)]
== NO)
- OBAddMethodImplementationWithSelector(self,
@selector(accessibilityRTFForRangeAttributeForParameter:),
@selector(replacementAccessibilityRTFForRangeAttributeForParameter:));
+ SKAddMethodImplementationWithSelector(self,
@selector(accessibilityRTFForRangeAttributeForParameter:),
@selector(replacementAccessibilityRTFForRangeAttributeForParameter:));
if ([self
instancesRespondToSelector:@selector(accessibilityAttributedStringForRangeAttributeForParameter:)]
== NO)
- OBAddMethodImplementationWithSelector(self,
@selector(accessibilityAttributedStringForRangeAttributeForParameter:),
@selector(replacementAccessibilityAttributedStringForRangeAttributeForParameter:));
+ SKAddMethodImplementationWithSelector(self,
@selector(accessibilityAttributedStringForRangeAttributeForParameter:),
@selector(replacementAccessibilityAttributedStringForRangeAttributeForParameter:));
if ([self
instancesRespondToSelector:@selector(accessibilityStyleRangeForIndexAttributeForParameter:)]
== NO)
- OBAddMethodImplementationWithSelector(self,
@selector(accessibilityStyleRangeForIndexAttributeForParameter:),
@selector(replacementAccessibilityStyleRangeForIndexAttributeForParameter:));
+ SKAddMethodImplementationWithSelector(self,
@selector(accessibilityStyleRangeForIndexAttributeForParameter:),
@selector(replacementAccessibilityStyleRangeForIndexAttributeForParameter:));
}
@end
Modified: trunk/PDFDocument_SKExtensions.m
===================================================================
--- trunk/PDFDocument_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/PDFDocument_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -76,7 +76,7 @@
+ (void)load {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if ([self
instancesRespondToSelector:@selector(getPrintOperationForPrintInfo:autoRotate:)])
- originalGetPrintOperationForPrintInfo =
OBReplaceMethodImplementationWithSelector(self,
@selector(getPrintOperationForPrintInfo:autoRotate:),
@selector(replacementGetPrintOperationForPrintInfo:autoRotate:));
+ originalGetPrintOperationForPrintInfo =
SKReplaceMethodImplementationWithSelector(self,
@selector(getPrintOperationForPrintInfo:autoRotate:),
@selector(replacementGetPrintOperationForPrintInfo:autoRotate:));
[pool release];
}
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/PDFPage_SKExtensions.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -72,7 +72,7 @@
}
+ (void)load {
- originalDealloc = OBReplaceMethodImplementationWithSelector(self,
@selector(dealloc), @selector(replacementDealloc));
+ originalDealloc = SKReplaceMethodImplementationWithSelector(self,
@selector(dealloc), @selector(replacementDealloc));
bboxCache = CFDictionaryCreateMutable(NULL, 0, NULL,
&SKNSRectDictionaryValueCallbacks);
}
Modified: trunk/SKFindTableView.m
===================================================================
--- trunk/SKFindTableView.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/SKFindTableView.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -172,7 +172,7 @@
}
+ (void)load {
- originalDrawWithFrameInView =
OBReplaceMethodImplementationWithSelector(self,
@selector(drawWithFrame:inView:), @selector(replacementDrawWithFrame:inView:));
+ originalDrawWithFrameInView =
SKReplaceMethodImplementationWithSelector(self,
@selector(drawWithFrame:inView:), @selector(replacementDrawWithFrame:inView:));
}
@end
Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/SKThumbnailTableView.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -58,7 +58,7 @@
}
+ (void)load {
- originalTrackKnob = OBReplaceMethodImplementationWithSelector(self,
@selector(trackKnob:), @selector(replacementTrackKnob:));
+ originalTrackKnob = SKReplaceMethodImplementationWithSelector(self,
@selector(trackKnob:), @selector(replacementTrackKnob:));
}
@end
Modified: trunk/SKTypeSelectHelper.m
===================================================================
--- trunk/SKTypeSelectHelper.m 2008-05-06 09:08:06 UTC (rev 3852)
+++ trunk/SKTypeSelectHelper.m 2008-05-06 12:39:53 UTC (rev 3853)
@@ -428,7 +428,7 @@
}
+ (void)load {
- originalMakeFirstResponder =
(typeof(originalMakeFirstResponder))OBReplaceMethodImplementationWithSelector(self,
@selector(makeFirstResponder:), @selector(replacementMakeFirstResponder:));
+ originalMakeFirstResponder =
(typeof(originalMakeFirstResponder))SKReplaceMethodImplementationWithSelector(self,
@selector(makeFirstResponder:), @selector(replacementMakeFirstResponder:));
}
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
