Make location optional

syncany · Apr 20, 2014 · 6490224 · 6490224
1 parent 1af0ddf
commit 6490224
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/org/syncany/connection/plugins/s3/S3Connection.java b/src/main/java/org/syncany/connection/plugins/s3/S3Connection.java
@@ -19,6 +19,7 @@
 
 import java.util.Map;
 
+import org.jets3t.service.model.S3Bucket;
 import org.jets3t.service.security.AWSCredentials;
 import org.jets3t.service.security.ProviderCredentials;
 import org.syncany.connection.plugins.Connection;
@@ -52,9 +53,14 @@ public PluginOptionSpecs getOptionSpecs() {
 			new PluginOptionSpec("accessKey", "Access Key", ValueType.STRING, true, false, null),
 			new PluginOptionSpec("secretKey", "Secret Key", ValueType.STRING, true, true, null),
 			new PluginOptionSpec("bucket", "Bucket Name", ValueType.STRING, true, false, null),
-			new PluginOptionSpec("location", "Location", ValueType.STRING, true, false, null)
+			new PluginOptionSpec("location", "Location", ValueType.STRING, false, false, S3Bucket.LOCATION_US_WEST)
 		);
 	}
+
+	@Override
+	public TransferManager createTransferManager() {
+		return new S3TransferManager(this);
+	}
 
 	public String getAccessKey() {
 		return accessKey;
@@ -88,11 +94,6 @@ public ProviderCredentials getCredentials() {
 		return credentials;
 	}
 
-	@Override
-	public TransferManager createTransferManager() {
-		return new S3TransferManager(this);
-	}
-
 	public String getLocation() {
 		return location;
 	}