Revision: 6406
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6406&view=rev
Author:   hofman
Date:     2010-04-01 14:43:32 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
use declared properties

Modified Paths:
--------------
    trunk/SKDownload.h
    trunk/SKDownload.m
    trunk/SKFindController.h
    trunk/SKFindController.m
    trunk/SKGroupedSearchResult.h
    trunk/SKGroupedSearchResult.m
    trunk/SKInfoWindowController.h
    trunk/SKInfoWindowController.m
    trunk/SKLineInspector.h
    trunk/SKLineInspector.m
    trunk/SKNoteTypeSheetController.h
    trunk/SKNoteTypeSheetController.m
    trunk/SKNoteWindowController.h
    trunk/SKNoteWindowController.m
    trunk/SKPDFSyncRecord.h
    trunk/SKPDFSyncRecord.m
    trunk/SKPresentationOptionsSheetController.h
    trunk/SKPresentationOptionsSheetController.m
    trunk/SKProgressController.h
    trunk/SKProgressController.m
    trunk/SKReadingBar.h
    trunk/SKReadingBar.m
    trunk/SKThumbnail.h
    trunk/SKThumbnail.m
    trunk/SKTransitionInfo.h
    trunk/SKTransitionInfo.m
    trunk/SKVersionNumber.h
    trunk/SKVersionNumber.m

Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h  2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKDownload.h  2010-04-01 14:43:32 UTC (rev 6406)
@@ -75,30 +75,29 @@
     NSString *filePath;
     NSImage *fileIcon;
     NSProgressIndicator *progressIndicator;
-    NSInteger status;
+    SKDownloadStatus status;
     id <SKDownloadDelegate> delegate;
 }
 
-- (id)initWithURL:(NSURL *)aURL delegate:(id <SKDownloadDelegate>)aDelegate;
+...@property (assign) id <SKDownloadDelegate> delegate;
 
-- (id <SKDownloadDelegate>)delegate;
-- (void)setDelegate:(id <SKDownloadDelegate>)newDelegate;
+...@property (readonly) SKDownloadStatus status;
 
-- (SKDownloadStatus)status;
+...@property (readonly) NSURL *URL;
 
-- (NSURL *)URL;
+...@property (readonly) NSString *filePath;
+...@property (readonly) NSString *fileName;
+...@property (readonly) NSImage *fileIcon;
+...@property (readonly) long long expectedContentLength;
+...@property (readonly) long long receivedContentLength;
 
-- (NSString *)filePath;
-- (NSString *)fileName;
-- (NSImage *)fileIcon;
-- (long long)expectedContentLength;
-- (long long)receivedContentLength;
+...@property (readonly) NSURLDownload *URLDownload;
 
-- (NSURLDownload *)URLDownload;
+...@property (readonly) NSProgressIndicator *progressIndicator;
 
-- (NSProgressIndicator *)progressIndicator;
+...@property (readonly) NSDictionary *info;
 
-- (NSDictionary *)info;
+- (id)initWithURL:(NSURL *)aURL delegate:(id <SKDownloadDelegate>)aDelegate;
 
 - (void)start;
 - (void)cancel;

Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m  2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKDownload.m  2010-04-01 14:43:32 UTC (rev 6406)
@@ -57,6 +57,9 @@
 
 @implementation SKDownload
 
+...@synthesize URL, URLDownload, filePath, fileIcon, expectedContentLength, 
receivedContentLength, status, delegate;
+...@dynamic fileName, info;
+
 + (NSSet *)infoKeys {
     return [NSSet setWithObjects:SKDownloadFileNameKey, SKDownloadStatusKey, 
SKDownloadProgressIndicatorKey, nil];
 }
@@ -134,18 +137,6 @@
 
 #pragma mark Accessors
 
