Merge pull request #995 from iterate-ch/master

[pull] master from iterate-ch:master

Author: pull[bot]

cli/src/main/java/ch/cyberduck/cli/TerminalTranscriptListener.java

@@ -30,9 +30,11 @@ public class TerminalTranscriptListener implements TranscriptListener {
     public void log(final Type request, final String message) {
         switch(request) {
             case request:
+            case requestheader:
                 console.printf("%n%s> %s%s", Ansi.ansi().fg(Ansi.Color.GREEN), message, Ansi.ansi().reset());
                 break;
             case response:
+            case responseheader:
                 console.printf("%n%s< %s%s", Ansi.ansi().fg(Ansi.Color.RED), message, Ansi.ansi().reset());
                 break;
         }

dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java

@@ -85,7 +85,7 @@ public void testProxyNoConnect() throws Exception {
         final Profile profile = new ProfilePlistReader(factory).read(
                 this.getClass().getResourceAsStream("/DRACOON (CLI).cyberduckprofile"));
         final Host host = new Host(profile, "duck.dracoon.com", new Credentials(
-                System.getProperties().getProperty("dracoon.user"), System.getProperties().getProperty("dracoon.key")
+                PROPERTIES.get("dracoon.user"), PROPERTIES.get("dracoon.key")
         ));
         final SDSSession session = new SDSSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager());
         final LoginConnectionService c = new LoginConnectionService(
@@ -110,7 +110,7 @@ public void testConnectProxyInvalidCredentials() throws Exception {
         final Profile profile = new ProfilePlistReader(factory).read(
                 this.getClass().getResourceAsStream("/DRACOON (CLI).cyberduckprofile"));
         final Host host = new Host(profile, "duck.dracoon.com", new Credentials(
-                System.getProperties().getProperty("dracoon.user"), System.getProperties().getProperty("dracoon.key")
+                PROPERTIES.get("dracoon.user"), PROPERTIES.get("dracoon.key")
         ));
         final SDSSession session = new SDSSession(host, new DefaultX509TrustManager(),
                 new KeychainX509KeyManager(new DisabledCertificateIdentityCallback(), host, new DisabledCertificateStore())) {

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java

@@ -282,12 +282,12 @@ public Boolean run() {
                         @Override
                         public void cleanup() {
                             alertIcon.setEnabled(!reachable);
-                            alertIcon.setImage(reachable ? null : IconCacheFactory.<NSImage>get().iconNamed("NSCaution"));
+                            alertIcon.setImage(reachable ? null : IconCacheFactory.<NSImage>get().iconNamed("NSCaution", 16));
                         }
                     });
                 }
                 else {
-                    alertIcon.setImage(IconCacheFactory.<NSImage>get().iconNamed("NSCaution"));
+                    alertIcon.setImage(IconCacheFactory.<NSImage>get().iconNamed("NSCaution", 16));
                     alertIcon.setEnabled(false);
                 }
             }

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/TranscriptController.java

@@ -84,9 +84,11 @@ public void log(final Type request, final String transcript) {
                 public void run() {
                     switch(request) {
                         case request:
+                        case requestheader:
                             write(FIXED_WITH_FONT_REQUEST_ATTRIBUTES, transcript);
                             break;
                         case response:
+                        case responseheader:
                             write(FIXED_WITH_FONT_RESPONSE_ATTRIBUTES, transcript);
                             break;
                     }

osx/src/main/java/ch/cyberduck/ui/cocoa/datasource/TransferPromptDataSource.java

@@ -187,7 +187,7 @@ protected NSObject objectValueForItem(final TransferItem file, final String iden
         if(identifier.equals(Column.warning.name())) {
             if(file.remote.isFile()) {
                 if(status.getLength() == 0) {
-                    return IconCacheFactory.<NSImage>get().iconNamed("NSCaution");
+                    return IconCacheFactory.<NSImage>get().iconNamed("NSCaution", 16);
                 }
             }
             return null;

s3/src/test/java/ch/cyberduck/core/s3/S3TransferAccelerationServiceTest.java

@@ -56,7 +56,7 @@ public void testWrite() throws Exception {
             @Override
             public void log(final Type request, final String message) {
                 switch(request) {
-                    case request:
+                    case requestheader:
                         if("Host: test-eu-central-1-cyberduck.s3-accelerate.dualstack.amazonaws.com".equals(message)) {
                             b.set(true);
                         }

windows/src/main/csharp/ch/cyberduck/ui/winforms/BrowserForm.cs

@@ -755,11 +755,11 @@ public MulticolorTreeListView.ActiveGetterPathDelegate ModelActiveGetter
         public void AddTranscriptEntry(TranscriptListener.Type request, string entry)
         {
             transcriptBox.SelectionFont = FixedFont;
-            if (request == TranscriptListener.Type.request)
+            if (request == TranscriptListener.Type.request || request == TranscriptListener.Type.requestheader)
             {
                 transcriptBox.SelectionColor = Color.Black;
             }
-            else if (request == TranscriptListener.Type.response)
+            else if (request == TranscriptListener.Type.response || request == TranscriptListener.Type.responseheader)
             {
                 transcriptBox.SelectionColor = Color.DarkGray;
             }