Philipp dormiens nunquam titillandus. (newlines)

syncany · Aug 11, 2014 · 07a2eef · 07a2eef
1 parent 9183604
commit 07a2eef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java b/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java
@@ -335,7 +335,6 @@ private void mergeRemoteFiles() throws IOException, StorageException {
 			return;
 		}
 
-
 		// Retrieve all database versions
 		Map<String, List<DatabaseRemoteFile>> allDatabaseFilesMap = retrieveAllRemoteDatabaseFiles();
 
@@ -351,7 +350,6 @@ private void mergeRemoteFiles() throws IOException, StorageException {
 		if (options.isForce() || numberOfDatabaseFiles <= options.getMaxDatabaseFiles()*allDatabaseFilesMap.keySet().size()) {
 			logger.log(Level.INFO, "- Merge remote files: Not necessary ({0} database files, max. {1})", new Object[] {
 					numberOfDatabaseFiles, options.getMaxDatabaseFiles()*allDatabaseFilesMap.keySet().size() });
-
 			return;
 		}
 
@@ -367,7 +365,6 @@ private void mergeRemoteFiles() throws IOException, StorageException {
 			// 1. Determine files to delete remotely
 			List<DatabaseRemoteFile> toDeleteDatabaseFiles = new ArrayList<DatabaseRemoteFile>(clientDatabaseFiles);
 
-
 			// 2. Write merge file
 			DatabaseRemoteFile lastRemoteMergeDatabaseFile = toDeleteDatabaseFiles.get(toDeleteDatabaseFiles.size() - 1);
 			File lastLocalMergeDatabaseFile = config.getCache().getDatabaseFile(lastRemoteMergeDatabaseFile.getName());

diff --git a/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java b/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java
@@ -258,15 +258,13 @@ private void runSync() throws Exception {
 				if (upOperationResult.getResultCode() == UpResultCode.OK_CHANGES_UPLOADED && upOperationResult.getChangeSet().hasChanges()) {
 					upCount.incrementAndGet();
 					notifyChanges = true;
-				}
-
+				}		
 
 				CleanupOperationResult cleanupOperationResult = new CleanupOperation(config, options.getCleanupOptions()).execute();
 
 				if (cleanupOperationResult.getResultCode() == CleanupResultCode.OK) {
 					notifyChanges = true;
 				}
-
 
 				// Fire change event if up and/or cleanup  
 				if (notifyChanges) {