Code cleanup

Author: ealeksandrov

English.lproj/InfoPlist.strings

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6</string>
+	<string>2.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

Info.plist

@@ -1,8 +1,22 @@
 cd to
-Copyright (C) 2007-2013 Jay Tuley
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2007-2013 Jay Tuley
+Copyright (c) 2016 Evgeny Aleksandrov
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.md

@@ -226,13 +226,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -266,7 +259,6 @@
 				69C8AA70106E8F5800C4DE0D /* Finder.app */,
 				69449AD50B8909AB00A19631 /* plugin */,
 				694495BE0B869B3B00A19631 /* external projects */,
-				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,

cd_to.xcodeproj/project.pbxproj

@@ -10,85 +10,82 @@
 #import "CD2PluginProtocolV1.h"
 #import "Finder.h"
 
-NSString* getPathToFrontFinderWindow(){
-	
-	FinderApplication* finder = [SBApplication applicationWithBundleIdentifier:@"com.apple.Finder"];
+NSString *getPathToFrontFinderWindow() {
 
-	FinderItem *target = [(NSArray*)[[finder selection]get] firstObject];
-    if (target == nil){
+    FinderApplication* finder = [SBApplication applicationWithBundleIdentifier:@"com.apple.Finder"];
+    
+    FinderItem *target = [(NSArray*)[[finder selection]get] firstObject];
+    if (target == nil) {
         target = [[[[finder FinderWindows] firstObject] target] get];
     }
-	
-	NSURL* url =[NSURL URLWithString:target.URL];
-	NSError* error;
-	NSData* bookmark = [NSURL bookmarkDataWithContentsOfURL:url error:nil];
-    NSURL* fullUrl = [NSURL URLByResolvingBookmarkData:bookmark
-                                        options:NSURLBookmarkResolutionWithoutUI
-                                  relativeToURL:nil
-                            bookmarkDataIsStale:nil
-                                          error:&error];
-    if(fullUrl != nil){
+    
+    NSURL *url =[NSURL URLWithString:target.URL];
+    NSError *error;
+    NSData *bookmark = [NSURL bookmarkDataWithContentsOfURL:url error:nil];
+    NSURL *fullUrl = [NSURL URLByResolvingBookmarkData:bookmark
+                                               options:NSURLBookmarkResolutionWithoutUI
+                                         relativeToURL:nil
+                                   bookmarkDataIsStale:nil
+                                                 error:&error];
+    if (fullUrl != nil) {
         url = fullUrl;
     }
- 
-
-	NSString* path = [[url path] stringByExpandingTildeInPath];
-
+    
+    
+    NSString* path = [[url path] stringByExpandingTildeInPath];
+    
     BOOL isDir = NO;
-   [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir];
-
+    [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir];
 
 
-	if(!isDir){
-		path = [path stringByDeletingLastPathComponent];
-	}
-
-	return path;
+    
+    if (!isDir) {
+        path = [path stringByDeletingLastPathComponent];
+    }
+    
+    return path;
 }
 
-NSArray* loadPlugins(){
-    NSString* pluginPath = [[NSBundle mainBundle] builtInPlugInsPath];
-	NSArray* bundlePaths = [NSArray array];
-	if (pluginPath != nil) {
-		bundlePaths =[NSBundle pathsForResourcesOfType:@"bundle"
-											inDirectory:pluginPath];
-	}
-	NSMutableArray* pluginObjectArrays = [NSMutableArray array];
-	NSEnumerator *enumerator = [bundlePaths objectEnumerator];
-	NSString* path;
-	while ((path = (NSString*)[enumerator nextObject])) {
-		NSBundle* bundle =[NSBundle bundleWithPath:path];
-		Class pClass =[bundle principalClass];
-		if([pClass conformsToProtocol:@protocol(CD2PluginProtocolV1)] &&  [pClass isKindOfClass:[NSObject class]]){
-			[pluginObjectArrays addObject:[[[pClass alloc]init]autorelease]];		
-		}
-	}
-
-	return pluginObjectArrays;
+NSArray *loadPlugins() {
+    NSString *pluginPath = [[NSBundle mainBundle] builtInPlugInsPath];
+    NSArray *bundlePaths = [NSArray array];
+    if (pluginPath != nil) {
+        bundlePaths =[NSBundle pathsForResourcesOfType:@"bundle"
+                                           inDirectory:pluginPath];
+    }
+    NSMutableArray *pluginObjectArrays = [NSMutableArray array];
+    NSEnumerator *enumerator = [bundlePaths objectEnumerator];
+    NSString *path;
+    while ((path = (NSString*)[enumerator nextObject])) {
+        NSBundle* bundle =[NSBundle bundleWithPath:path];
+        Class pClass =[bundle principalClass];
+        if ([pClass conformsToProtocol:@protocol(CD2PluginProtocolV1)] &&  [pClass isKindOfClass:[NSObject class]]) {
+            [pluginObjectArrays addObject:[[[pClass alloc]init]autorelease]];
+        }
+    }
+    
+    return pluginObjectArrays;
 }
 
-int main(int argc, char *argv[])
-{
-	id pool = [[NSAutoreleasePool alloc] init];
-	
-	NSString* path;
-	@try{
-		path = getPathToFrontFinderWindow();
-	}@catch(id ex){
-		path =[@"~/Desktop" stringByExpandingTildeInPath];
-	}
-	
-	NSArray* plugins =loadPlugins();
-	
-	NSEnumerator *enumerator = [plugins objectEnumerator];
-	id <CD2PluginProtocolV1> plugin;
-	while ((plugin = (id <CD2PluginProtocolV1>)[enumerator nextObject])) {
-		[plugin openTermWindowForPath:path];
-	}
-	
-	[pool release];
+int main(int argc, char *argv[]) {
+    id pool = [[NSAutoreleasePool alloc] init];
+    
+    NSString *path;
+    @try {
+        path = getPathToFrontFinderWindow();
+    }
+    @catch (id ex) {
+        path =[@"~/Desktop" stringByExpandingTildeInPath];
+    }
+    
+    NSArray *plugins = loadPlugins();
+    
+    NSEnumerator *enumerator = [plugins objectEnumerator];
+    id <CD2PluginProtocolV1> plugin;
+    while ((plugin = (id <CD2PluginProtocolV1>)[enumerator nextObject])) {
+        [plugin openTermWindowForPath:path];
+    }
+    
+    [pool release];
     return 0;
 }
-
-
-

main.m

@@ -9,11 +9,8 @@
 #import <Cocoa/Cocoa.h>
 #import "CD2PluginProtocolV1.h"
 
-@interface CD2X11XTermPlugin : NSObject <CD2PluginProtocolV1> {
-
-}
-
--(BOOL)openTermWindowForPath:(NSString*)aPath;
+@interface CD2X11XTermPlugin : NSObject <CD2PluginProtocolV1>
 
+- (BOOL)openTermWindowForPath:(NSString *)aPath;
 
 @end

plugins/X11_xterm/CD2X11XTermPlugin.h

@@ -8,37 +8,36 @@
 
 #import "CD2X11XTermPlugin.h"
 
-
 @implementation CD2X11XTermPlugin
 
--(BOOL)openTermWindowForPath:(NSString*)aPath{
-	@try{
-		if(![[NSWorkspace sharedWorkspace] launchApplication:@"X11.app"]){
+- (BOOL)openTermWindowForPath:(NSString *)aPath{
+    @try {
+        if (![[NSWorkspace sharedWorkspace] launchApplication:@"X11.app"]) {
             [[NSWorkspace sharedWorkspace] launchApplication:@"XQuartz.app"];
         }
-		NSTask* task =[[NSTask alloc]init];
-		[task setCurrentDirectoryPath:aPath];
-		NSMutableDictionary* enviornment =[[[[NSProcessInfo processInfo] environment] mutableCopy]autorelease];
-				
-		[task setEnvironment:enviornment];
-		
-        NSString* path = @"/usr/X11R6/bin/xterm";
-        if(![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:NULL]){
+        
+        NSTask *task = [[NSTask alloc] init];
+        [task setCurrentDirectoryPath:aPath];
+        
+        NSMutableDictionary *enviornment = [[[[NSProcessInfo processInfo] environment] mutableCopy] autorelease];
+        [task setEnvironment:enviornment];
+        
+        NSString *path = @"/usr/X11R6/bin/xterm";
+        if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:NULL]) {
             path = @"/opt/X11/bin/xterm";
         }
-		[task setLaunchPath:path];
-
-		[task setStandardOutput:[NSFileHandle fileHandleWithStandardOutput]];	
-
-		[task setStandardError:[NSFileHandle fileHandleWithStandardOutput]];	
-		[task launch];
-		
-	}
-	@catch(id ex){
-		return NO;
-	}
-
-	return YES;
+        [task setLaunchPath:path];
+        
+        [task setStandardOutput:[NSFileHandle fileHandleWithStandardOutput]];
+        [task setStandardError:[NSFileHandle fileHandleWithStandardOutput]];
+        
+        [task launch];
+    }
+    @catch (id ex) {
+        return NO;
+    }
+    
+    return YES;
 }
 
 @end

plugins/X11_xterm/CD2X11XTermPlugin.m

@@ -18,7 +18,6 @@
 		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		32DBCF630370AF2F00C91783 /* X11_xterm_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = X11_xterm_Prefix.pch; sourceTree = "<group>"; };
 		69449BBF0B8925F900A19631 /* CD2X11XTermPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CD2X11XTermPlugin.h; sourceTree = "<group>"; };
 		69449BC00B8925F900A19631 /* CD2X11XTermPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CD2X11XTermPlugin.m; sourceTree = "<group>"; };
 		69449BC50B89260700A19631 /* CD2PluginProtocolV1.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CD2PluginProtocolV1.h; path = ../CD2PluginProtocolV1.h; sourceTree = SOURCE_ROOT; };
@@ -45,7 +44,6 @@
 			children = (
 				69449BC50B89260700A19631 /* CD2PluginProtocolV1.h */,
 				08FB77AFFE84173DC02AAC07 /* Classes */,
-				32C88E010371C26100C91783 /* Other Sources */,
 				089C167CFE841241C02AAC07 /* Resources */,
 				089C1671FE841209C02AAC07 /* Frameworks and Libraries */,
 				19C28FB8FE9D52D311CA2CBB /* Products */,
@@ -107,14 +105,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		32C88E010371C26100C91783 /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				32DBCF630370AF2F00C91783 /* X11_xterm_Prefix.pch */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -212,7 +202,6 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = X11_xterm_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /unsigned/plugins;
 				PRODUCT_BUNDLE_IDENTIFIER = indy.jt.cdto.plugin.x11xterm;
@@ -231,7 +220,6 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = X11_xterm_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /unsigned/plugins;
 				PRODUCT_BUNDLE_IDENTIFIER = indy.jt.cdto.plugin.x11xterm;

plugins/X11_xterm/English.lproj/InfoPlist.strings

@@ -3,16 +3,14 @@
 //  iterm
 //
 //  Created by James Tuley on 2/18/07.
-//  Copyright 2007 __MyCompanyName__. All rights reserved.
+//  Copyright 2007 Jay Tuley. All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
 #import "CD2PluginProtocolV1.h"
 
-@interface CD2ITerm : NSObject<CD2PluginProtocolV1> {
+@interface CD2ITerm : NSObject<CD2PluginProtocolV1>
 
-}
-
--(BOOL)openTermWindowForPath:(NSString*)aPath;
+- (BOOL)openTermWindowForPath:(NSString *)aPath;
 
 @end

plugins/X11_xterm/X11_xterm.xcodeproj/project.pbxproj

@@ -9,20 +9,22 @@
 #import "CD2ITerm.h"
 
 @implementation CD2ITerm
--(BOOL)openTermWindowForPath:(NSString*)aPath{
-	@try{
+
+- (BOOL)openTermWindowForPath:(NSString *)aPath {
+    @try {
         NSString *iterm2AbsolutePath;
         iterm2AbsolutePath = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:@"com.googlecode.iterm2"];
-
-        if (iterm2AbsolutePath)
+        
+        if (iterm2AbsolutePath) {
             [[NSWorkspace sharedWorkspace] openFile:[aPath stringByExpandingTildeInPath]
                                     withApplication:iterm2AbsolutePath
                                       andDeactivate:YES];
-
-	}@catch(id test){
-		return NO;
-	}
-	return YES;
+        }
+        
+    } @catch (id test) {
+        return NO;
+    }
+    return YES;
 }
 
 @end