-- (id <SKDownloadDelegate>)delegate {
-    return delegate;
-}
-
-- (void)setDelegate:(id <SKDownloadDelegate>)newDelegate {
-    delegate = newDelegate;
-}
-
-- (SKDownloadStatus)status {
-    return status;
-}
-
 - (void)setStatus:(SKDownloadStatus)newStatus {
     if (status != newStatus) {
         if (newStatus == SKDownloadStatusDownloading) {
@@ -160,14 +151,6 @@
     }
 }
 
-- (NSURL *)URL {
-    return URL;
-}
-
-- (NSString *)filePath {
-    return filePath;
-}
-
 - (void)setFilePath:(NSString *)newFilePath {
     if (filePath != newFilePath) {
         [filePath release];
@@ -196,10 +179,6 @@
     }
 }
 
-- (long long)expectedContentLength {
-    return expectedContentLength;
-}
-
 - (void)setExpectedContentLength:(long long)newExpectedContentLength {
     if (expectedContentLength != newExpectedContentLength) {
         expectedContentLength = newExpectedContentLength;
@@ -207,10 +186,6 @@
     }
 }
 
-- (long long)receivedContentLength {
-    return receivedContentLength;
-}
-
 - (void)setReceivedContentLength:(long long)newReceivedContentLength {
     if (receivedContentLength != newReceivedContentLength) {
         receivedContentLength = newReceivedContentLength;
@@ -218,10 +193,6 @@
     }
 }
 
-- (NSURLDownload *)URLDownload {
-    return URLDownload;
-}
-
 - (NSProgressIndicator *)progressIndicator {
     if (progressIndicator == nil && [self status] == 
SKDownloadStatusDownloading) {
         progressIndicator = [[NSProgressIndicator alloc] init];

Modified: trunk/SKFindController.h
===================================================================
--- trunk/SKFindController.h    2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKFindController.h    2010-04-01 14:43:32 UTC (rev 6406)
@@ -52,6 +52,12 @@
     NSTextView *fieldEditor;
 }
 
+...@property (retain) NSString *findString;
+...@property BOOL ignoreCase;
+...@property (readonly) NSInteger findOptions;
+...@property (readonly) id target;
+...@property (readonly) id selectionSource;
+
 + (id)sharedFindController;
 
 - (IBAction)performFindPanelAction:(id)sender;
@@ -60,17 +66,6 @@
 - (IBAction)findPrevious:(id)sender;
 - (IBAction)pickFindString:(id)sender;
 
-- (NSString *)findString;
-- (void)setFindString:(NSString *)newFindString;
-
-- (BOOL)ignoreCase;
-- (void)setIgnoreCase:(BOOL)newIgnoreCase;
-
-- (NSInteger)findOptions;
-
-- (id)target;
-- (id)selectionSource;
-
 @end
 
 

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m    2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKFindController.m    2010-04-01 14:43:32 UTC (rev 6406)
@@ -44,6 +44,9 @@
 
 @implementation SKFindController
 
+...@synthesize findString, ignoreCase;
+...@dynamic findOptions, target, selectionSource;
+
 + (id)sharedFindController {
     static SKFindController *sharedFindController = nil;
     if (sharedFindController == nil)
@@ -143,27 +146,6 @@
     }
 }
 
-- (NSString *)findString {
-    return findString;
-}
-
-- (void)setFindString:(NSString *)newFindString {
-    if (findString != newFindString) {
-        [findString release];
-        findString = [newFindString retain];
-    }
-}
-
-- (BOOL)ignoreCase {
-    return ignoreCase;
-}
-
-- (void)setIgnoreCase:(BOOL)newIgnoreCase {
-    if (ignoreCase != newIgnoreCase) {
-        ignoreCase = newIgnoreCase;
-    }
-}
-
 - (NSInteger)findOptions {
        NSInteger options = 0;
        

Modified: trunk/SKGroupedSearchResult.h
===================================================================
--- trunk/SKGroupedSearchResult.h       2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKGroupedSearchResult.h       2010-04-01 14:43:32 UTC (rev 6406)
@@ -47,17 +47,14 @@
     NSMutableArray *matches;
 }
 
+...@property (readonly) PDFPage *page;
+...@property (readonly) NSUInteger count;
+...@property NSUInteger maxCount;
+...@property (readonly) NSArray *matches;
+
 + (id)groupedSearchResultWithPage:(PDFPage *)aPage 
maxCount:(NSUInteger)aMaxCount;
 - (id)initWithPage:(PDFPage *)aPage maxCount:(NSUInteger)aMaxCount;
 
-- (PDFPage *)page;
-
-- (NSUInteger)count;
-
-- (NSUInteger)maxCount;
-- (void)setMaxCount:(NSUInteger)newMaxCount;
-
-- (NSArray *)matches;
 - (void)addMatch:(PDFSelection *)match;
 
 @end

Modified: trunk/SKGroupedSearchResult.m
===================================================================
--- trunk/SKGroupedSearchResult.m       2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKGroupedSearchResult.m       2010-04-01 14:43:32 UTC (rev 6406)
@@ -42,6 +42,9 @@
 
 @implementation SKGroupedSearchResult
 
+...@synthesize page, maxCount, matches;
+...@dynamic count;
+
 + (id)groupedSearchResultWithPage:(PDFPage *)aPage 
maxCount:(NSUInteger)aMaxCount {
     return [[[self alloc] initWithPage:aPage maxCount:aMaxCount] autorelease];
 }
@@ -61,26 +64,10 @@
     [super dealloc];
 }
 
