Merge pull request #4 from synapticloop/iterate-merge

Iterate merge back into master

Author: synapticloop

.gitignore

@@ -15,7 +15,6 @@ gradle-app.setting
 ### Eclipse ###
 *.pydevproject
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp

build.gradle

@@ -12,7 +12,7 @@ group = 'synapticloop'
 archivesBaseName = 'backblaze-b2-java-api'
 description = """An api for backblaze b2 storage in java"""
 
-version = 'v1.1.4'
+version = 'v1.2.0'
 
 description = """backblaze-b2-java-api"""
 

src/main/java/synapticloop/b2/Action.java

@@ -1,5 +1,21 @@
 package synapticloop.b2;
 
+/*
+ * Copyright (c) 2016 synapticloop.
+ * 
+ * All rights reserved.
+ * 
+ * This code may contain contributions from other parties which, where 
+ * applicable, will be listed in the default build file for the project 
+ * ~and/or~ in a file named CONTRIBUTORS.txt in the root of the project.
+ * 
+ * This source code and any derived binaries are covered by the terms and 
+ * conditions of the Licence agreement ("the Licence").  You may not use this 
+ * source code or any derived binaries except in compliance with the Licence.  
+ * A copy of the Licence is available in the file named LICENSE.txt shipped with 
+ * this source code or binaries.
+ */
+
 /**
  * The action for an associated file, either 'hide' or 'upload', "upload" means 
  * a file that was uploaded to B2 Cloud Storage. "hide" means a file version 
@@ -11,17 +27,6 @@
  * @author synapticloop
  */
 public enum Action {
-	HIDE("hide"),
-	UPLOAD("upload");
-
-	private final String actionType;
-
-	Action(String actionType) {
-		this.actionType = actionType;
-	}
-
-	@Override
-	public String toString() {
-		return(actionType);
-	}
+	hide,
+	upload
 }