File tree Expand file tree Collapse file tree 6 files changed +10
-6
lines changed Expand file tree Collapse file tree 6 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,8 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent
18
18
NSPoint eventLocation = [self convertPoint: [theEvent locationInWindow ] fromView: nil ];
19
19
NSInteger rowIndex = [self rowAtPoint: eventLocation];
20
20
[self selectRowIndexes: [NSIndexSet indexSetWithIndex: rowIndex] byExtendingSelection: TRUE ];
21
- return [[self delegate ] menuForTable: self ];
21
+ // TODO: Fix the coupling so we don't need the cast (at least).
22
+ return [(PBGitIndexController*)[self delegate ] menuForTable: self ];
22
23
}
23
24
24
25
return nil ;
Original file line number Diff line number Diff line change @@ -170,7 +170,7 @@ - (void)commitFinished:(NSNotification *)notification
170
170
{
171
171
[commitMessageView setEditable: YES ];
172
172
[commitMessageView setString: @" " ];
173
- [webController setStateMessage: [NSString stringWithFormat : [[notification userInfo ] objectForKey: @" description" ]]];
173
+ [webController setStateMessage: [NSString stringWithString : [[notification userInfo ] objectForKey: @" description" ]]];
174
174
[repository reloadRefs ];
175
175
}
176
176
Original file line number Diff line number Diff line change @@ -88,6 +88,7 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
88
88
89
89
- (NSFileHandle *) handleForCommand : (NSString *) cmd ;
90
90
- (NSFileHandle *) handleForArguments : (NSArray *) args ;
91
+ - (NSFileHandle *) handleInWorkDirForArguments : (NSArray *)args ;
91
92
- (NSFileHandle *) handleInWorkDirForArguments : (NSArray *)args ;
92
93
- (NSString *) outputForCommand : (NSString *) cmd ;
93
94
- (NSString *)outputForCommand : (NSString *)str retValue : (int *)ret ;
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ - (NSMenu *) menuForEvent:(NSEvent *)event inRect:(NSRect)rect ofView:(NSOutline
33
33
NSPoint point = [self .controlView convertPoint: [event locationInWindow ] fromView: nil ];
34
34
NSInteger row = [view rowAtPoint: point];
35
35
36
- PBGitSidebarController *controller = [view delegate ];
36
+ PBGitSidebarController *controller = (PBGitSidebarController*) [view delegate ];
37
37
38
38
return [controller menuForRow: row];
39
39
}
Original file line number Diff line number Diff line change 9
9
#import < Cocoa/Cocoa.h>
10
10
#import < WebKit/WebKit.h>
11
11
12
+ #import " PBGitRepository.h"
13
+
12
14
@interface PBWebController : NSObject {
13
15
IBOutlet WebView * view;
14
16
NSString *startFile;
18
20
NSMapTable *callbacks;
19
21
20
22
// For the repository access
21
- IBOutlet id repository;
23
+ IBOutlet PBGitRepository * repository;
22
24
}
23
25
24
26
@property (retain ) NSString *startFile;
25
- @property (retain ) id repository;
27
+ @property (retain ) PBGitRepository * repository;
26
28
27
29
- (WebScriptObject *) script ;
28
30
- (void ) closeView ;
Original file line number Diff line number Diff line change @@ -122,7 +122,7 @@ - (void)commitDetailsLoaded:(NSNotification *)notification
122
122
[[view windowScriptObject ] callWebScriptMethod: @" showCommit" withArguments: [NSArray arrayWithObject: html]];
123
123
124
124
#ifdef DEBUG_BUILD
125
- NSString *dom=[[[[view mainFrame ] DOMDocument ] documentElement ] outerHTML ];
125
+ NSString *dom=[( DOMHTMLElement *) [[[view mainFrame ] DOMDocument ] documentElement ] outerHTML ];
126
126
NSString *tmpFile=@" ~/tmp/test2.html" ;
127
127
[dom writeToFile: [tmpFile stringByExpandingTildeInPath ] atomically: true encoding: NSUTF8StringEncoding error: nil ];
128
128
#endif
You can’t perform that action at this time.
0 commit comments