-- (PDFPage *)page {
-    return page;
-}
-
 - (NSUInteger)count {
     return [matches count];
 }
 
-- (NSUInteger)maxCount {
-    return maxCount;
-}
-
-- (void)setMaxCount:(NSUInteger)newMaxCount {
-    maxCount = newMaxCount;
-}
-
-- (NSArray *)matches {
-    return matches;
-}
-
 - (void)addMatch:(PDFSelection *)match {
     [self willChangeValueForKey:SKGroupedSearchResultCountKey];
     [matches addObject:match];

Modified: trunk/SKInfoWindowController.h
===================================================================
--- trunk/SKInfoWindowController.h      2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKInfoWindowController.h      2010-04-01 14:43:32 UTC (rev 6406)
@@ -49,11 +49,10 @@
     NSArray *attributesKeys;
 }
 
+...@property (copy) NSDictionary *info;
+
 + (id)sharedInstance;
 
-- (NSDictionary *)info;
-- (void)setInfo:(NSDictionary *)newInfo;
-
 - (NSDictionary *)infoForDocument:(NSDocument *)doc;
 
 @end

Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m      2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKInfoWindowController.m      2010-04-01 14:43:32 UTC (rev 6406)
@@ -68,6 +68,8 @@
 
 @implementation SKInfoWindowController
 
+...@synthesize info;
+
 + (void)initialize {
     SKINITIALIZE;
     
@@ -270,17 +272,6 @@
     return dictionary;
 }
 
-- (NSDictionary *)info {
-    return info;
-}
-
-- (void)setInfo:(NSDictionary *)newInfo {
-    if (info != newInfo) {
-        [info release];
-        info = [newInfo retain];
-    }
-}
-
 - (void)handleViewFrameDidChangeNotification:(NSNotification *)notification {
     [attributesTableView noteHeightOfRowsWithIndexesChanged:[NSIndexSet 
indexSetWithIndex:[attributesKeys count] - 1]];
 }

Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h     2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKLineInspector.h     2010-04-01 14:43:32 UTC (rev 6406)
@@ -76,25 +76,18 @@
     SKLineChangeAction currentLineChangeAction;
 }
 
+...@property CGFloat lineWidth;
+...@property PDFBorderStyle style;
+...@property (copy) NSArray *dashPattern;
+...@property PDFLineStyle startLineStyle;
+...@property PDFLineStyle endLineStyle;
+...@property (readonly) SKLineChangeAction currentLineChangeAction;
+
 + (id)sharedLineInspector;
 + (BOOL)sharedLineInspectorExists;
 
-- (CGFloat)lineWidth;
-- (void)setLineWidth:(CGFloat)width;
-- (PDFBorderStyle)style;
-- (void)setStyle:(PDFBorderStyle)newStyle;
-- (NSArray *)dashPattern;
-- (void)setDashPattern:(NSArray *)pattern;
-
-- (PDFLineStyle)startLineStyle;
-- (void)setStartLineStyle:(PDFLineStyle)newStyle;
-- (PDFLineStyle)endLineStyle;
-- (void)setEndLineStyle:(PDFLineStyle)newStyle;
-
 - (void)setAnnotationStyle:(PDFAnnotation *)annotation;
 
-- (SKLineChangeAction)currentLineChangeAction;
-
 @end
 
 

Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m     2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKLineInspector.m     2010-04-01 14:43:32 UTC (rev 6406)
@@ -56,6 +56,8 @@
 
 @implementation SKLineInspector
 
