From 2184e6e885bc4950d3356051ecd30f93e12a76f9 Mon Sep 17 00:00:00 2001 From: David Kocher Date: Thu, 9 Jun 2005 20:48:53 +0000 Subject: [PATCH] no message --- .gitattributes | 1 - Cyberduck.scriptTerminology | 370 ------------------ Cyberduck.sdef | 292 +++++++------- .../cyberduck/ui/cocoa/CDMainController.java | 7 +- source/ch/cyberduck/ui/cocoa/UKPrefsPanel.m | 1 + source/ch/cyberduck/ui/cocoa/growl/Growl.java | 4 +- source/ch/cyberduck/ui/cocoa/growl/Growl.m | 28 +- source/ch/cyberduck/ui/cocoa/odb/Editor.java | 4 +- 8 files changed, 169 insertions(+), 538 deletions(-) delete mode 100644 Cyberduck.scriptTerminology diff --git a/.gitattributes b/.gitattributes index 382e8b5c90..46c6a8a57b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,7 +25,6 @@ Cyberduck[!!-~]FAQ.rtfd/Pasted[!!-~]Graphic[!!-~]8.tiff -text Cyberduck[!!-~]FAQ.rtfd/Pasted[!!-~]Graphic[!!-~]9.tiff -text Cyberduck[!!-~]FAQ.rtfd/Pasted[!!-~]Graphic.tiff -text Cyberduck[!!-~]FAQ.rtfd/cyberduck-application.icns -text -/Cyberduck.scriptTerminology -text svneol=unset#application/octet-stream Spotlight[!!-~]Importer/English.lproj/InfoPlist.strings svneol=native#unset Spotlight[!!-~]Importer/English.lproj/schema.strings svneol=native#unset build/Growl.framework.zip -text diff --git a/Cyberduck.scriptTerminology b/Cyberduck.scriptTerminology deleted file mode 100644 index 614624a96f..0000000000 --- a/Cyberduck.scriptTerminology +++ /dev/null @@ -1,370 +0,0 @@ - - - - - Name - Cyberduck Suite - Description - AppleScript commands and classes specific to Cyberduck - Classes - - NSApplication - - Description - Cyberduck's top level scripting object. - Name - application - PluralName - applications - - ch.cyberduck.ui.cocoa.CDBrowserController - - Attributes - - WorkingDirectory - - Description - The current working folder. - Name - working folder - - Encoding - - Description - The character set to decode filenames. - Name - encoding - - ShowHiddenFiles - - Description - Show hidden files. - Name - show hidden - - - Description - A Browser - Name - browser - PluralName - browsers - - - Commands - - Create - - Description - Open new browser window. - Name - make new - - Connect - - Description - Connect to a specified server. - Name - connect - Arguments - - Protocol - - Description - The protocol to use (FTP or SFTP). - Name - with protocol - - Host - - Description - The host to connect to. - Name - to - - Port - - Description - The port to use when connecting. - Name - with port - - InitialPath - - Description - The initial path to change to after connection is made. - Name - with initial folder - - Password - - Description - The password to use when connecting. - Name - with password - - Username - - Description - The username to use when connecting. - Name - as user - - - - Disconnect - - Description - Disconnect from server. - Name - disconnect - - CreateFolder - - Description - Create a new folder. - Name - create - Arguments - - Path - - Description - The folder. - Name - folder - - - - CreateFile - - Description - Create a new file. - Name - touch - Arguments - - Path - - Description - The filename. - Name - file - - - - EditFile - - Description - Edit file. - Name - edit - Arguments - - Path - - Description - The filename. - Name - file - - - - DeleteFile - - Description - Delete file. - Name - delete - Arguments - - Path - - Description - The filename. - Name - file - - - - Refresh - - Description - Refresh folder listing. - Name - refresh - - Download - - Description - Download file. - Name - download - Arguments - - Path - - Description - The filename. - Name - file - - Local - - Description - The download folder. - Name - to - - Name - - Description - The name to save the file as. - Name - as - - - - Upload - - Description - Upload file. - Name - upload - Arguments - - Path - - Description - The filename. - Name - file - - Remote - - Description - The upload folder. - Name - to - - Name - - Description - The name to save the file as. - Name - as - - - - Exists - - Description - If the given file exists. - Name - exists - Arguments - - Path - - Description - The filename. - Name - file - - - - Sync - - Description - Sync folder. - Name - sync - Arguments - - Path - - Description - The remote folder. - Name - folder - - Local - - Description - The local folder. - Name - with local folder - - - - Goto - - Description - Go to Folder. - Name - change folder - Arguments - - Path - - Description - The filename. - Name - to - - - - List - - Description - List folder content. - Name - browse - Arguments - - Path - - Description - The folder. - Name - folder - - - - GetURL - - Description - Open a URL - Name - open URL - - OpenURL - - Description - Open a URL - Name - open URL - - - Enumerations - - Protocols - - ftp - - Description - Connect to server using FTP File Transfer - Name - FTP - - sftp - - Description - Connect to server using SSH Secure File Transfer - Name - SFTP - - - - - diff --git a/Cyberduck.sdef b/Cyberduck.sdef index fe3b002793..63c115c3bf 100644 --- a/Cyberduck.sdef +++ b/Cyberduck.sdef @@ -1,150 +1,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/ch/cyberduck/ui/cocoa/CDMainController.java b/source/ch/cyberduck/ui/cocoa/CDMainController.java index 0a25b266c4..2e307f10d9 100644 --- a/source/ch/cyberduck/ui/cocoa/CDMainController.java +++ b/source/ch/cyberduck/ui/cocoa/CDMainController.java @@ -369,10 +369,10 @@ public class CDMainController extends CDController { Host host = rendezvous.getService((String)msg.getContent()); if(msg.getTitle().equals(Message.RENDEZVOUS_ADD)) { Growl.instance().notifyWithImage(NSBundle.localizedString("Bonjour"), - (String)msg.getContent(), - "rendezvous.icns"); + (String)msg.getContent(), + "rendezvous.icns"); items.put((String)msg.getContent(), - host); + host); } if(msg.getTitle().equals(Message.RENDEZVOUS_REMOVE)) { items.remove((String)msg.getContent()); @@ -673,6 +673,7 @@ public class CDMainController extends CDController { public void applicationDidFinishLaunching(NSNotification notification) { Growl.instance().register(); + log.info("Running Java "+System.getProperty("java.version")); log.info("Available localizations:"+NSBundle.mainBundle().localizations()); if(Preferences.instance().getBoolean("queue.openByDefault")) { this.showTransferQueueClicked(null); diff --git a/source/ch/cyberduck/ui/cocoa/UKPrefsPanel.m b/source/ch/cyberduck/ui/cocoa/UKPrefsPanel.m index 1f632f293e..80da3df324 100644 --- a/source/ch/cyberduck/ui/cocoa/UKPrefsPanel.m +++ b/source/ch/cyberduck/ui/cocoa/UKPrefsPanel.m @@ -60,6 +60,7 @@ -(void) dealloc { + [super dealloc]; [itemsList release]; [baseWindowName release]; [autosaveName release]; diff --git a/source/ch/cyberduck/ui/cocoa/growl/Growl.java b/source/ch/cyberduck/ui/cocoa/growl/Growl.java index bfcf7f9ae2..b2e361237d 100644 --- a/source/ch/cyberduck/ui/cocoa/growl/Growl.java +++ b/source/ch/cyberduck/ui/cocoa/growl/Growl.java @@ -28,8 +28,8 @@ public class Growl { static { try { NSBundle bundle = NSBundle.mainBundle(); - String lib = bundle.resourcePath()+"/Java/"+"libGrowl.jnilib"; - log.debug("Locating libGrowl.jnilib at '"+lib+"'"); + String lib = bundle.resourcePath()+"/Java/"+"libGrowl.dylib"; + log.info("Locating libGrowl.dylib at '"+lib+"'"); System.load(lib); } catch(UnsatisfiedLinkError e) { diff --git a/source/ch/cyberduck/ui/cocoa/growl/Growl.m b/source/ch/cyberduck/ui/cocoa/growl/Growl.m index 16ca70a2ee..018e132542 100644 --- a/source/ch/cyberduck/ui/cocoa/growl/Growl.m +++ b/source/ch/cyberduck/ui/cocoa/growl/Growl.m @@ -111,24 +111,24 @@ JNIEXPORT void JNICALL Java_ch_cyberduck_ui_cocoa_growl_Growl_notifyWithImage( - (void)notifyGrowl:(NSString *)title withDescription:(NSString *)description withImage:(NSImage *) image { - [GrowlApplicationBridge notifyWithTitle:title - description:description - notificationName:title - iconData:[image TIFFRepresentation] - priority:0 - isSticky:NO - clickContext:nil]; + [GrowlApplicationBridge notifyWithTitle:title + description:description + notificationName:title + iconData:[image TIFFRepresentation] + priority:0 + isSticky:NO + clickContext:nil]; } - (void)notifyGrowl:(NSString *)title withDescription:(NSString *)description { - [GrowlApplicationBridge notifyWithTitle:title - description:description - notificationName:title - iconData:nil - priority:0 - isSticky:NO - clickContext:nil]; + [GrowlApplicationBridge notifyWithTitle:title + description:description + notificationName:title + iconData:nil + priority:0 + isSticky:NO + clickContext:nil]; } #pragma mark Growl Delegate methods diff --git a/source/ch/cyberduck/ui/cocoa/odb/Editor.java b/source/ch/cyberduck/ui/cocoa/odb/Editor.java index 5af6d6fd58..f08d889d8e 100644 --- a/source/ch/cyberduck/ui/cocoa/odb/Editor.java +++ b/source/ch/cyberduck/ui/cocoa/odb/Editor.java @@ -76,8 +76,8 @@ public class Editor { // Ensure native odb library is loaded try { NSBundle bundle = NSBundle.mainBundle(); - String lib = bundle.resourcePath()+"/Java/"+"libODBEdit.jnilib"; - log.debug("Locating libODBEdit.jnilib at '"+lib+"'"); + String lib = bundle.resourcePath()+"/Java/"+"libODBEdit.dylib"; + log.info("Locating libODBEdit.dylib at '"+lib+"'"); System.load(lib); } catch(UnsatisfiedLinkError e) {