Browse files

Renamed tooltip class now that it's no longer a controller

  • Loading branch information...
1 parent 7596335 commit 27b95adfb2082cb318e58668740b4ddd35bfd37c @onecrayon committed Apr 13, 2012
View
12 ShellActions.xcodeproj/project.pbxproj
@@ -18,7 +18,7 @@
7AC981C714FEAD6000EB787A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AC981C614FEAD6000EB787A /* WebKit.framework */; };
7AD8EC0314F851CA00FDF9E7 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AD8EC0214F851CA00FDF9E7 /* Cocoa.framework */; };
7AD8EC0D14F851CA00FDF9EB /* MAAttachedWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AD8EC0D14F851CA00FDF9EA /* MAAttachedWindow.m */; };
- 7AD8EC0D14F851CA00FDF9F1 /* OCShellTooltipOutputController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AD8EC0D14F851CA00FDF9F0 /* OCShellTooltipOutputController.m */; };
+ 7AD8EC0D14F851CA00FDF9F1 /* OCShellTooltipOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AD8EC0D14F851CA00FDF9F0 /* OCShellTooltipOutput.m */; };
7AD8EC0D14F851CA00FDF9F6 /* NS(Attributed)String+Geometrics.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AD8EC0D14F851CA00FDF9F5 /* NS(Attributed)String+Geometrics.m */; };
/* End PBXBuildFile section */
@@ -44,8 +44,8 @@
7AD8EC0714F851CA00FDF9E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7AD8EC0D14F851CA00FDF9E9 /* MAAttachedWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MAAttachedWindow.h; path = "Third Party/MAAttachedWindow.h"; sourceTree = "<group>"; };
7AD8EC0D14F851CA00FDF9EA /* MAAttachedWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MAAttachedWindow.m; path = "Third Party/MAAttachedWindow.m"; sourceTree = "<group>"; };
- 7AD8EC0D14F851CA00FDF9EF /* OCShellTooltipOutputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCShellTooltipOutputController.h; path = Classes/OCShellTooltipOutputController.h; sourceTree = "<group>"; };
- 7AD8EC0D14F851CA00FDF9F0 /* OCShellTooltipOutputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OCShellTooltipOutputController.m; path = Classes/OCShellTooltipOutputController.m; sourceTree = "<group>"; };
+ 7AD8EC0D14F851CA00FDF9EF /* OCShellTooltipOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCShellTooltipOutput.h; path = Classes/OCShellTooltipOutput.h; sourceTree = "<group>"; };
+ 7AD8EC0D14F851CA00FDF9F0 /* OCShellTooltipOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OCShellTooltipOutput.m; path = Classes/OCShellTooltipOutput.m; sourceTree = "<group>"; };
7AD8EC0D14F851CA00FDF9F4 /* NS(Attributed)String+Geometrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NS(Attributed)String+Geometrics.h"; path = "Third Party/NS(Attributed)String+Geometrics.h"; sourceTree = "<group>"; };
7AD8EC0D14F851CA00FDF9F5 /* NS(Attributed)String+Geometrics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NS(Attributed)String+Geometrics.m"; path = "Third Party/NS(Attributed)String+Geometrics.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -111,8 +111,8 @@
7AD8EC0414F851CA00FDF9E7 /* ShellActions */ = {
isa = PBXGroup;
children = (
- 7AD8EC0D14F851CA00FDF9F0 /* OCShellTooltipOutputController.m */,
- 7AD8EC0D14F851CA00FDF9EF /* OCShellTooltipOutputController.h */,
+ 7AD8EC0D14F851CA00FDF9F0 /* OCShellTooltipOutput.m */,
+ 7AD8EC0D14F851CA00FDF9EF /* OCShellTooltipOutput.h */,
7A7FA5AF14F853500079E541 /* OCShellAction.h */,
7A7FA5B014F853500079E541 /* OCShellAction.m */,
7AC981BC14FEAB5100EB787A /* OCShellHTMLOutputController.h */,
@@ -244,7 +244,7 @@
7AB5CD7315014B76007B3F02 /* OCShellConsoleOutputController.m in Sources */,
7AB5CD7C15014F59007B3F02 /* OCShellConsoleTextView.m in Sources */,
7AD8EC0D14F851CA00FDF9EB /* MAAttachedWindow.m in Sources */,
- 7AD8EC0D14F851CA00FDF9F1 /* OCShellTooltipOutputController.m in Sources */,
+ 7AD8EC0D14F851CA00FDF9F1 /* OCShellTooltipOutput.m in Sources */,
7AD8EC0D14F851CA00FDF9F6 /* NS(Attributed)String+Geometrics.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
View
6 ShellActions/Classes/OCShellAction.m
@@ -11,7 +11,7 @@
#import "NSMutableDictionary+OCSettingAdditions.h"
#import "OCShellHTMLOutputController.h"
#import "OCShellConsoleOutputController.h"
-#import "OCShellTooltipOutputController.h"
+#import "OCShellTooltipOutput.h"
#import <EspressoTextActions.h>
#import <EspressoTextCore.h>
@@ -279,7 +279,7 @@ - (BOOL)performActionWithContext:(id)context error:(NSError **)outError {
NSRange aggregateRange = NSMakeRange(0, 0);
BOOL multipleSelectionsToSnippet = NO;
NSMutableString *interimText;
- OCShellTooltipOutputController *tooltip;
+ OCShellTooltipOutput *tooltip;
for (NSValue *rangeValue in ranges) {
range = [rangeValue rangeValue];
// Setup our per-loop environment variables
@@ -376,7 +376,7 @@ - (BOOL)performActionWithContext:(id)context error:(NSError **)outError {
[aggregateOutput appendString:outputStr];
} else if ([output isEqualToString:@"tooltip"] && [outputStr length] > 0) {
// Create our tooltip and anchor it to this particular selection
- tooltip = [[OCShellTooltipOutputController alloc] init];
+ tooltip = [[OCShellTooltipOutput alloc] init];
[tooltip displayString:outputStr inTextActionContext:context forRange:range];
[tooltip release];
}
View
4 .../Classes/OCShellTooltipOutputController.h → ShellActions/Classes/OCShellTooltipOutput.h
@@ -1,5 +1,5 @@
//
-// OCShellTooltipOutputController.h
+// OCShellTooltipOutput.h
// ShellActions
//
// Created by Ian Beck on 04/10/12.
@@ -10,7 +10,7 @@
#import "MAAttachedWindow.h"
-@interface OCShellTooltipOutputController : NSObject {
+@interface OCShellTooltipOutput : NSObject {
@private
NSView *view;
NSTextView *labelText;
View
8 .../Classes/OCShellTooltipOutputController.m → ShellActions/Classes/OCShellTooltipOutput.m
@@ -1,12 +1,12 @@
//
-// OCShellTooltipOutputController.m
+// OCShellTooltipOutput.m
// ShellActions
//
// Created by Ian Beck on 04/10/12.
// Copyright 2012 One Crayon. All rights reserved.
//
-#import "OCShellTooltipOutputController.h"
+#import "OCShellTooltipOutput.h"
#import "NS(Attributed)String+Geometrics.h"
#import <NSString+MRFoundation.h>
@@ -19,9 +19,9 @@ @interface NSObject (OCShellTooltipExtraInfo)
@property(readonly) id tab;
@end
-@implementation OCShellTooltipOutputController
+@implementation OCShellTooltipOutput
-- (OCShellTooltipOutputController *)init {
+- (OCShellTooltipOutput *)init {
self = [super init];
if (self) {
view = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 478, 34)];

0 comments on commit 27b95ad

Please sign in to comment.