+...@synthesize lineWidth, style, dashPattern, startLineStyle, endLineStyle, 
currentLineChangeAction;
+
 static SKLineInspector *sharedLineInspector = nil;
 
 + (id)sharedLineInspector {
@@ -428,10 +430,6 @@
 
 #pragma mark Accessors
 
-- (CGFloat)lineWidth {
-    return lineWidth;
-}
-
 - (void)setLineWidth:(CGFloat)width {
     if (fabs(lineWidth - width) > 0.00001) {
         lineWidth = width;
@@ -439,10 +437,6 @@
     }
 }
 
-- (PDFBorderStyle)style {
-    return style;
-}
-
 - (void)setStyle:(PDFBorderStyle)newStyle {
     if (newStyle != style) {
         style = newStyle;
@@ -450,10 +444,6 @@
     }
 }
 
-- (NSArray *)dashPattern {
-    return dashPattern;
-}
-
 - (void)setDashPattern:(NSArray *)pattern {
     if ([pattern isEqualToArray:dashPattern] == NO && (pattern || 
dashPattern)) {
         [dashPattern release];
@@ -462,10 +452,6 @@
     }
 }
 
-- (PDFLineStyle)startLineStyle {
-    return startLineStyle;
-}
-
 - (void)setStartLineStyle:(PDFLineStyle)newStyle {
     if (newStyle != startLineStyle) {
         startLineStyle = newStyle;
@@ -473,10 +459,6 @@
     }
 }
 
-- (PDFLineStyle)endLineStyle {
-    return endLineStyle;
-}
-
 - (void)setEndLineStyle:(PDFLineStyle)newStyle {
     if (newStyle != endLineStyle) {
         endLineStyle = newStyle;
@@ -497,10 +479,6 @@
     }
 }
 
-- (SKLineChangeAction)currentLineChangeAction {
-    return currentLineChangeAction;
-}
-
 - (void)setNilValueForKey:(NSString *)key {
     if ([key isEqualToString:LINEWIDTH_KEY]) {
         [self setValue:[NSNumber numberWithDouble:0.0] forKey:key];

Modified: trunk/SKNoteTypeSheetController.h
===================================================================
--- trunk/SKNoteTypeSheetController.h   2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKNoteTypeSheetController.h   2010-04-01 14:43:32 UTC (rev 6406)
@@ -25,13 +25,10 @@
     id <SKNoteTypeSheetControllerDelegate> delegate;
 }
 
-- (NSArray *)noteTypes;
+...@property (assign) id <SKNoteTypeSheetControllerDelegate> delegate;
+...@property (readonly) NSArray *noteTypes;
+...@property (readonly) NSMenu *noteTypeMenu;
 
-- (NSMenu *)noteTypeMenu;
-
 - (NSPredicate *)filterPredicateForSearchString:(NSString *)searchString 
caseInsensitive:(BOOL)caseInsensitive;
 
-- (id <SKNoteTypeSheetControllerDelegate>)delegate;
-- (void)setDelegate:(id <SKNoteTypeSheetControllerDelegate>)newDelegate;
-
 @end

Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m   2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKNoteTypeSheetController.m   2010-04-01 14:43:32 UTC (rev 6406)
@@ -23,6 +23,9 @@
 
 @implementation SKNoteTypeSheetController
 
+...@synthesize delegate, noteTypeMenu;
+...@dynamic noteTypes;
+
 - (id)init {
     if (self = [super initWithWindowNibName:@"NoteTypeSheet"]) {
         noteTypeMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
@@ -63,10 +66,6 @@
     [[self window] setFrame:frame display:NO];
 }
 
-- (NSMenu *)noteTypeMenu {
-    return noteTypeMenu;
-}
-
 - (NSArray *)noteTypes {
     NSMutableArray *types = [NSMutableArray array];
     NSUInteger i;
@@ -154,12 +153,4 @@
           contextInfo:NULL];
 }
 
-- (id <SKNoteTypeSheetControllerDelegate>)delegate {
-    return delegate;
-}
-
-- (void)setDelegate:(id <SKNoteTypeSheetControllerDelegate>)newDelegate {
-    delegate = newDelegate;
-}
-
 @end

Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h      2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKNoteWindowController.h      2010-04-01 14:43:32 UTC (rev 6406)
@@ -61,18 +61,13 @@
     NSUndoManager *textViewUndoManager;
 }
 
+...@property (readonly) PDFAnnotation *note;
+...@property BOOL keepOnTop;
+...@property BOOL forceOnTop;
+...@property (readonly) BOOL isNoteType;
+
 - (id)initWithNote:(PDFAnnotation *)aNote;
 
-- (PDFAnnotation *)note;
-
-- (BOOL)isNoteType;
-
-- (BOOL)keepOnTop;
-- (void)setKeepOnTop:(BOOL)flag;
-
-- (BOOL)forceOnTop;
-- (void)setForceOnTop:(BOOL)flag;
-
 - (void)statusBarClicked:(id)sender;
 
 @end

Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m      2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKNoteWindowController.m      2010-04-01 14:43:32 UTC (rev 6406)
@@ -67,6 +67,9 @@
 
 @implementation SKNoteWindowController
 
+...@synthesize note, keepOnTop, forceOnTop;
+...@dynamic isNoteType;
+
 static NSImage *noteIcons[7] = {nil, nil, nil, nil, nil, nil, nil};
 
 + (void)makeNoteIcons {
@@ -240,28 +243,16 @@
 
 - (BOOL)isNoteWindowController { return YES; }
 
-- (PDFAnnotation *)note {
-    return note;
-}
-
 - (BOOL)isNoteType {
     return [[note type] isEqualToString:SKNNoteString];
 }
 
-- (BOOL)keepOnTop {
-    return keepOnTop;
-}
-
 - (void)setKeepOnTop:(BOOL)flag {
     keepOnTop = flag;
     [[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel : 
NSNormalWindowLevel];
     [[self window] setHidesOnDeactivate:keepOnTop || forceOnTop];
 }
 
-- (BOOL)forceOnTop {
-    return forceOnTop;
-}
-
 - (void)setForceOnTop:(BOOL)flag {
     forceOnTop = flag;
     [[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel : 
NSNormalWindowLevel];

Modified: trunk/SKPDFSyncRecord.h
===================================================================
--- trunk/SKPDFSyncRecord.h     2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKPDFSyncRecord.h     2010-04-01 14:43:32 UTC (rev 6406)
@@ -47,25 +47,16 @@
     NSInteger line;
 }
 
+...@property (readonly) NSInteger recordIndex;
+...@property NSInteger pageIndex;
+...@property NSPoint point;
+...@property (readonly) CGFloat x;
+...@property (readonly) CGFloat y;
+...@property (retain) NSString *file;
+...@property NSInteger line;
+
 - (id)initWithRecordIndex:(NSInteger)aRecordIndex;
 
-- (NSInteger)recordIndex;
-
-- (NSInteger)pageIndex;
-- (void)setPageIndex:(NSInteger)newPageIndex;
-
-- (NSPoint)point;
-- (void)setPoint:(NSPoint)newPoint;
-
-- (CGFloat)x;
-- (CGFloat)y;
-
-- (NSString *)file;
-- (void)setFile:(NSString *)newFile;
-
-- (NSInteger)line;
-- (void)setLine:(NSInteger)newLine;
-
 @end
 
 #pragma mark -

Modified: trunk/SKPDFSyncRecord.m
===================================================================
--- trunk/SKPDFSyncRecord.m     2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKPDFSyncRecord.m     2010-04-01 14:43:32 UTC (rev 6406)
@@ -42,6 +42,9 @@
 
 @implementation SKPDFSyncRecord
 
+...@synthesize recordIndex, pageIndex, point, file, line;
+...@dynamic x, y;
+
 - (id)initWithRecordIndex:(NSInteger)aRecordIndex {
     if (self = [super init]) {
         recordIndex = aRecordIndex;
@@ -58,28 +61,6 @@
     [super dealloc];
 }
 
-- (NSInteger)recordIndex {
-    return recordIndex;
-}
-
-- (NSInteger)pageIndex {
-    return pageIndex;
-}
-
-- (void)setPageIndex:(NSInteger)newPageIndex {
-    if (pageIndex != newPageIndex) {
-        pageIndex = newPageIndex;
-    }
-}
-
-- (NSPoint)point {
-    return point;
-}
-
-- (void)setPoint:(NSPoint)newPoint {
-    point = newPoint;
-}
-
 - (CGFloat)x {
     return point.x;
 }
@@ -88,25 +69,6 @@
     return point.y;
 }
 
-- (NSString *)file {
-    return file;
-}
-
-- (void)setFile:(NSString *)newFile {
-    if (file != newFile) {
-        [file release];
-        file = [newFile retain];
-    }
-}
-
-- (NSInteger)line {
-    return line;
-}
-
-- (void)setLine:(NSInteger)newLine {
-    line = newLine;
-}
-
 @end
 
 #pragma mark -

Modified: trunk/SKPresentationOptionsSheetController.h
===================================================================
--- trunk/SKPresentationOptionsSheetController.h        2010-03-31 21:51:27 UTC 
(rev 6405)
+++ trunk/SKPresentationOptionsSheetController.h        2010-04-01 14:43:32 UTC 
(rev 6406)
@@ -60,22 +60,15 @@
     NSUndoManager *undoManager;
 }
 
+...@property BOOL separate;
+...@property (readonly) SKTransitionInfo *transition;
+...@property (copy) NSArray *transitions;
+...@property (readonly) NSArray *pageTransitions;
+...@property (readonly) SKMainDocument *notesDocument;
+...@property (readonly) BOOL isScrolling;
+
 - (id)initForController:(SKMainWindowController *)aController;
 
-- (BOOL)separate;
-- (void)setSeparate:(BOOL)newSeparate;
-
-- (SKTransitionInfo *)transition;
-
-- (NSArray *)transitions;
-- (void)setTransitions:(NSArray *)newTransitions;
-
-- (NSArray *)pageTransitions;
-
-- (SKMainDocument *)notesDocument;
-
-- (BOOL)isScrolling;
-
 - (NSUndoManager *)undoManager;
 
 - (void)startObservingTransitions:(NSArray *)infos;

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m        2010-03-31 21:51:27 UTC 
(rev 6405)
+++ trunk/SKPresentationOptionsSheetController.m        2010-04-01 14:43:32 UTC 
(rev 6406)
@@ -68,6 +68,9 @@
 
 @implementation SKPresentationOptionsSheetController
 
+...@synthesize separate, transition, transitions;
+...@dynamic pageTransitions, notesDocument, isScrolling;
+
 - (id)initForController:(SKMainWindowController *)aController {
     if (self = [super init]) {
         controller = aController;
@@ -241,10 +244,6 @@
     }
 }
 
-- (BOOL)separate {
-    return separate;
-}
-
 - (void)setSeparate:(BOOL)newSeparate {
     if (separate != newSeparate) {
         separate = newSeparate;
@@ -282,38 +281,6 @@
     }
 }
 
-- (SKAnimationTransitionStyle)transitionStyle {
-    return [transition transitionStyle];
-}
-
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)style {
-    [transition setTransitionStyle:style];
-}
-
-- (CGFloat)duration {
-    return [transition duration];
-}
-
-- (void)setDuration:(CGFloat)newDuration {
-    [transition setDuration:newDuration];
-}
-
-- (BOOL)shouldRestrict {
-    return [transition shouldRestrict];
-}
-
-- (void)setShouldRestrict:(BOOL)flag {
-    [transition setShouldRestrict:flag];
-}
-
-- (SKTransitionInfo *)transition {
-    return transition;
-}
-
-- (NSArray *)transitions {
-    return transitions;
-}
-
 - (void)setTransitions:(NSArray *)newTransitions {
     if (transitions != newTransitions) {
         [[[self undoManager] prepareWithInvocationTarget:self] 
setTransitions:transitions];

Modified: trunk/SKProgressController.h
===================================================================
--- trunk/SKProgressController.h        2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKProgressController.h        2010-04-01 14:43:32 UTC (rev 6406)
@@ -44,23 +44,13 @@
     IBOutlet NSTextField *progressField;
 }
 
-- (NSProgressIndicator *)progressBar;
+...@property (readonly) NSProgressIndicator *progressBar;
+...@property (retain) NSString *message;
+...@property (getter=isIndeterminate) BOOL indeterminate;
+...@property double minValue;
+...@property double maxValue;
+...@property double doubleValue;
 
-- (NSString *)message;
-- (void)setMessage:(NSString *)newMessage;
-
-- (BOOL)isIndeterminate;
-- (void)setIndeterminate:(BOOL)flag;
-
-- (double)minValue;
-- (void)setMinValue:(double)newMinimum;
-
-- (double)maxValue;
-- (void)setMaxValue:(double)newMaximum;
-
-- (double)doubleValue;
-- (void)setDoubleValue:(double)doubleValue;
-
 - (void)incrementBy:(double)delta;
 
 - (void)show;

Modified: trunk/SKProgressController.m
===================================================================
--- trunk/SKProgressController.m        2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKProgressController.m        2010-04-01 14:43:32 UTC (rev 6406)
@@ -43,6 +43,8 @@
 
 @implementation SKProgressController
 
+...@dynamic progressBar, message, indeterminate, minValue, maxValue, 
doubleValue;
+
 - (NSString *)windowNibName { 
     return @"ProgressSheet";
 }

Modified: trunk/SKReadingBar.h
===================================================================
--- trunk/SKReadingBar.h        2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKReadingBar.h        2010-04-01 14:43:32 UTC (rev 6406)
@@ -47,19 +47,14 @@
     NSUInteger numberOfLines;
 }
 
+...@property (retain) PDFPage *page;
+...@property NSInteger currentLine;
+...@property (readonly) NSInteger currentLastLine;
+...@property NSUInteger numberOfLines;
+...@property (readonly) NSRect currentBounds;
+
 - (id)initWithPage:(PDFPage *)aPage;
 
-- (PDFPage *)page;
-- (void)setPage:(PDFPage *)newPage;
-
-- (NSInteger)currentLine;
-- (void)setCurrentLine:(NSInteger)lineIndex;
-- (NSInteger)currentLastLine;
-
-- (NSUInteger)numberOfLines;
-- (void)setNumberOfLines:(NSUInteger)number;
-
-- (NSRect)currentBounds;
 - (NSRect)currentBoundsForBox:(PDFDisplayBox)box;
 
 - (BOOL)goToNextLine;

Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m        2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKReadingBar.m        2010-04-01 14:43:32 UTC (rev 6406)
@@ -42,6 +42,9 @@
 
 @implementation SKReadingBar
 
+...@synthesize page, currentLine, numberOfLines;
+...@dynamic currentLastLine, currentBounds;
+
 - (id)initWithPage:(PDFPage *)aPage {
     if (self = [super init]) {
         numberOfLines = 1;
@@ -62,10 +65,6 @@
     [super dealloc];
 }
 
-- (PDFPage *)page {
-    return page;
-}
-
 - (void)setPage:(PDFPage *)newPage {
     if (page != newPage) {
         [page release];
@@ -76,26 +75,10 @@
     } 
 }
 
-- (NSInteger)currentLine {
-    return currentLine;
-}
-
-- (void)setCurrentLine:(NSInteger)lineIndex {
-    currentLine = lineIndex;
-}
-
 - (NSInteger)currentLastLine {
     return MIN([lineRects count], currentLine + numberOfLines) - 1;
 }
 
-- (NSUInteger)numberOfLines {
-    return numberOfLines;
-}
-
-- (void)setNumberOfLines:(NSUInteger)number {
-    numberOfLines = number;
-}
-
 - (NSRect)currentBounds {
     if (page == nil || currentLine == -1)
         return NSZeroRect;

Modified: trunk/SKThumbnail.h
===================================================================
--- trunk/SKThumbnail.h 2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKThumbnail.h 2010-04-01 14:43:32 UTC (rev 6406)
@@ -54,21 +54,13 @@
     id <SKThumbnailDelegate> delegate;
 }
 
+...@property (assign) id <SKThumbnailDelegate> delegate;
+...@property (getter=isDirty) BOOL dirty;
+...@property (retain) NSImage *image;
+...@property (readonly) NSString *label;
+...@property (readonly) NSUInteger pageIndex;
+...@property (readonly) NSSize size;
+
 - (id)initWithImage:(NSImage *)anImage label:(NSString *)aLabel 
pageIndex:(NSUInteger)anIndex;
 
-- (id <SKThumbnailDelegate>)delegate;
-- (void)setDelegate:(id <SKThumbnailDelegate>)newDelegate;
-
-- (BOOL)isDirty;
-- (void)setDirty:(BOOL)flag;
-
-- (NSImage *)image;
-- (void)setImage:(NSImage *)newImage;
-
-- (NSString *)label;
-
-- (NSUInteger)pageIndex;
-
-- (NSSize)size;
-
 @end

Modified: trunk/SKThumbnail.m
===================================================================
--- trunk/SKThumbnail.m 2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKThumbnail.m 2010-04-01 14:43:32 UTC (rev 6406)
@@ -41,6 +41,9 @@
 
 @implementation SKThumbnail
 
+...@synthesize delegate, dirty, image, label, pageIndex;
+...@dynamic size;
+
 - (id)initWithImage:(NSImage *)anImage label:(NSString *)aLabel 
pageIndex:(NSUInteger)anIndex {
     if (self = [super init]) {
         image = [anImage retain];
@@ -52,40 +55,18 @@
 }
 
 - (void)dealloc {
+    delegate = nil;
     SKDESTROY(image);
     SKDESTROY(label);
     [super dealloc];
 }
 
-- (id <SKThumbnailDelegate>)delegate { return delegate; }
-
-- (void)setDelegate:(id <SKThumbnailDelegate>)newDelegate { delegate = 
newDelegate; }
-
-- (BOOL)isDirty { return dirty; }
-
-- (void)setDirty:(BOOL)flag { dirty = flag; }
-
-- (void)setImage:(NSImage *)newImage {
-    if (image != newImage) {
-        [image release];
-        image = [newImage retain];
-    }
-}
-
 - (NSImage *)image {
     if (dirty && [delegate generateImageForThumbnail:self])
         [self setDirty:NO];
     return image;
 }
 
-- (NSString *)label {
-    return label;
-}
-
-- (NSUInteger)pageIndex {
-    return pageIndex;
-}
-
 - (NSSize)size {
     return [image size];
 }

Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h    2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKTransitionInfo.h    2010-04-01 14:43:32 UTC (rev 6406)
@@ -49,24 +49,12 @@
     NSString *label;
 }
 
-- (NSDictionary *)properties;
-- (void)setProperties:(NSDictionary *)dictionary;
+...@property (copy) NSDictionary *properties;
+...@property SKAnimationTransitionStyle transitionStyle;
+...@property CGFloat duration;
+...@property BOOL shouldRestrict;
+...@property (retain) SKThumbnail *thumbnail;
+...@property (copy) NSString *label;
+...@property (readonly) NSString *title;
 
-- (SKAnimationTransitionStyle)transitionStyle;
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)style;
-
-- (CGFloat)duration;
-- (void)setDuration:(CGFloat)newDuration;
-
-- (BOOL)shouldRestrict;
-- (void)setShouldRestrict:(BOOL)newShouldRestrict;
-
-- (SKThumbnail *)thumbnail;
-- (void)setThumbnail:(SKThumbnail *)newThumbnail;
-
-- (NSString *)label;
-- (void)setLabel:(NSString *)newLabel;
-
-- (NSString *)title;
-
 @end

Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m    2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKTransitionInfo.m    2010-04-01 14:43:32 UTC (rev 6406)
@@ -42,6 +42,9 @@
 
 @implementation SKTransitionInfo
 
+...@synthesize transitionStyle, duration, shouldRestrict, thumbnail, label;
+...@dynamic properties, title;
+
 + (NSSet *)keyPathsForValuesAffectingValueForTitle {
     return [NSSet setWithObjects:@"label", nil];
 }
@@ -84,52 +87,6 @@
         [self setShouldRestrict:[value doubleValue]];
 }
 
-- (SKAnimationTransitionStyle)transitionStyle {
-    return transitionStyle;
-}
-
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)newTransitionStyle {
-    transitionStyle = newTransitionStyle;
-}
-
-- (CGFloat)duration {
-    return duration;
-}
-
-- (void)setDuration:(CGFloat)newDuration {
-    duration = newDuration;
-}
-
-- (BOOL)shouldRestrict {
-    return shouldRestrict;
-}
-
-- (void)setShouldRestrict:(BOOL)newShouldRestrict {
-    shouldRestrict = newShouldRestrict;
-}
-
-- (SKThumbnail *)thumbnail {
-    return thumbnail;
-}
-
-- (void)setThumbnail:(SKThumbnail *)newThumbnail {
-    if (thumbnail != newThumbnail) {
-        [thumbnail release];
-        thumbnail = [newThumbnail retain];
-    }
-}
-
-- (NSString *)label {
-    return label;
-}
-
-- (void)setLabel:(NSString *)newLabel {
-    if (label != newLabel) {
-        [label release];
-        label = [newLabel copy];
-    }
-}
-
 - (NSString *)title {
     NSString *title = NSLocalizedString(@"Page Transition", @"Box title");
     if (label)

Modified: trunk/SKVersionNumber.h
===================================================================
--- trunk/SKVersionNumber.h     2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKVersionNumber.h     2010-04-01 14:43:32 UTC (rev 6406)
@@ -56,18 +56,17 @@
     NSInteger releaseType;
 }
 
