Refactor

Author: host6

.gitignore

@@ -14,3 +14,4 @@ hs_err_pid*
 /.*
 /bin
 build
+/*.iml

build.gradle

@@ -1,14 +1,12 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 
-
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 group = 'com.projectkaiser.scm'
 version = '2.0-SNAPSHOT'
 
-
 repositories {
 	mavenCentral()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 10 11:04:58 GMT+03:00 2016
+#Sun Mar 26 13:53:29 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

src/main/java/com/projectkaiser/scm/vcs/api/VCSChangeType.java

@@ -12,5 +12,5 @@ public enum VCSChangeType {
 	MODIFY,
 
 	/** Delete an existing file from the project */
-	DELETE;
+	DELETE
 }

src/main/java/com/projectkaiser/scm/vcs/api/workingcopy/VCSLockedWorkingCopy.java

@@ -58,9 +58,7 @@ private void init() {
 				if (!lockFile.exists()) {
 					continue;
 				}
-				if (!tryLockFile(lockFile)) {
-					continue;
-				} else {
+				if (tryLockFile(lockFile)) {
 					folder = file;
 					state = VCSLockedWorkingCopyState.LOCKED;
 					return;

src/test/java/com/projectkaiser/scm/vcs/api/workingcopy/VCSLockedWorkingCopyTest.java

@@ -9,13 +9,12 @@
 import org.junit.Test;
 
 public class VCSLockedWorkingCopyTest extends VCSWCTestBase {
-	
-	private IVCSWorkspace w;
+
 	private IVCSRepositoryWorkspace r;
 
 	@Before
 	public void setUp() {
-		w = new VCSWorkspace(WORKSPACE_DIR);
+		IVCSWorkspace w = new VCSWorkspace(WORKSPACE_DIR);
 		r = w.getVCSRepositoryWorkspace(TEST_REPO_URL);
 	}