diff --git a/core/src/main/java/ch/cyberduck/core/AbstractProtocol.java b/core/src/main/java/ch/cyberduck/core/AbstractProtocol.java index 656342ca935..0fbae55ac90 100644 --- a/core/src/main/java/ch/cyberduck/core/AbstractProtocol.java +++ b/core/src/main/java/ch/cyberduck/core/AbstractProtocol.java @@ -168,6 +168,11 @@ public boolean isUTCTimezone() { return true; } + @Override + public String getHostnamePlaceholder() { + return this.getDefaultHostname(); + } + @Override public String getUsernamePlaceholder() { return LocaleFactory.localizedString("Username", "Credentials"); diff --git a/core/src/main/java/ch/cyberduck/core/Profile.java b/core/src/main/java/ch/cyberduck/core/Profile.java index 8a73225203c..ffeb20313bf 100644 --- a/core/src/main/java/ch/cyberduck/core/Profile.java +++ b/core/src/main/java/ch/cyberduck/core/Profile.java @@ -130,6 +130,15 @@ public Type getType() { return parent.getType(); } + @Override + public String getHostnamePlaceholder() { + final String v = this.value("Hostname Placeholder"); + if(StringUtils.isBlank(v)) { + return parent.getHostnamePlaceholder(); + } + return v; + } + @Override public String getUsernamePlaceholder() { final String v = this.value("Username Placeholder"); diff --git a/core/src/main/java/ch/cyberduck/core/Protocol.java b/core/src/main/java/ch/cyberduck/core/Protocol.java index bce8184ca86..f4155cd7dea 100644 --- a/core/src/main/java/ch/cyberduck/core/Protocol.java +++ b/core/src/main/java/ch/cyberduck/core/Protocol.java @@ -228,6 +228,11 @@ public interface Protocol extends Comparable, Serializable { String favicon(); + /** + * @return Host label + */ + String getHostnamePlaceholder(); + /** * @return Username label */ diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java index 6457f7b4d18..8a5f11c29bc 100644 --- a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java +++ b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java @@ -241,7 +241,7 @@ public void setHostField(final NSTextField field) { public void change(final Host bookmark) { updateField(hostField, bookmark.getHostname()); hostField.setEnabled(bookmark.getProtocol().isHostnameConfigurable()); - hostField.cell().setPlaceholderString(bookmark.getProtocol().getDefaultHostname()); + hostField.cell().setPlaceholderString(bookmark.getProtocol().getHostnamePlaceholder()); } }); } diff --git a/profiles/OCI Object Storage (ap-chuncheon-1).cyberduckprofile b/profiles/OCI Object Storage (ap-chuncheon-1).cyberduckprofile index 98fabbf43d9..72f1508dfb4 100644 --- a/profiles/OCI Object Storage (ap-chuncheon-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-chuncheon-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-chuncheon-1 Description Oracle Cloud Infrastructure (ap-chuncheon-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-chuncheon-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-hyderabad-1).cyberduckprofile b/profiles/OCI Object Storage (ap-hyderabad-1).cyberduckprofile index f2ec1d0a4f4..d243c48d6f8 100644 --- a/profiles/OCI Object Storage (ap-hyderabad-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-hyderabad-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-hyderabad-1 Description OCI Object Storage (ap-hyderabad-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-hyderabad-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-melbourne-1).cyberduckprofile b/profiles/OCI Object Storage (ap-melbourne-1).cyberduckprofile index e88deb9401c..7bc58a4790e 100644 --- a/profiles/OCI Object Storage (ap-melbourne-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-melbourne-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-melbourne-1 Description OCI Object Storage (ap-melbourne-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-melbourne-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-mumbai-1).cyberduckprofile b/profiles/OCI Object Storage (ap-mumbai-1).cyberduckprofile index 7d92b8a1cc6..d8e4470ef14 100644 --- a/profiles/OCI Object Storage (ap-mumbai-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-mumbai-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-mumbai-1 Description OCI Object Storage (ap-mumbai-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-mumbai-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-osaka-1).cyberduckprofile b/profiles/OCI Object Storage (ap-osaka-1).cyberduckprofile index ec237a6bc18..b269d9b7770 100644 --- a/profiles/OCI Object Storage (ap-osaka-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-osaka-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-osaka-1 Description OCI Object Storage (ap-osaka-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-osaka-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-seoul-1).cyberduckprofile b/profiles/OCI Object Storage (ap-seoul-1).cyberduckprofile index a6fca804ab6..1659ba6e450 100644 --- a/profiles/OCI Object Storage (ap-seoul-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-seoul-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-seoul-1 Description OCI Object Storage (ap-seoul-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-seoul-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-singapore-1).cyberduckprofile b/profiles/OCI Object Storage (ap-singapore-1).cyberduckprofile index a5d86ba3029..54e26d731c5 100644 --- a/profiles/OCI Object Storage (ap-singapore-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-singapore-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-singapore-1 Description OCI Object Storage (ap-singapore-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-singapore-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-sydney-1).cyberduckprofile b/profiles/OCI Object Storage (ap-sydney-1).cyberduckprofile index 943c386382b..0f72c467ae2 100644 --- a/profiles/OCI Object Storage (ap-sydney-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-sydney-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-sydney-1 Description OCI Object Storage (ap-sydney-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-sydney-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ap-tokyo-1).cyberduckprofile b/profiles/OCI Object Storage (ap-tokyo-1).cyberduckprofile index 4d4cfa3c83a..45ffcd83e88 100644 --- a/profiles/OCI Object Storage (ap-tokyo-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ap-tokyo-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ap-tokyo-1 Description OCI Object Storage (ap-tokyo-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ap-tokyo-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ca-montreal-1).cyberduckprofile b/profiles/OCI Object Storage (ca-montreal-1).cyberduckprofile index bd3b9628e5b..70a93afbc19 100644 --- a/profiles/OCI Object Storage (ca-montreal-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ca-montreal-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ca-montreal-1 Description OCI Object Storage (ca-montreal-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ca-montreal-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (ca-toronto-1).cyberduckprofile b/profiles/OCI Object Storage (ca-toronto-1).cyberduckprofile index 7ae7353cc65..cd35d8dbe01 100644 --- a/profiles/OCI Object Storage (ca-toronto-1).cyberduckprofile +++ b/profiles/OCI Object Storage (ca-toronto-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-ca-toronto-1 Description OCI Object Storage (ca-toronto-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.ca-toronto-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (eu-amsterdam-1).cyberduckprofile b/profiles/OCI Object Storage (eu-amsterdam-1).cyberduckprofile index 1d88468690e..bc7a46e01ef 100644 --- a/profiles/OCI Object Storage (eu-amsterdam-1).cyberduckprofile +++ b/profiles/OCI Object Storage (eu-amsterdam-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-eu-amsterdam-1 Description OCI Object Storage (eu-amsterdam-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.eu-amsterdam-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (eu-frankfurt-1).cyberduckprofile b/profiles/OCI Object Storage (eu-frankfurt-1).cyberduckprofile index 116d2026831..8bd2523f408 100644 --- a/profiles/OCI Object Storage (eu-frankfurt-1).cyberduckprofile +++ b/profiles/OCI Object Storage (eu-frankfurt-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-eu-frankfurt-1 Description OCI Object Storage (eu-frankfurt-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.eu-frankfurt-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (eu-marseille-1).cyberduckprofile b/profiles/OCI Object Storage (eu-marseille-1).cyberduckprofile index e2dfee11146..ac54e79a374 100644 --- a/profiles/OCI Object Storage (eu-marseille-1).cyberduckprofile +++ b/profiles/OCI Object Storage (eu-marseille-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-eu-marseille-1 Description OCI Object Storage (eu-marseille-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.eu-marseille-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (eu-milan-1).cyberduckprofile b/profiles/OCI Object Storage (eu-milan-1).cyberduckprofile index b16bb10a1a0..ba3be951ba2 100644 --- a/profiles/OCI Object Storage (eu-milan-1).cyberduckprofile +++ b/profiles/OCI Object Storage (eu-milan-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-eu-milan-1 Description OCI Object Storage (eu-milan-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.eu-milan-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (eu-stockholm-1).cyberduckprofile b/profiles/OCI Object Storage (eu-stockholm-1).cyberduckprofile index 7d0c0750a89..0622bfe26d3 100644 --- a/profiles/OCI Object Storage (eu-stockholm-1).cyberduckprofile +++ b/profiles/OCI Object Storage (eu-stockholm-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-eu-stockholm-1 Description OCI Object Storage (eu-stockholm-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.eu-stockholm-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (eu-zurich-1).cyberduckprofile b/profiles/OCI Object Storage (eu-zurich-1).cyberduckprofile index 4f4d0ffa62b..d70dc8b641b 100644 --- a/profiles/OCI Object Storage (eu-zurich-1).cyberduckprofile +++ b/profiles/OCI Object Storage (eu-zurich-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-eu-zurich-1 Description OCI Object Storage (eu-zurich-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.eu-zurich-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (il-jerusalem-1).cyberduckprofile b/profiles/OCI Object Storage (il-jerusalem-1).cyberduckprofile index af3c83ea16a..ce990d7ebf6 100644 --- a/profiles/OCI Object Storage (il-jerusalem-1).cyberduckprofile +++ b/profiles/OCI Object Storage (il-jerusalem-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-il-jerusalem-1 Description OCI Object Storage (il-jerusalem-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.il-jerusalem-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (me-abudhabi-1).cyberduckprofile b/profiles/OCI Object Storage (me-abudhabi-1).cyberduckprofile index 1e3da732a83..530c443c5a0 100644 --- a/profiles/OCI Object Storage (me-abudhabi-1).cyberduckprofile +++ b/profiles/OCI Object Storage (me-abudhabi-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-me-abudhabi-1 Description OCI Object Storage (me-abudhabi-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.me-abudhabi-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (me-dubai-1).cyberduckprofile b/profiles/OCI Object Storage (me-dubai-1).cyberduckprofile index d5691830309..af60490bb73 100644 --- a/profiles/OCI Object Storage (me-dubai-1).cyberduckprofile +++ b/profiles/OCI Object Storage (me-dubai-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-me-dubai-1 Description OCI Object Storage (me-dubai-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.me-dubai-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (me-jeddah-1).cyberduckprofile b/profiles/OCI Object Storage (me-jeddah-1).cyberduckprofile index 4cb9c6f0854..77958f87845 100644 --- a/profiles/OCI Object Storage (me-jeddah-1).cyberduckprofile +++ b/profiles/OCI Object Storage (me-jeddah-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-me-jeddah-1 Description OCI Object Storage (me-jeddah-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.me-jeddah-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (sa-santiago-1).cyberduckprofile b/profiles/OCI Object Storage (sa-santiago-1).cyberduckprofile index b54a010283c..c4dd049cd54 100644 --- a/profiles/OCI Object Storage (sa-santiago-1).cyberduckprofile +++ b/profiles/OCI Object Storage (sa-santiago-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-sa-santiago-1 Description OCI Object Storage (sa-santiago-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.sa-santiago-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (sa-saopaulo-1).cyberduckprofile b/profiles/OCI Object Storage (sa-saopaulo-1).cyberduckprofile index d7c48ff6ae6..cd9c9481fe5 100644 --- a/profiles/OCI Object Storage (sa-saopaulo-1).cyberduckprofile +++ b/profiles/OCI Object Storage (sa-saopaulo-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-sa-saopaulo-1 Description OCI Object Storage (sa-saopaulo-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.sa-saopaulo-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (sa-vinhedo-1).cyberduckprofile b/profiles/OCI Object Storage (sa-vinhedo-1).cyberduckprofile index 6e605d15f41..2c081caddb8 100644 --- a/profiles/OCI Object Storage (sa-vinhedo-1).cyberduckprofile +++ b/profiles/OCI Object Storage (sa-vinhedo-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-sa-vinhedo-1 Description OCI Object Storage (sa-vinhedo-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.sa-vinhedo-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (uk-cardiff-1).cyberduckprofile b/profiles/OCI Object Storage (uk-cardiff-1).cyberduckprofile index 0db7bc6d8f0..bd53e165569 100644 --- a/profiles/OCI Object Storage (uk-cardiff-1).cyberduckprofile +++ b/profiles/OCI Object Storage (uk-cardiff-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-uk-cardiff-1 Description OCI Object Storage (uk-cardiff-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.uk-cardiff-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (uk-london-1).cyberduckprofile b/profiles/OCI Object Storage (uk-london-1).cyberduckprofile index 1b1b7d6ce21..1138603d9eb 100644 --- a/profiles/OCI Object Storage (uk-london-1).cyberduckprofile +++ b/profiles/OCI Object Storage (uk-london-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-uk-london-1 Description OCI Object Storage (uk-london-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.uk-london-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (us-ashburn-1).cyberduckprofile b/profiles/OCI Object Storage (us-ashburn-1).cyberduckprofile index 01c21bacdd0..bbf69d7a6e6 100644 --- a/profiles/OCI Object Storage (us-ashburn-1).cyberduckprofile +++ b/profiles/OCI Object Storage (us-ashburn-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-us-ashburn-1 Description OCI Object Storage (us-ashburn-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.us-ashburn-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (us-phoenix-1).cyberduckprofile b/profiles/OCI Object Storage (us-phoenix-1).cyberduckprofile index 1201184c489..1ff10921f2a 100644 --- a/profiles/OCI Object Storage (us-phoenix-1).cyberduckprofile +++ b/profiles/OCI Object Storage (us-phoenix-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-us-phoenix-1 Description OCI Object Storage (us-phoenix-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.us-phoenix-1.oraclecloud.com Hostname Configurable diff --git a/profiles/OCI Object Storage (us-sanjose-1).cyberduckprofile b/profiles/OCI Object Storage (us-sanjose-1).cyberduckprofile index 0877178cf6b..6e6ba039a93 100644 --- a/profiles/OCI Object Storage (us-sanjose-1).cyberduckprofile +++ b/profiles/OCI Object Storage (us-sanjose-1).cyberduckprofile @@ -8,7 +8,7 @@ oracle-us-sanjose-1 Description OCI Object Storage (us-sanjose-1) - Default Hostname + Hostname Placeholder <namespace>.compat.objectstorage.us-sanjose-1.oraclecloud.com Hostname Configurable