+...@property (readonly) NSString *originalVersionString;
+...@property (readonly) NSString *cleanVersionString;
+...@property (readonly) NSUInteger componentCount;
+...@property NSInteger releaseType;
+
 + (NSComparisonResult)compareVersionString:(NSString *)versionString 
toVersionString:(NSString *)otherVersionString;
 
 - (id)initWithVersionString:(NSString *)versionString;
 
-- (NSString *)originalVersionString;
-- (NSString *)cleanVersionString;
-
-- (NSUInteger)componentCount;
 - (NSInteger)componentAtIndex:(NSUInteger)componentIndex;
 
-- (NSInteger)releaseType;
-
 - (NSComparisonResult)compareToVersionNumber:(SKVersionNumber *)otherVersion;
 
 @end

Modified: trunk/SKVersionNumber.m
===================================================================
--- trunk/SKVersionNumber.m     2010-03-31 21:51:27 UTC (rev 6405)
+++ trunk/SKVersionNumber.m     2010-04-01 14:43:32 UTC (rev 6406)
@@ -41,6 +41,8 @@
 
 @implementation SKVersionNumber
 
+...@synthesize originalVersionString, cleanVersionString, componentCount, 
releaseType;
+
 + (NSComparisonResult)compareVersionString:(NSString *)versionString 
toVersionString:(NSString *)otherVersionString;
 {
     SKVersionNumber *versionNumber = [[self alloc] 
initWithVersionString:versionString];
@@ -154,21 +156,6 @@
 
 #pragma mark API
 
-- (NSString *)originalVersionString;
-{
-    return originalVersionString;
-}
-
-- (NSString *)cleanVersionString;
-{
-    return cleanVersionString;
-}
-
-- (NSUInteger)componentCount;
-{
-    return componentCount;
-}
-
 - (NSInteger)componentAtIndex:(NSUInteger)componentIndex;
 {
     // This treats the version as a infinite sequence ending in "...0.0.0.0", 
making comparison easier
@@ -177,11 +164,6 @@
     return 0;
 }
 
-- (NSInteger)releaseType;
-{
-    return releaseType;
-}
-
 #pragma mark NSCopying
 
 - (id)copyWithZone:(NSZone *)zone;


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to