diff --git a/build.gradle b/build.gradle index de688004..9938639a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,9 +22,9 @@ project.ext { dependencies { compile project(':syncany-lib') - compile "net.java.dev.jets3t:jets3t:0.9.2" + compile "net.java.dev.jets3t:jets3t:0.9.4" - pluginjar("net.java.dev.jets3t:jets3t:0.9.2") { + pluginjar("net.java.dev.jets3t:jets3t:0.9.4") { exclude group: "org.bouncycastle" exclude group: "org.apache.httpcomponents" } diff --git a/core/.gitignore b/core/.gitignore index 7f491074..61f3179c 100644 --- a/core/.gitignore +++ b/core/.gitignore @@ -10,3 +10,6 @@ gradle/arch/syncany/pkg gradle/arch/syncany/src gradle/arch/syncany/syncany*.tar* *.orig +.recommenders +.idea/ +*.iml diff --git a/core/.travis.sh b/core/.travis.sh index 1468d41c..32bddde3 100755 --- a/core/.travis.sh +++ b/core/.travis.sh @@ -3,7 +3,7 @@ set -e # Run JUnit tests and generate reports -./gradlew testGlobal coberturaReport performCoverageCheck coveralls javadocAll +./gradlew testGlobal jacocoRootReport javadocAll # SonarQube disabled for now. Took >43min on Travis! diff --git a/core/.travis.yml b/core/.travis.yml index 196870db..6d937a6b 100644 --- a/core/.travis.yml +++ b/core/.travis.yml @@ -1,5 +1,7 @@ language: java -jdk: openjdk7 +jdk: openjdk8 +sudo: required +dist: trusty env: global: @@ -27,6 +29,8 @@ notifications: irc: "chat.freenode.net#syncany" before_install: + # Enable i386 for wine + - sudo dpkg --add-architecture i386 # Update APT (necessary!) - sudo apt-get update @@ -44,8 +48,7 @@ before_install: # Inno Setup (for Windows executable/installer) # Note: If this code is changed, also update syncany-plugin-gui/.travis.yml - - sudo add-apt-repository --yes ppa:arx/release - - sudo apt-get update -d + - sudo apt-get install -y -q innoextract wine python-software-properties - wine --version - innoextract --version diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 4150ba85..e7698c7b 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -1,6 +1,23 @@ Change Log ========== +### Syncany 0.4.8-alpha (Date: TBA) +- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**) +- Bugfixes and other things: + + Fixed bug with `sy restore` #534/#535 + + Fix .syignore recursive behavior #555/#544 + +### Syncany 0.4.7-alpha (Date: 7 Nov 2015) +- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**) +- Bugfixes and other things: + + Refactoring and simplification of UpOperation + + Refactoring DownOperation (better memory management) + + Refactoring of error handling (don't throw 'Exception') + + Fix GUI crashes in 'Add folder' wizard #497 + + Fix OSX daemon start/stop to new style #281/#530 + + Fix Windows spaces in path issue #522/#529 + + Fix not resuming transactions if transaction files are corrupt #520 + ### Syncany 0.4.6-alpha (Date: 11 July 2015) - Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**) - Features and significant changes: diff --git a/core/README.md b/core/README.md index cb0a2fe1..7fb504e5 100644 --- a/core/README.md +++ b/core/README.md @@ -1,6 +1,6 @@ Syncany ======= -[![Build Status](https://travis-ci.org/syncany/syncany.svg?branch=master)](https://travis-ci.org/syncany/syncany) [![Coverage Status](https://coveralls.io/repos/syncany/syncany/badge.svg?branch=develop)](https://reports.syncany.org/coverage/) [![Test Status](https://api.syncany.org/v3/badges/tests)](https://reports.syncany.org/tests/) [![Lines of Code](https://api.syncany.org/v3/badges/lines)](https://syncany.org/reports/cloc.xml) [![Contribute and get some Bitcoins for every commit](https://api.syncany.org/v3/badges/tips)](http://tip4commit.com/github/syncany/syncany) [![User guide](https://readthedocs.org/projects/syncany/badge/?version=latest)](https://readthedocs.org/projects/syncany/?badge=latest) [![JavaDoc](https://api.syncany.org/v3/badges/javadoc)](https://docs.syncany.org/javadoc/) [![Issues needing your help](https://api.syncany.org/v3/badges/waffle)](http://waffle.io/syncany/syncany) [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/290043/Syncany) +[![Build Status](https://travis-ci.org/syncany/syncany.svg?branch=master)](https://travis-ci.org/syncany/syncany) [![Coverage Status](https://api.syncany.org/v3/badges/coverage)](https://reports.syncany.org/coverage/) [![Test Status](https://api.syncany.org/v3/badges/tests)](https://reports.syncany.org/tests/) [![Lines of Code](https://api.syncany.org/v3/badges/lines)](https://syncany.org/reports/cloc.xml) [![Contribute and get some Bitcoins for every commit](https://api.syncany.org/v3/badges/tips)](http://tip4commit.com/github/syncany/syncany) [![User guide](https://readthedocs.org/projects/syncany/badge/?version=latest)](https://readthedocs.org/projects/syncany/?badge=latest) [![JavaDoc](https://api.syncany.org/v3/badges/javadoc)](https://docs.syncany.org/javadoc/) [![Issues needing your help](https://api.syncany.org/v3/badges/waffle)](http://waffle.io/syncany/syncany) [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/290043/Syncany) diff --git a/core/build.gradle b/core/build.gradle index 0b792199..a21ce60e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -7,7 +7,7 @@ apply from: 'gradle/gradle/helpers.gradle' // Global Settings ///////////////////////////////////////////////////////////// project.ext { - applicationVersion = "0.4.7-alpha" + applicationVersion = "0.4.8-alpha" applicationVersionDebian = "1"; applicationRelease = isApplicationRelease() @@ -49,4 +49,7 @@ dependencies { testCompile project(path: ":syncany-lib", configuration: "tests") testCompile project(path: ":syncany-cli", configuration: "tests") testCompile project(path: ":syncany-util", configuration: "tests") + + testRuntime "org.slf4j:slf4j-log4j12:1.7.5" + testRuntime "log4j:log4j:1.2.7" } diff --git a/core/gradle/arch/syncany-git/PKGBUILD b/core/gradle/arch/syncany-git/PKGBUILD index 22be3d6b..7df0888e 100644 --- a/core/gradle/arch/syncany-git/PKGBUILD +++ b/core/gradle/arch/syncany-git/PKGBUILD @@ -1,13 +1,15 @@ # Maintainer: Armin Fisslthaler pkgname=syncany-git -pkgver=0.1.8.alpha.g95a5172 +pkgver=0.4.8.alpha.g194955d pkgrel=1 pkgdesc="Cloud storage and filesharing application with a focus on security and abstraction of storage." arch=(any) url=https://www.syncany.org/ license=(GPL3) -depends=('java-runtime>=7', 'bash-completion') +depends=('java-environment>=7', 'sh') +optdepends=('bash-completion: auto completion in bash') makedepends=(git) +conflicts=('syncany') source=("${pkgname}"::'git+http://github.com/syncany/syncany') md5sums=('SKIP') @@ -23,7 +25,9 @@ build(){ package(){ install -Dm755 "$srcdir/$pkgname/gradle/arch/syncany/syncany" "${pkgdir}/usr/bin/syncany" - install -Dm755 "$srcdir/$pkgname/gradle/bash/syncany.bash-completion" "${pkgdir}/etc/bash_completion.d/" + install -Dm755 "$srcdir/$pkgname/gradle/bash/syncany.bash-completion" "${pkgdir}/etc/bash_completion.d/syncany.bash-completion" + install -Dm755 "$srcdir/$pkgname/gradle/systemd/syncany.service" "${pkgdir}/usr/lib/systemd/user/syncany.service" + install -Dm755 "$srcdir/$pkgname/gradle/systemd/syncany-gui.service" "${pkgdir}/usr/lib/systemd/user/syncany-gui.service" cd "$srcdir/$pkgname/build/install/syncany/lib" for jar in *; do diff --git a/core/gradle/arch/syncany/PKGBUILD b/core/gradle/arch/syncany/PKGBUILD index f8ae7449..1e142399 100644 --- a/core/gradle/arch/syncany/PKGBUILD +++ b/core/gradle/arch/syncany/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Pim Otte pkgname=syncany -pkgver=0.4.5_alpha -_realver=0.4.5-alpha -pkgrel=1 +pkgver=0.4.7_alpha +_realver=0.4.7-alpha +pkgrel=2 pkgdesc="Cloud storage and filesharing application with a focus on security and abstraction of storage." arch=(any) url="http://www.syncany.org/" license=('GPL3') -depends=('java-runtime>=7' 'bash-completion') +depends=('java-environment>=7', 'sh') +optdepends=('bash-completion: auto completion in bash') source=("http://syncany.org/dist/$pkgname-${_realver}.tar.gz" ) -sha256sums=('7e8fbad0d9bf90369ad21fd1b3d54c7025738f2da9b1a364273f16cb76d59069') +sha256sums=('14d822b34e0a6363fa580104c7fc0d58571b5adb766aff412b12e9f340ce3477') package() { install -Dm644 "$srcdir/$pkgname-${_realver}/bash/syncany.bash-completion" "${pkgdir}/etc/bash_completion.d/syncany" diff --git a/core/gradle/daemon/syncanyd.bat.skel b/core/gradle/daemon/syncanyd.bat.skel index f972758f..a3ef48d4 100644 --- a/core/gradle/daemon/syncanyd.bat.skel +++ b/core/gradle/daemon/syncanyd.bat.skel @@ -1,10 +1,10 @@ rem Embedded Daemon script begins ################################SYNCANY_INCL_3# set APP_NAME=syncanyd -set APP_USER_DIR=%AppData%\Syncany -set APP_DAEMON_CONTROL=%APP_USER_DIR%\daemon.ctrl -set APP_DAEMON_PIDFILE=%APP_USER_DIR%\daemon.pid -set APP_DAEMON_PIDFILE_TMP=%APP_USER_DIR%\daemon.pid.tmp +set APP_USER_DIR="%AppData%\Syncany" +set APP_DAEMON_CONTROL="%APP_USER_DIR%\daemon.ctrl" +set APP_DAEMON_PIDFILE="%APP_USER_DIR%\daemon.pid" +set APP_DAEMON_PIDFILE_TMP="%APP_USER_DIR%\daemon.pid.tmp" if not exist "%APP_USER_DIR%" mkdir "%APP_USER_DIR%" diff --git a/core/gradle/eclipse/org.eclipse.jdt.core.prefs b/core/gradle/eclipse/org.eclipse.jdt.core.prefs index de9bf110..ef0fbbb1 100644 --- a/core/gradle/eclipse/org.eclipse.jdt.core.prefs +++ b/core/gradle/eclipse/org.eclipse.jdt.core.prefs @@ -1,14 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/core/gradle/gradle/application.distribution.gradle b/core/gradle/gradle/application.distribution.gradle index 3d47eeb3..a6316b9f 100644 --- a/core/gradle/gradle/application.distribution.gradle +++ b/core/gradle/gradle/application.distribution.gradle @@ -22,7 +22,7 @@ startScripts { // - Read max memory (-Xmx) from userconfig.xml String winMaxMemoryCommands = "@rem Read max memory from userconfig.xml #SYNCANY_INCL_1#\r\n" - winMaxMemoryCommands += "set APP_USERCONFIG_FILE=%AppData%\\\\Syncany\\\\userconfig.xml\r\n"; + winMaxMemoryCommands += "set APP_USERCONFIG_FILE=\"%AppData%\\\\Syncany\\\\userconfig.xml\"\r\n"; winMaxMemoryCommands += "\r\n"; winMaxMemoryCommands += "if exist \"%APP_USERCONFIG_FILE%\" (\r\n"; winMaxMemoryCommands += " if \"%OS%\"==\"Windows_NT\" setlocal ENABLEDELAYEDEXPANSION\r\n"; @@ -42,7 +42,7 @@ startScripts { // - Post Java process commands: Delayed plugin JAR file deletion (Windows only) String winPurgeFileDeletionCommands = "@rem Delete plugin JARs #SYNCANY_INCL_2#\r\n" - winPurgeFileDeletionCommands += "SET PURGEFILE=%AppData%\\\\Syncany\\\\purgefile\r\n"; + winPurgeFileDeletionCommands += "SET PURGEFILE=\"%AppData%\\\\Syncany\\\\purgefile\"\r\n"; winPurgeFileDeletionCommands += "if exist %PURGEFILE% (\r\n"; winPurgeFileDeletionCommands += " @for /f %%b in (%PURGEFILE%) do del /q \"%%b\" 2>NUL\r\n"; winPurgeFileDeletionCommands += " del /q %PURGEFILE% 2>NUL\r\n"; @@ -52,7 +52,7 @@ startScripts { // - Post Java process commands: Delayed plugin JAR file install (Windows only) String winUpdateFileCommands = "@rem Reinstall plugins after update removal #SYNCANY_INCL_4#\r\n" - winUpdateFileCommands += "SET UPDATEFILE=%AppData%\\\\Syncany\\\\updatefile\r\n"; + winUpdateFileCommands += "SET UPDATEFILE=\"%AppData%\\\\Syncany\\\\updatefile\"\r\n"; winUpdateFileCommands += "if exist %UPDATEFILE% (\r\n"; winUpdateFileCommands += " @for /f %%b in (%UPDATEFILE%) do (\r\n NUL)\r\n"; winUpdateFileCommands += " del /q %UPDATEFILE% 2>NUL\r\n"; @@ -206,6 +206,12 @@ applicationDistribution.from("${rootProject.projectDir}/") { include "syncany.bash-completion" into "bash" } + + // Copy systemd file to distribution + from("${rootProject.projectDir}/gradle/systemd") { + include "syncany*" + into "systemd" + } } task manpages(dependsOn: compileJava) { diff --git a/core/gradle/gradle/application.java.gradle b/core/gradle/gradle/application.java.gradle index ca5e011a..0abd2721 100644 --- a/core/gradle/gradle/application.java.gradle +++ b/core/gradle/gradle/application.java.gradle @@ -5,8 +5,8 @@ subprojects { group = 'org.syncany' - sourceCompatibility = 1.7 - targetCompatibility = 1.7 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/core/gradle/gradle/development.eclipse.gradle b/core/gradle/gradle/development.eclipse.gradle index 04252e8c..dbd9a97e 100644 --- a/core/gradle/gradle/development.eclipse.gradle +++ b/core/gradle/gradle/development.eclipse.gradle @@ -9,8 +9,8 @@ subprojects { } jdt { - sourceCompatibility = 1.7 - targetCompatibility = 1.7 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } } diff --git a/core/gradle/gradle/reports.coverage.gradle b/core/gradle/gradle/reports.coverage.gradle index f685eb30..b7a06684 100644 --- a/core/gradle/gradle/reports.coverage.gradle +++ b/core/gradle/gradle/reports.coverage.gradle @@ -1,42 +1,57 @@ -// Coverage (Cobertura) //////////////////////////////////////////////////////// -// Run as: gradle testGlobal coberturaReport performCoverageCheck +// Coverage (JaCoCo) //////////////////////////////////////////////////////// +// Run as: gradle testGlobal jacocoRootReport buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'net.saliman:gradle-cobertura-plugin:2.2.2' - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1' - } + repositories { + mavenCentral() + } } -// Reference by FQCN instead of name: http://forums.gradle.org/gradle/topics/plugin_not_found_when_i_using_a_gradle_from_other_gradle_file -apply plugin: net.saliman.gradle.plugin.cobertura.CoberturaPlugin -apply plugin: org.kt3k.gradle.plugin.CoverallsPlugin +apply plugin: "jacoco" subprojects { - apply plugin: net.saliman.gradle.plugin.cobertura.CoberturaPlugin + apply plugin: "jacoco" + + jacoco { + toolVersion = "0.7.1.201405082137" + } + test { + jacoco { + append = true + classDumpFile = file("${rootProject.buildDir}/jacoco/classpathdumps") + destinationFile = file("${rootProject.buildDir}/jacoco/tests.exec") + } + } + + + jacocoTestReport { + additionalSourceDirs = files(sourceSets.main.allSource.srcDirs) + sourceDirectories = files(sourceSets.main.allSource.srcDirs) + classDirectories = files(sourceSets.main.output) + + reports { + html.enabled = true + xml.enabled = true + csv.enabled = false + } + } } -cobertura { - coverageFormats = ['html', 'xml'] - coverageReportDatafile = file("build/cobertura/cobertura.ser") - coverageReportDir = file("build/reports/coverage") - - coverageDirs = [] - coverageSourceDirs = [] - coverageMergeDatafiles = [] - - rootProject.subprojects.each { - coverageFormats = ['html', 'xml'] - coverageDirs << file("${it.buildDir}/classes/main") - coverageSourceDirs << file("${it.projectDir}/src/main/java") - coverageMergeDatafiles << file("${it.buildDir}/cobertura/cobertura.ser") - } +task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { + dependsOn = subprojects.test + additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs) + sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs) + classDirectories = files(subprojects.sourceSets.main.output) + executionData = files(subprojects.jacocoTestReport.executionData) + + reports { + html.enabled = true + html.destination "${rootProject.buildDir}/reports/coverage" + + xml.enabled = true + xml.destination "${rootProject.buildDir}/reports/coverage/coverage.xml" + + csv.enabled = false + } } -coveralls { - coberturaReportPath = "${buildDir}/reports/coverage/coverage.xml" -} \ No newline at end of file diff --git a/core/gradle/innosetup/innoinstall.sh b/core/gradle/innosetup/innoinstall.sh index 44f4a8de..90a960fa 100755 --- a/core/gradle/innosetup/innoinstall.sh +++ b/core/gradle/innosetup/innoinstall.sh @@ -4,11 +4,8 @@ rm -rf /tmp/inno mkdir /tmp/inno cd /tmp/inno -wget -O is.exe http://www.jrsoftware.org/download.php/is.exe +wget -O is.exe http://files.jrsoftware.org/is/5/isetup-5.5.5.exe innoextract is.exe mkdir -p ~/".wine/drive_c/inno" cp -a app/* ~/".wine/drive_c/inno" -#mkdir ~/".wine/drive_c/Program Files (x86)/Inno Setup 5" -#cp -a app/* ~/".wine/drive_c/Program Files (x86)/Inno Setup 5" - diff --git a/core/gradle/osx/syncany.rb b/core/gradle/osx/syncany.rb index 15a8fb46..e5b29529 100644 --- a/core/gradle/osx/syncany.rb +++ b/core/gradle/osx/syncany.rb @@ -2,9 +2,9 @@ class Syncany < Formula homepage "https://www.syncany.org" - url "https://codeload.github.com/syncany/syncany/tar.gz/v0.4.5-alpha" - sha256 "957537a7177a5234e794d871043e67ac8e06ff3ff1ee059e599dfd477c5bb8e5" - version "0.4.5-alpha" + url "https://codeload.github.com/syncany/syncany/tar.gz/v0.4.6-alpha" + sha256 "1dfd92e7618297eae6ee0d8acb7103f55c8d18500da409d032a5941147fbcd85" + version "0.4.6-alpha" head "https://github.com/syncany/syncany.git", :branch => "develop" depends_on :java => "1.7+" @@ -26,7 +26,7 @@ def install bin.install_symlink Dir["#{libexec}/bin/sy"] end - plist_options :manual => "sy --daemon" + plist_options :manual => "sy daemon start" def plist; <<-EOS.undent @@ -38,7 +38,8 @@ def plist; <<-EOS.undent ProgramArguments #{prefix}/bin/sy - --daemon + daemon + start ProcessType Background diff --git a/core/gradle/systemd/syncany-gui.service b/core/gradle/systemd/syncany-gui.service new file mode 100644 index 00000000..366c88bb --- /dev/null +++ b/core/gradle/systemd/syncany-gui.service @@ -0,0 +1,8 @@ +[Unit] +Description=Syncany GUI + +[Service] +ExecStart=/usr/bin/syncany gui + +[Install] +WantedBy=default.target diff --git a/core/gradle/systemd/syncany.service b/core/gradle/systemd/syncany.service new file mode 100644 index 00000000..4411c87f --- /dev/null +++ b/core/gradle/systemd/syncany.service @@ -0,0 +1,12 @@ +[Unit] +Description=Syncany Daemon + +[Service] +Type=forking +PIDFile=%h/.config/syncany/daemon.pid +ExecStart=/usr/bin/syncany daemon start +ExecReload=/usr/bin/syncany daemon reload +ExecStop=/usr/bin/syncany daemon stop + +[Install] +WantedBy=default.target diff --git a/core/syncany-cli/src/main/java/org/syncany/Syncany.java b/core/syncany-cli/src/main/java/org/syncany/Syncany.java index 122407da..3addc35f 100644 --- a/core/syncany-cli/src/main/java/org/syncany/Syncany.java +++ b/core/syncany-cli/src/main/java/org/syncany/Syncany.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/AbstractInitCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/AbstractInitCommand.java index 3d5d86b1..a4e4138b 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/AbstractInitCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/AbstractInitCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java index 941a4db4..9a43ab54 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/Command.java b/core/syncany-cli/src/main/java/org/syncany/cli/Command.java index 143ee20d..74a884f5 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/Command.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/Command.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/CommandFactory.java b/core/syncany-cli/src/main/java/org/syncany/cli/CommandFactory.java index df6292fd..e0a664d4 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/CommandFactory.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/CommandFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java b/core/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java index b4a3bacc..220efa74 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/CommandScope.java b/core/syncany-cli/src/main/java/org/syncany/cli/CommandScope.java index 81e65186..31c97dc7 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/CommandScope.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/CommandScope.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java index 16f4f71e..08d70a52 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java index d573ec96..be20da7f 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java index bf8bd06e..9f5a5115 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java index 10ae6873..793ff5d9 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java index 2d253f4e..89c6722f 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java index b1c693e0..e212f375 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/LogCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/LogCommand.java index c7457485..e5e6214a 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/LogCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/LogCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java index 04bf12fb..ffdb2426 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java index 14f60a36..5866537e 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java index 1972c94a..f4387169 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -225,7 +225,7 @@ private void printResultList(PluginOperationResult operationResult) { if (thirdPartyCount > 0) { String pluginPlugins = (thirdPartyCount == 1) ? "plugin" : "plugins"; - out.printf("\nThird party plugins:\nPlease note that the Syncany Team does not take review or maintain the third-party %s\nlisted above. Please report issues to the corresponding plugin site.\n", pluginPlugins); + out.printf("\nThird party plugins:\nPlease note that the Syncany Team does not review or maintain the third-party %s\nlisted above. Please report issues to the corresponding plugin site.\n", pluginPlugins); } } else { diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java index ab2d4086..105f8d7f 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java index a76e2cb1..b8b27bc0 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java index 84df8967..6ff788d7 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/UpdateCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/UpdateCommand.java index 33b2e97c..1597621d 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/UpdateCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/UpdateCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java b/core/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java index 1a841e1d..66923290 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/util/CarriageReturnPrinter.java b/core/syncany-cli/src/main/java/org/syncany/cli/util/CarriageReturnPrinter.java index d42d0245..77802792 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/util/CarriageReturnPrinter.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/util/CarriageReturnPrinter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/util/CliTableUtil.java b/core/syncany-cli/src/main/java/org/syncany/cli/util/CliTableUtil.java index fe1ee0c4..b6dd1ab6 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/util/CliTableUtil.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/util/CliTableUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/util/CommandLineUtil.java b/core/syncany-cli/src/main/java/org/syncany/cli/util/CommandLineUtil.java index 44eded70..49fabc79 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/util/CommandLineUtil.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/util/CommandLineUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/main/java/org/syncany/cli/util/InitConsole.java b/core/syncany-cli/src/main/java/org/syncany/cli/util/InitConsole.java index a1bd9097..dadb0e69 100644 --- a/core/syncany-cli/src/main/java/org/syncany/cli/util/InitConsole.java +++ b/core/syncany-cli/src/main/java/org/syncany/cli/util/InitConsole.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/CliTestSuite.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/CliTestSuite.java index f5a23a0d..a68bad71 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/CliTestSuite.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/CliTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CliPluginsTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CliPluginsTest.java index 55e59813..179e7386 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CliPluginsTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CliPluginsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CommandLineInterfaceTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CommandLineInterfaceTest.java index d1559889..569431d8 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CommandLineInterfaceTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/CommandLineInterfaceTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/ConnectCommandWithEncryptionTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/ConnectCommandWithEncryptionTest.java index 03561c1f..7d6d4979 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/ConnectCommandWithEncryptionTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/ConnectCommandWithEncryptionTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/DownCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/DownCommandTest.java index ef658db5..90c7e16c 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/DownCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/DownCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/GenlinkCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/GenlinkCommandTest.java index 681d523e..55f7f5a7 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/GenlinkCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/GenlinkCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/InitAndConnectCommandNoEncryptionTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/InitAndConnectCommandNoEncryptionTest.java index a6939b91..89c66329 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/InitAndConnectCommandNoEncryptionTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/InitAndConnectCommandNoEncryptionTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsCommandTest.java index d0cd38b9..9a49b18e 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsRemoteCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsRemoteCommandTest.java index 6192926b..3f7caace 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsRemoteCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/LsRemoteCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/PluginCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/PluginCommandTest.java index 78bff506..ebf224e0 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/PluginCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/PluginCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/RestoreCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/RestoreCommandTest.java index 992b8b78..7c5ba332 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/RestoreCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/RestoreCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/StatusCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/StatusCommandTest.java index 578515b5..7f603018 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/StatusCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/StatusCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpCommandTest.java index 90002b40..8e3f738b 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpdateCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpdateCommandTest.java index edd37221..2f806d83 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpdateCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/UpdateCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/WatchCommandTest.java b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/WatchCommandTest.java index 0924978c..a71f752d 100644 --- a/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/WatchCommandTest.java +++ b/core/syncany-cli/src/test/integration/java/org/syncany/tests/integration/cli/WatchCommandTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/SplitOutputStream.java b/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/SplitOutputStream.java index 3dbacc9f..b5a75a40 100644 --- a/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/SplitOutputStream.java +++ b/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/SplitOutputStream.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/TestCliUtil.java b/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/TestCliUtil.java index ba80ac72..b7dfa860 100644 --- a/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/TestCliUtil.java +++ b/core/syncany-cli/src/test/unit/java/org/syncany/tests/unit/util/TestCliUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/Client.java b/core/syncany-lib/src/main/java/org/syncany/Client.java index 109f77c1..3ec594af 100644 --- a/core/syncany-lib/src/main/java/org/syncany/Client.java +++ b/core/syncany-lib/src/main/java/org/syncany/Client.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/Adler32Fingerprinter.java b/core/syncany-lib/src/main/java/org/syncany/chunk/Adler32Fingerprinter.java index 870c742e..3cd0d614 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/Adler32Fingerprinter.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/Adler32Fingerprinter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/Chunk.java b/core/syncany-lib/src/main/java/org/syncany/chunk/Chunk.java index 86187006..0d39f4ce 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/Chunk.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/Chunk.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/Chunker.java b/core/syncany-lib/src/main/java/org/syncany/chunk/Chunker.java index 39e09789..a18115b4 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/Chunker.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/Chunker.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/CipherTransformer.java b/core/syncany-lib/src/main/java/org/syncany/chunk/CipherTransformer.java index c3af4d64..092b01fb 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/CipherTransformer.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/CipherTransformer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/Deduper.java b/core/syncany-lib/src/main/java/org/syncany/chunk/Deduper.java index 27db3865..03f86982 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/Deduper.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/Deduper.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/DeduperListener.java b/core/syncany-lib/src/main/java/org/syncany/chunk/DeduperListener.java index f5814b7a..2284d450 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/DeduperListener.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/DeduperListener.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/Fingerprinter.java b/core/syncany-lib/src/main/java/org/syncany/chunk/Fingerprinter.java index 530dfd46..a784a7af 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/Fingerprinter.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/Fingerprinter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/FixedChunker.java b/core/syncany-lib/src/main/java/org/syncany/chunk/FixedChunker.java index 6fc741c5..80757d1f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/FixedChunker.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/FixedChunker.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/GzipTransformer.java b/core/syncany-lib/src/main/java/org/syncany/chunk/GzipTransformer.java index 3a53852e..78c47221 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/GzipTransformer.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/GzipTransformer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunk.java b/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunk.java index a99a29da..c8929f81 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunk.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunk.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunker.java b/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunker.java index 5b87ee1d..d810e81b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunker.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/MultiChunker.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/NoTransformer.java b/core/syncany-lib/src/main/java/org/syncany/chunk/NoTransformer.java index 249292cc..6857803f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/NoTransformer.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/NoTransformer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/Transformer.java b/core/syncany-lib/src/main/java/org/syncany/chunk/Transformer.java index e578a27a..2721f6ba 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/Transformer.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/Transformer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/TttdChunker.java b/core/syncany-lib/src/main/java/org/syncany/chunk/TttdChunker.java index a139e0e5..eb63ac18 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/TttdChunker.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/TttdChunker.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunk.java b/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunk.java index 6a4e8be3..1e9b5c2e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunk.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunk.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunker.java b/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunker.java index c235e9c6..40ba1e18 100644 --- a/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunker.java +++ b/core/syncany-lib/src/main/java/org/syncany/chunk/ZipMultiChunker.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/Cache.java b/core/syncany-lib/src/main/java/org/syncany/config/Cache.java index 2dfdd0be..0d0cc4a0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/Cache.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/Cache.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/Config.java b/core/syncany-lib/src/main/java/org/syncany/config/Config.java index 7690eea7..794fe4dc 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/Config.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/Config.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/ConfigException.java b/core/syncany-lib/src/main/java/org/syncany/config/ConfigException.java index 9fa28d8f..836b316d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/ConfigException.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/ConfigException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/ConfigHelper.java b/core/syncany-lib/src/main/java/org/syncany/config/ConfigHelper.java index 1cbc0eef..b4f26c79 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/ConfigHelper.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/ConfigHelper.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/DaemonConfigHelper.java b/core/syncany-lib/src/main/java/org/syncany/config/DaemonConfigHelper.java index ead78736..5262597d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/DaemonConfigHelper.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/DaemonConfigHelper.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/IgnoredFiles.java b/core/syncany-lib/src/main/java/org/syncany/config/IgnoredFiles.java index fbc84582..0aa859a9 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/IgnoredFiles.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/IgnoredFiles.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ */ public class IgnoredFiles { private static final Logger logger = Logger.getLogger(ConfigHelper.class.getSimpleName()); - + private Set ignorePatterns; private Set ignorePaths; private File ignoreFile; @@ -50,7 +50,7 @@ public IgnoredFiles(File ignoreFile) { * Method to check whether a file should be ignored. * Should only be called at indexing time. */ - public boolean isFileIgnored(String filePath) { + public boolean isFileIgnored(String filePath, String fileName) { // Check all exact paths for (String path : ignorePaths) { if (path.equals(filePath)) { @@ -58,6 +58,13 @@ public boolean isFileIgnored(String filePath) { } } + // Check all recursive + for (String path : ignorePaths) { + if (path.equals(fileName)) { + return true; + } + } + // Check all regular expressions for (String pattern : ignorePatterns) { if (filePath.matches(pattern)) { @@ -77,10 +84,10 @@ public void loadPatterns() { String ignorePatternLine = scanner.nextLine().trim(); if (!ignorePatternLine.isEmpty()) { - parseIgnoreFileLine(ignorePatternLine); + parseIgnoreFileLine(ignorePatternLine); } } - + scanner.close(); } catch (FileNotFoundException e) { diff --git a/core/syncany-lib/src/main/java/org/syncany/config/InternalEventBus.java b/core/syncany-lib/src/main/java/org/syncany/config/InternalEventBus.java index 2cf0b17c..ba181be7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/InternalEventBus.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/InternalEventBus.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/LocalEventBus.java b/core/syncany-lib/src/main/java/org/syncany/config/LocalEventBus.java index 254e8a32..b36a104b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/LocalEventBus.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/LocalEventBus.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/LogFormatter.java b/core/syncany-lib/src/main/java/org/syncany/config/LogFormatter.java index 7c75d422..7ea681ab 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/LogFormatter.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/LogFormatter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/Logging.java b/core/syncany-lib/src/main/java/org/syncany/config/Logging.java index 0b9e4d65..46ee9a8a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/Logging.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/Logging.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/UserConfig.java b/core/syncany-lib/src/main/java/org/syncany/config/UserConfig.java index e092c4d5..d23b4bae 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/UserConfig.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/UserConfig.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/ConfigTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/ConfigTO.java index 1fec4fbf..780e25e1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/ConfigTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/ConfigTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/DaemonConfigTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/DaemonConfigTO.java index ca389f0b..e6dcf24b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/DaemonConfigTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/DaemonConfigTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/DefaultRepoTOFactory.java b/core/syncany-lib/src/main/java/org/syncany/config/to/DefaultRepoTOFactory.java index 7bd16a1c..b7837c69 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/DefaultRepoTOFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/DefaultRepoTOFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/FolderTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/FolderTO.java index 3078bfe9..11956d78 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/FolderTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/FolderTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/MasterTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/MasterTO.java index 7ab3f6f2..f996e2db 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/MasterTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/MasterTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/PortTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/PortTO.java index efa75940..a51fd041 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/PortTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/PortTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTO.java index 69a6c153..c27a12a0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTOFactory.java b/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTOFactory.java index 1ed82c36..b6b8997e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTOFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/RepoTOFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/TypedPropertyListTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/TypedPropertyListTO.java index df3296fb..a57dfb49 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/TypedPropertyListTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/TypedPropertyListTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/UserConfigTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/UserConfigTO.java index dd4a5502..e8176e0b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/UserConfigTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/UserConfigTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/UserTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/UserTO.java index eeb3a3ac..5d6afb6a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/UserTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/UserTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/config/to/WebServerTO.java b/core/syncany-lib/src/main/java/org/syncany/config/to/WebServerTO.java index 91edc14e..0d221646 100644 --- a/core/syncany-lib/src/main/java/org/syncany/config/to/WebServerTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/config/to/WebServerTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherException.java b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherException.java index 8b885a35..f1281678 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherException.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherParams.java b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherParams.java index e9fe1fa3..72140d9c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherParams.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherParams.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSession.java b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSession.java index 32a31c06..9246ead8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSession.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSession.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpec.java index a80429f4..84c83940 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpecs.java b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpecs.java index 1571f160..c8cbc4c8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpecs.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherSpecs.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherUtil.java b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherUtil.java index 5eca6cdc..6b892391 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/CipherUtil.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/CipherUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherInputStream.java b/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherInputStream.java index fc8fd9f4..260038fa 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherInputStream.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherInputStream.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherOutputStream.java b/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherOutputStream.java index 8627d5b1..a70f72cb 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherOutputStream.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/MultiCipherOutputStream.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKey.java b/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKey.java index 38ba3c91..290c3e4e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKey.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKey.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKeyConverter.java b/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKeyConverter.java index 5e4e5786..2db712b1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKeyConverter.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/SaltedSecretKeyConverter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm128CipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm128CipherSpec.java index cc869022..f923b637 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm128CipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm128CipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm256CipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm256CipherSpec.java index d7cb853a..a5173a1e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm256CipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcm256CipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcmCipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcmCipherSpec.java index 7ff4c676..a80ad90e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcmCipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/AesGcmCipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/HmacSha256CipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/HmacSha256CipherSpec.java index 7d2fbade..e5918e59 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/HmacSha256CipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/HmacSha256CipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm128CipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm128CipherSpec.java index 362b597b..d977ea70 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm128CipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm128CipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm256CipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm256CipherSpec.java index b77172ab..348c0f46 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm256CipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcm256CipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcmCipherSpec.java b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcmCipherSpec.java index ab2f1031..80bc0550 100644 --- a/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcmCipherSpec.java +++ b/core/syncany-lib/src/main/java/org/syncany/crypto/specs/TwofishGcmCipherSpec.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/ChunkEntry.java b/core/syncany-lib/src/main/java/org/syncany/database/ChunkEntry.java index d87ba4b5..6c57fab1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/ChunkEntry.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/ChunkEntry.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/DatabaseConnectionFactory.java b/core/syncany-lib/src/main/java/org/syncany/database/DatabaseConnectionFactory.java index c9bd7c64..6dd63bab 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/DatabaseConnectionFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/DatabaseConnectionFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersion.java b/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersion.java index 86140efa..e847a6ce 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersion.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersion.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersionHeader.java b/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersionHeader.java index e88e1f37..1381306d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersionHeader.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/DatabaseVersionHeader.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/FileContent.java b/core/syncany-lib/src/main/java/org/syncany/database/FileContent.java index 7e6733f3..dca7e534 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/FileContent.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/FileContent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/FileVersion.java b/core/syncany-lib/src/main/java/org/syncany/database/FileVersion.java index 4046774c..06ea3586 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/FileVersion.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/FileVersion.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/FileVersionComparator.java b/core/syncany-lib/src/main/java/org/syncany/database/FileVersionComparator.java index 85c84c49..9bb7f8ff 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/FileVersionComparator.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/FileVersionComparator.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/MemoryDatabase.java b/core/syncany-lib/src/main/java/org/syncany/database/MemoryDatabase.java index 650f436a..f421ad31 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/MemoryDatabase.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/MemoryDatabase.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/MultiChunkEntry.java b/core/syncany-lib/src/main/java/org/syncany/database/MultiChunkEntry.java index a94efc4a..2ee33681 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/MultiChunkEntry.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/MultiChunkEntry.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/ObjectId.java b/core/syncany-lib/src/main/java/org/syncany/database/ObjectId.java index fc223771..24c35843 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/ObjectId.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/ObjectId.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/PartialFileHistory.java b/core/syncany-lib/src/main/java/org/syncany/database/PartialFileHistory.java index 70434a00..d5484d1a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/PartialFileHistory.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/PartialFileHistory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/SqlDatabase.java b/core/syncany-lib/src/main/java/org/syncany/database/SqlDatabase.java index 7dd32b90..009ab4c3 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/SqlDatabase.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/SqlDatabase.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/VectorClock.java b/core/syncany-lib/src/main/java/org/syncany/database/VectorClock.java index 4eda2fde..c2dba5e4 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/VectorClock.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/VectorClock.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/AbstractSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/AbstractSqlDao.java index 9f37cf98..3458f06a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/AbstractSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/AbstractSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/ApplicationSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/ApplicationSqlDao.java index 88284de6..a6afd641 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/ApplicationSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/ApplicationSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/ChunkSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/ChunkSqlDao.java index 430f550e..e032e892 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/ChunkSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/ChunkSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseVersionSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseVersionSqlDao.java index 62055fe0..db91ed5c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseVersionSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseVersionSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlParseHandler.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlParseHandler.java index f9e77fa4..bbc79c09 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlParseHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlParseHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlSerializer.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlSerializer.java index a1ce2153..e1de230b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlSerializer.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlSerializer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlWriter.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlWriter.java index 62d2d32d..06d603b6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlWriter.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/DatabaseXmlWriter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/FileContentSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/FileContentSqlDao.java index 25435588..f0b2a562 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/FileContentSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/FileContentSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/FileHistorySqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/FileHistorySqlDao.java index e1510a23..a4bf8147 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/FileHistorySqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/FileHistorySqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/FileVersionSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/FileVersionSqlDao.java index d0e763dd..95f54b5f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/FileVersionSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/FileVersionSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/database/dao/MultiChunkSqlDao.java b/core/syncany-lib/src/main/java/org/syncany/database/dao/MultiChunkSqlDao.java index c8b5791f..1d4e04bc 100644 --- a/core/syncany-lib/src/main/java/org/syncany/database/dao/MultiChunkSqlDao.java +++ b/core/syncany-lib/src/main/java/org/syncany/database/dao/MultiChunkSqlDao.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/AbstractTransferOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/AbstractTransferOperation.java index b7fd3bdb..eaafbf06 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/AbstractTransferOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/AbstractTransferOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ActionFileHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/ActionFileHandler.java index d87ef2a8..31705ee2 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ActionFileHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ActionFileHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/Assembler.java b/core/syncany-lib/src/main/java/org/syncany/operations/Assembler.java index 3078d4b7..365b1bbd 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/Assembler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/Assembler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ChangeSet.java b/core/syncany-lib/src/main/java/org/syncany/operations/ChangeSet.java index 456b2b74..f350fa3b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ChangeSet.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ChangeSet.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/Downloader.java b/core/syncany-lib/src/main/java/org/syncany/operations/Downloader.java index 8de045c8..a8163456 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/Downloader.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/Downloader.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/Operation.java b/core/syncany-lib/src/main/java/org/syncany/operations/Operation.java index 3e7819b6..7bfad92c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/Operation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/Operation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/OperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/OperationOptions.java index 2358fb4a..7952bf50 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/OperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/OperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/OperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/OperationResult.java index 14e0cf46..5650ef27 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/OperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/OperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java index e33aea48..f4e99131 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationOptions.java index 3b2bca47..b66c0a4f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationResult.java index 44677fd1..4668e10f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ControlServer.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ControlServer.java index a7b71f13..d96be28e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ControlServer.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ControlServer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperation.java index b3ef8a3b..8abed600 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationOptions.java index cfd8ca45..ebafc68a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationResult.java index d3a5905e..0ced85d8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/EventUserInteractionListener.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/EventUserInteractionListener.java index f1351207..4221f7b8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/EventUserInteractionListener.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/EventUserInteractionListener.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/MapIdentityManager.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/MapIdentityManager.java index 70d9b3c8..170d9459 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/MapIdentityManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/MapIdentityManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java index 4ff5d2e6..62d9f9a0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/Watch.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/Watch.java index 920f8b9a..3aade374 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/Watch.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/Watch.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java index f97d62bc..e6bd78da 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java index 55574a92..e5efa08f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WebServer.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WebServer.java index 6e9b82dd..3d98a377 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WebServer.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/WebServer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java index 2b54a373..eb8d0ca7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java index 199031a4..0a448d57 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java index 73d0b363..022d6ad6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementRequest.java index 03629ca3..1820d3f7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementResponse.java index 2c0dbf04..90257788 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AddWatchManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AlreadySyncingResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AlreadySyncingResponse.java index 079b639e..877f8270 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AlreadySyncingResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/AlreadySyncingResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java index 512cff70..93c2dfb6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupEndSyncExternalEvent.java index 97693d44..8932d248 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartCleaningSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartCleaningSyncExternalEvent.java index 623d089d..27c90f56 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartCleaningSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartCleaningSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartSyncExternalEvent.java index cd65ee88..6fc2689a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CleanupStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEvent.java index e43a6237..5f106b72 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEventResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEventResponse.java index f1105dfd..8dac1a66 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEventResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConfirmUserInteractionExternalEventResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequest.java index e085d1fc..c78ffb34 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequestHandler.java index 2c9845b1..e505a8ee 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementResponse.java index bcca4c12..aaed3a5c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectToHostExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectToHostExternalEvent.java index 2fddf3e3..07403906 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectToHostExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ConnectToHostExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementRequest.java index 8b83af82..f59f7569 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementResponse.java index b2e91a8a..13bcdc80 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ControlManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DaemonReloadedExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DaemonReloadedExternalEvent.java index eaa96155..d90158aa 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DaemonReloadedExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DaemonReloadedExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownChangesDetectedSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownChangesDetectedSyncExternalEvent.java index 00750d83..f6284957 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownChangesDetectedSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownChangesDetectedSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownDownloadFileSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownDownloadFileSyncExternalEvent.java index a554ce0f..7d50e9a9 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownDownloadFileSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownDownloadFileSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownEndSyncExternalEvent.java index f681da8c..86ef5e73 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownStartSyncExternalEvent.java index 45ce3fec..64df1c43 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/DownStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequest.java index 165613a6..384573a1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequestHandler.java index d13f964e..dbf9548b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderResponse.java index 641e8e27..820eb234 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GenlinkFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequest.java index aba1eeb6..643f9354 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequestHandler.java index d4a6022e..d2069146 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderResponse.java index bac32f1c..8972403e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequest.java index f29778c0..0cdcc94c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequestHandler.java index f0f8e96b..a0143af3 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponse.java index da7df32d..258fc71b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponseInternal.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponseInternal.java index d2b6d065..a2c20dd9 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponseInternal.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileFolderResponseInternal.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequest.java index 5c040f41..1e474925 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequestHandler.java index c497af22..7bae7de3 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderResponse.java index 23a75830..425d6232 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEvent.java index 38fd3adc..21ec64e0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEventResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEventResponse.java index e936e247..ff4f9993 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEventResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetPasswordUserInteractionExternalEventResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequest.java index a1492019..c4d95bef 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequestHandler.java index 3e6267dc..2d670be8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementResponse.java index 1e866149..f12a8305 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/InitManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementRequest.java index bed29c80..657046ff 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementResponse.java index 73b5dca5..5a5c8426 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequest.java index d55f9464..bff8fd79 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequestHandler.java index da61d271..dbb8d14b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderResponse.java index 99ce0789..4be9d2cf 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LogFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequest.java index aed6a58d..9889d96c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequestHandler.java index 943c6459..9e1ac00e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderResponse.java index d2bba85b..61f3287d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteEndSyncExternalEvent.java index 35a4e9d7..8b879a06 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequest.java index d4a14940..f6ae02e1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequestHandler.java index 3e237a72..ec6619ab 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderResponse.java index 88a0289b..d3986647 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteStartSyncExternalEvent.java index 223eff5e..ba7cb803 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/LsRemoteStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginInstallExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginInstallExternalEvent.java index 7fed8249..7c0cff5f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginInstallExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginInstallExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequest.java index cd6aa356..2a7a9f0c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequestHandler.java index 4cb5fb09..93d9a1c9 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementResponse.java index a181984c..5c529cf5 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/PluginManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementRequest.java index faf7f9b6..717d250d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementResponse.java index e2b78c15..f45c6c1a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RemoveWatchManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequest.java index caf6718b..a1474603 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequestHandler.java index 265d5555..e6658293 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderResponse.java index f7c0c48c..6d1f13fb 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ShowMessageExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ShowMessageExternalEvent.java index 10cd1e04..722cfc8f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ShowMessageExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ShowMessageExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusEndSyncExternalEvent.java index b26540da..1856ab0b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequest.java index 24a609d8..ed36aa68 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequestHandler.java index f1b35113..a7a7cabd 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderResponse.java index f1626767..0604f4fb 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusFolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusStartSyncExternalEvent.java index e92c9889..676b00b0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/SyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/SyncExternalEvent.java index 49c25243..e9afb16b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/SyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/SyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpEndSyncExternalEvent.java index 8215ef29..d0358ce3 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexChangesDetectedSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexChangesDetectedSyncExternalEvent.java index 09d6b58a..9c29e265 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexChangesDetectedSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexChangesDetectedSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexEndSyncExternalEvent.java index 2ca5dfd6..f9677539 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexMidSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexMidSyncExternalEvent.java index c624ea05..989745ca 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexMidSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexMidSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexStartSyncExternalEvent.java index 89fda466..840e9016 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpIndexStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpStartSyncExternalEvent.java index c5747845..c97a0b05 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadEndSyncExternalEvent.java index e2f0d264..aab31e13 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileInTransactionSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileInTransactionSyncExternalEvent.java index 8ee7d836..a0e4ccb7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileInTransactionSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileInTransactionSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileSyncExternalEvent.java index 5288b506..9539d992 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpUploadFileSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequest.java index 56f10898..80205b28 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequestHandler.java index c70f2c14..461242e0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementResponse.java index 3f2ea178..55961561 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/UpdateManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEndSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEndSyncExternalEvent.java index ac5cccfc..e7c08adc 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEndSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEndSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchStartSyncExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchStartSyncExternalEvent.java index 4c308f4e..16283a0e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchStartSyncExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchStartSyncExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Event.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Event.java index 58cfe2d9..00c77bc8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Event.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Event.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/EventResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/EventResponse.java index 56384b4c..d1c1eb0f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/EventResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/EventResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEvent.java index 930c8f1b..22e12aa6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEventResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEventResponse.java index dcfead6b..28efc852 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEventResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ExternalEventResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequest.java index c8461e26..2db2b8a6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequestHandler.java index db9d02ac..06a8a4d1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderResponse.java index 67316678..65477bd6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/FolderResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/InternalEvent.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/InternalEvent.java index dd345ebc..bdee8eaf 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/InternalEvent.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/InternalEvent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/JsonMessageFactory.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/JsonMessageFactory.java index fdb3506e..edaf9455 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/JsonMessageFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/JsonMessageFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequest.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequest.java index fb15b3be..274bcc7a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequest.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequestHandler.java index e4061a9c..9da0b61d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementRequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementResponse.java index 88d9218e..1f75c7fe 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/ManagementResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Message.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Message.java index bdd038dc..05640349 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Message.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Message.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/MessageFactory.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/MessageFactory.java index d5ae574f..e473c2bb 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/MessageFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/MessageFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Request.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Request.java index a29fc981..50a71c46 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Request.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Request.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/RequestHandler.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/RequestHandler.java index 0339953b..12316de6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/RequestHandler.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/RequestHandler.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Response.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Response.java index 1c15a936..306bb941 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Response.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/Response.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/XmlMessageFactory.java b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/XmlMessageFactory.java index 3819723e..e3bac84e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/XmlMessageFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/api/XmlMessageFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/ApplyChangesOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/ApplyChangesOperation.java index af416320..aea12e4a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/ApplyChangesOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/ApplyChangesOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranch.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranch.java index 17f679a5..152c4631 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranch.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranch.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranches.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranches.java index 77cdb666..a409750b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranches.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseBranches.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseFileReader.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseFileReader.java new file mode 100644 index 00000000..5964b954 --- /dev/null +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseFileReader.java @@ -0,0 +1,160 @@ +/* + * Syncany, www.syncany.org + * Copyright (C) 2011-2016 Philipp C. Heckel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.syncany.operations.down; + +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.syncany.database.DatabaseVersion; +import org.syncany.database.DatabaseVersionHeader; +import org.syncany.database.MemoryDatabase; +import org.syncany.database.VectorClock; +import org.syncany.database.dao.DatabaseXmlSerializer; +import org.syncany.database.dao.DatabaseXmlSerializer.DatabaseReadType; + +/** + * The DatabaseFileReader provides a way to read a series of database files + * in a memory-efficient way, by converting them to a series of MemoryDatabases, + * none of which are too large. + * + * @author Pim Otte + */ +public class DatabaseFileReader implements Iterator { + private static final int MAX_FILES = 9999; + + private DatabaseXmlSerializer databaseSerializer; + private List winnersApplyBranchList; + private Map databaseVersionLocations; + private int branchIndex = 0; + + public DatabaseFileReader(DatabaseXmlSerializer databaseSerializer, DatabaseBranch winnersApplyBranch, + Map databaseVersionLocations) { + + this.winnersApplyBranchList = winnersApplyBranch.getAll(); + this.databaseVersionLocations = databaseVersionLocations; + this.databaseSerializer = databaseSerializer; + } + + public boolean hasNext() { + return branchIndex < winnersApplyBranchList.size(); + } + + /** + * Loads the winner's database branch into the memory in a {@link MemoryDatabase} object, by using + * the already downloaded list of remote database files. + * + *

Because database files can contain multiple {@link DatabaseVersion}s per client, a range for which + * to load the database versions must be determined. + * + *

Example 1:
+ * 

+	 *  db-A-0001   (A1)     Already known             Not loaded
+	 *  db-A-0005   (A2)     Already known             Not loaded
+	 *              (A3)     Already known             Not loaded
+	 *              (A4)     Part of winner's branch   Loaded
+	 *              (A5)     Purge database version    Ignored (only DEFAULT)
+	 *  db-B-0001   (A5,B1)  Part of winner's branch   Loaded
+	 *  db-A-0006   (A6,B1)  Part of winner's branch   Loaded
+	 *
+ * + *

In example 1, only (A4)-(A5) must be loaded from db-A-0005, and not all four database versions. + * + *

Other example:
+ * 

+	 *  db-A-0005   (A1)     Part of winner's branch   Loaded
+	 *  db-A-0005   (A2)     Part of winner's branch   Loaded
+	 *  db-B-0001   (A2,B1)  Part of winner's branch   Loaded
+	 *  db-A-0005   (A3,B1)  Part of winner's branch   Loaded
+	 *  db-A-0005   (A4,B1)  Part of winner's branch   Loaded
+	 *  db-A-0005   (A5,B1)  Purge database version    Ignored (only DEFAULT)
+	 *
+ * + *

In example 2, (A1)-(A5,B1) [except (A2,B1)] are contained in db-A-0005 (after merging!), so + * db-A-0005 must be processed twice; each time loading separate parts of the file. In this case: + * First load (A1)-(A2) from db-A-0005, then load (A2,B1) from db-B-0001, then load (A3,B1)-(A4,B1) + * from db-A-0005, and ignore (A5,B1). + * @param databaseFileList + * @param ignoredMostRecentPurgeVersions + * + * @return Returns a loaded memory database containing all metadata from the winner's branch + */ + @Override + public MemoryDatabase next() { + MemoryDatabase winnerBranchDatabase = new MemoryDatabase(); + String rangeClientName = null; + VectorClock rangeVersionFrom = null; + VectorClock rangeVersionTo = null; + + while (branchIndex < winnersApplyBranchList.size() && winnerBranchDatabase.getFileHistories().size() < MAX_FILES) { + DatabaseVersionHeader currentDatabaseVersionHeader = winnersApplyBranchList.get(branchIndex); + DatabaseVersionHeader nextDatabaseVersionHeader = (branchIndex + 1 < winnersApplyBranchList.size()) ? winnersApplyBranchList + .get(branchIndex + 1) : null; + + // First of range for this client + if (rangeClientName == null) { + rangeClientName = currentDatabaseVersionHeader.getClient(); + rangeVersionFrom = currentDatabaseVersionHeader.getVectorClock(); + rangeVersionTo = currentDatabaseVersionHeader.getVectorClock(); + } + + // Still in range for this client + else { + rangeVersionTo = currentDatabaseVersionHeader.getVectorClock(); + } + + // Now load this stuff from the database file (or not) + // - If the database file exists, load the range and reset it + // - If not, only force a load if this is the range end + + File databaseVersionFile = databaseVersionLocations.get(currentDatabaseVersionHeader); + + if (databaseVersionFile == null) { + throw new RuntimeException("Could not find file corresponding to " + currentDatabaseVersionHeader + + ", while it is in the winners branch."); + } + + boolean lastDatabaseVersionHeader = nextDatabaseVersionHeader == null; + boolean nextDatabaseVersionInSameFile = lastDatabaseVersionHeader + || databaseVersionFile.equals(databaseVersionLocations.get(nextDatabaseVersionHeader)); + boolean rangeEnds = lastDatabaseVersionHeader || !nextDatabaseVersionInSameFile; + + if (rangeEnds) { + try { + databaseSerializer.load(winnerBranchDatabase, databaseVersionFile, rangeVersionFrom, rangeVersionTo, DatabaseReadType.FULL); + } + catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + rangeClientName = null; + } + branchIndex++; + } + + return winnerBranchDatabase; + } + + @Override + public void remove() { + throw new UnsupportedOperationException("Removing a databaseversion is not supported"); + + } + +} diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseReconciliator.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseReconciliator.java index a00ba283..294929b0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseReconciliator.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseReconciliator.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseVersionHeaderComparator.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseVersionHeaderComparator.java index 93a4066d..ca3d108a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseVersionHeaderComparator.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DatabaseVersionHeaderComparator.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperation.java index 2735aace..cd0256a4 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -457,119 +457,43 @@ private void applyWinnersBranch(DatabaseBranch localBranch, EntryBecause database files can contain multiple {@link DatabaseVersion}s per client, a range for which - * to load the database versions must be determined. - * - *

Example 1:
- * 

-	 *  db-A-0001   (A1)     Already known             Not loaded
-	 *  db-A-0005   (A2)     Already known             Not loaded
-	 *              (A3)     Already known             Not loaded
-	 *              (A4)     Part of winner's branch   Loaded
-	 *              (A5)     Purge database version    Ignored (only DEFAULT)
-	 *  db-B-0001   (A5,B1)  Part of winner's branch   Loaded
-	 *  db-A-0006   (A6,B1)  Part of winner's branch   Loaded
-	 *
- * - *

In example 1, only (A4)-(A5) must be loaded from db-A-0005, and not all four database versions. - * - *

Other example:
- * 

-	 *  db-A-0005   (A1)     Part of winner's branch   Loaded
-	 *  db-A-0005   (A2)     Part of winner's branch   Loaded
-	 *  db-B-0001   (A2,B1)  Part of winner's branch   Loaded
-	 *  db-A-0005   (A3,B1)  Part of winner's branch   Loaded
-	 *  db-A-0005   (A4,B1)  Part of winner's branch   Loaded
-	 *  db-A-0005   (A5,B1)  Purge database version    Ignored (only DEFAULT)
-	 *
- * - *

In example 2, (A1)-(A5,B1) [except (A2,B1)] are contained in db-A-0005 (after merging!), so - * db-A-0005 must be processed twice; each time loading separate parts of the file. In this case: - * First load (A1)-(A2) from db-A-0005, then load (A2,B1) from db-B-0001, then load (A3,B1)-(A4,B1) - * from db-A-0005, and ignore (A5,B1). - * @param databaseFileList - * @param ignoredMostRecentPurgeVersions - * - * @return Returns a loaded memory database containing all metadata from the winner's branch - */ - private MemoryDatabase readWinnersDatabase(DatabaseBranch winnersApplyBranch, Map databaseVersionLocations) - throws IOException, StorageException { - - MemoryDatabase winnerBranchDatabase = new MemoryDatabase(); - - List winnersApplyBranchList = winnersApplyBranch.getAll(); - - String rangeClientName = null; - VectorClock rangeVersionFrom = null; - VectorClock rangeVersionTo = null; - - for (int i = 0; i < winnersApplyBranchList.size(); i++) { - DatabaseVersionHeader currentDatabaseVersionHeader = winnersApplyBranchList.get(i); - DatabaseVersionHeader nextDatabaseVersionHeader = (i + 1 < winnersApplyBranchList.size()) ? winnersApplyBranchList.get(i + 1) : null; - - // First of range for this client - if (rangeClientName == null) { - rangeClientName = currentDatabaseVersionHeader.getClient(); - rangeVersionFrom = currentDatabaseVersionHeader.getVectorClock(); - rangeVersionTo = currentDatabaseVersionHeader.getVectorClock(); - } - - // Still in range for this client - else { - rangeVersionTo = currentDatabaseVersionHeader.getVectorClock(); - } - - // Now load this stuff from the database file (or not) - // - If the database file exists, load the range and reset it - // - If not, only force a load if this is the range end - - File databaseVersionFile = databaseVersionLocations.get(currentDatabaseVersionHeader); - - if (databaseVersionFile == null) { - throw new StorageException("Could not find file corresponding to " + currentDatabaseVersionHeader - + ", while it is in the winners branch."); - } - - boolean lastDatabaseVersionHeader = nextDatabaseVersionHeader == null; - boolean nextDatabaseVersionInSameFile = lastDatabaseVersionHeader - || databaseVersionFile.equals(databaseVersionLocations.get(nextDatabaseVersionHeader)); - boolean rangeEnds = lastDatabaseVersionHeader || !nextDatabaseVersionInSameFile; - - if (rangeEnds) { - databaseSerializer.load(winnerBranchDatabase, databaseVersionFile, rangeVersionFrom, rangeVersionTo, DatabaseReadType.FULL); - rangeClientName = null; - } + private void applyChangesAndPersistDatabase(MemoryDatabase winnersDatabase, boolean cleanupOccurred, + List preDeleteFileHistoriesWithLastVersion) throws Exception { + + if (options.isApplyChanges()) { + new ApplyChangesOperation(config, localDatabase, transferManager, winnersDatabase, result, cleanupOccurred, + preDeleteFileHistoriesWithLastVersion).execute(); + } + else { + logger.log(Level.INFO, "Doing nothing on the file system, because --no-apply switched on"); } - if (logger.isLoggable(Level.FINE)) { - logger.log(Level.FINE, "Winner Database Branch:"); - - for (DatabaseVersion dbv : winnerBranchDatabase.getDatabaseVersions()) { - logger.log(Level.FINE, "- " + dbv.getHeader()); - } + // We only persist the versions that we have already applied. + DatabaseBranch currentApplyBranch = new DatabaseBranch(); + for (DatabaseVersion databaseVersion : winnersDatabase.getDatabaseVersions()) { + currentApplyBranch.add(databaseVersion.getHeader()); } - return winnerBranchDatabase; + persistDatabaseVersions(currentApplyBranch, winnersDatabase); + localDatabase.commit(); } /** diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationOptions.java index 2d0dd842..b5a1f134 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationResult.java index 2be90dc5..02bdfbb6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/DownOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionComparator.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionComparator.java index 98e1aa9c..b01c971b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionComparator.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionComparator.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionReconciliator.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionReconciliator.java index c01d2ef5..d46ae28c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionReconciliator.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/FileSystemActionReconciliator.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ import org.syncany.database.PartialFileHistory; import org.syncany.database.PartialFileHistory.FileHistoryId; import org.syncany.database.SqlDatabase; +import org.syncany.operations.Assembler; import org.syncany.operations.ChangeSet; import org.syncany.operations.down.actions.ChangeFileSystemAction; import org.syncany.operations.down.actions.DeleteFileSystemAction; @@ -132,6 +133,7 @@ public class FileSystemActionReconciliator { private ChangeSet changeSet; private SqlDatabase localDatabase; private FileVersionComparator fileVersionComparator; + private Assembler assembler; public FileSystemActionReconciliator(Config config, ChangeSet changeSet) { this.config = config; @@ -147,6 +149,7 @@ public List determineFileSystemActions(MemoryDatabase winnersD public List determineFileSystemActions(MemoryDatabase winnersDatabase, boolean cleanupOccurred, List localFileHistoriesWithLastVersion) throws Exception { + this.assembler = new Assembler(config, localDatabase, winnersDatabase); List fileSystemActions = new ArrayList(); @@ -230,7 +233,7 @@ private void determineActionNoLocalLastVersion(FileVersion winningLastVersion, F logger.log(Level.INFO, " -> (1) Equals: Nothing to do, winning version equals winning file: "+winningLastVersion+" AND "+winningLastFile); } else if (winningFileToVersionComparison.getFileChanges().contains(FileChange.DELETED)) { - FileSystemAction action = new NewFileSystemAction(config, winningLastVersion, winnersDatabase); + FileSystemAction action = new NewFileSystemAction(config, winnersDatabase, assembler, winningLastVersion); outFileSystemActions.add(action); logger.log(Level.INFO, " -> (2) Deleted: Local file does NOT exist, but it should, winning version not known: "+winningLastVersion+" AND "+winningLastFile); @@ -272,7 +275,7 @@ else if (winningFileToVersionComparison.getFileChanges().contains(FileChange.CHA throw new Exception("What happend here?"); } else { // Content changed - FileSystemAction action = new NewFileSystemAction(config, winningLastVersion, winnersDatabase); + FileSystemAction action = new NewFileSystemAction(config, winnersDatabase, assembler, winningLastVersion); outFileSystemActions.add(action); logger.log(Level.INFO, " -> (7) Content changed: Winning file differs from winning version: "+winningLastVersion+" AND "+winningLastFile); @@ -294,7 +297,7 @@ private void determineActionWithLocalVersionAndLocalFileAsExpected(FileVersion w logger.log(Level.INFO, " -> (8) Equals: Nothing to do, local file equals local version equals winning version: local file = "+localLastFile+", local version = "+localLastVersion+", winning version = "+winningLastVersion); } else if (winningVersionToLocalVersionComparison.getFileChanges().contains(FileChange.DELETED)) { - FileSystemAction action = new ChangeFileSystemAction(config, localLastVersion, winningLastVersion, winnersDatabase); + FileSystemAction action = new ChangeFileSystemAction(config, winnersDatabase, assembler, localLastVersion, winningLastVersion); fileSystemActions.add(action); logger.log(Level.INFO, " -> (9) Content changed: Local file does not exist, but it should: local file = "+localLastFile+", local version = "+localLastVersion+", winning version = "+winningLastVersion); @@ -333,7 +336,7 @@ else if (!contentChanged && (winningVersionToLocalVersionComparison.getFileChang changeSet.getChangedFiles().add(winningLastVersion.getPath()); } else { // Content changed - FileSystemAction action = new ChangeFileSystemAction(config, localLastVersion, winningLastVersion, winnersDatabase); + FileSystemAction action = new ChangeFileSystemAction(config, winnersDatabase, assembler, localLastVersion, winningLastVersion); fileSystemActions.add(action); logger.log(Level.INFO, " -> (13) Content changed: Local file differs from winning version: local file = "+localLastFile+", local version = "+localLastVersion+", winning version = "+winningLastVersion); @@ -351,7 +354,7 @@ private void determineActionWithLocalVersionAndLocalFileDiffers(FileVersion winn boolean winningLastVersionDeleted = winningLastVersion.getStatus() == FileStatus.DELETED; if (!winningLastVersionDeleted) { - FileSystemAction action = new ChangeFileSystemAction(config, localLastVersion, winningLastVersion, winnersDatabase); + FileSystemAction action = new ChangeFileSystemAction(config, winnersDatabase, assembler, localLastVersion, winningLastVersion); fileSystemActions.add(action); logger.log(Level.INFO, " -> (14) Content changed: Local file does NOT exist, and winning version changed: local file = "+localLastFile+", local version = "+localLastVersion+", winning version = "+winningLastVersion); @@ -364,7 +367,7 @@ private void determineActionWithLocalVersionAndLocalFileDiffers(FileVersion winn } } else { - FileSystemAction action = new ChangeFileSystemAction(config, localLastVersion, winningLastVersion, winnersDatabase); + FileSystemAction action = new ChangeFileSystemAction(config, winnersDatabase, assembler, winningLastVersion, localLastVersion); fileSystemActions.add(action); logger.log(Level.INFO, " -> (16) Content changed: Local file differs from last version: local file = "+localLastFile+", local version = "+localLastVersion+", winning version = "+winningLastVersion); diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/ChangeFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/ChangeFileSystemAction.java index f367b73b..552618ff 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/ChangeFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/ChangeFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,10 +23,12 @@ import org.syncany.database.FileVersion; import org.syncany.database.FileVersion.FileStatus; import org.syncany.database.MemoryDatabase; +import org.syncany.operations.Assembler; public class ChangeFileSystemAction extends FileCreatingFileSystemAction { - public ChangeFileSystemAction(Config config, FileVersion fromFileVersion, FileVersion toFileVersion, MemoryDatabase winningDatabase) { - super(config, winningDatabase, fromFileVersion, toFileVersion); + public ChangeFileSystemAction(Config config, MemoryDatabase winningDatabase, Assembler assembler, FileVersion fromFileVersion, + FileVersion toFileVersion) { + super(config, winningDatabase, assembler, fromFileVersion, toFileVersion); } @Override diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/DeleteFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/DeleteFileSystemAction.java index 384b182d..0ef08d46 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/DeleteFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/DeleteFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileCreatingFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileCreatingFileSystemAction.java index 903ec0f6..d027e8a5 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileCreatingFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileCreatingFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,13 +24,15 @@ import org.syncany.database.FileVersion; import org.syncany.database.FileVersion.FileType; import org.syncany.database.MemoryDatabase; -import org.syncany.database.SqlDatabase; import org.syncany.operations.Assembler; import org.syncany.util.NormalizedPath; public abstract class FileCreatingFileSystemAction extends FileSystemAction { - public FileCreatingFileSystemAction(Config config, MemoryDatabase winningDatabase, FileVersion file1, FileVersion file2) { - super(config, winningDatabase, file1, file2); + protected Assembler assembler; + + public FileCreatingFileSystemAction(Config config, MemoryDatabase winningDatabase, Assembler assembler, FileVersion file1, FileVersion file2) { + super(config, winningDatabase, file1, file2); + this.assembler = assembler; } protected void createFileFolderOrSymlink(FileVersion reconstructedFileVersion) throws Exception { @@ -76,9 +78,6 @@ protected void createFile(FileVersion reconstructedFileVersion) throws Exception } protected File assembleFileToCache(FileVersion reconstructedFileVersion) throws Exception { - SqlDatabase localDatabase = new SqlDatabase(config); - Assembler assembler = new Assembler(config, localDatabase, winningDatabase); - File reconstructedFileInCache = assembler.assembleToCache(reconstructedFileVersion); setFileAttributes(reconstructedFileVersion, reconstructedFileInCache); diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemAction.java index 9dc69040..0e07f234 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemActionResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemActionResult.java index c2a2c6f3..c8e51c50 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemActionResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/FileSystemActionResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewFileSystemAction.java index 0f9f3d3a..c252f7ac 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,11 +20,12 @@ import org.syncany.config.Config; import org.syncany.database.FileVersion; import org.syncany.database.MemoryDatabase; +import org.syncany.operations.Assembler; public class NewFileSystemAction extends FileCreatingFileSystemAction { - public NewFileSystemAction(Config config, FileVersion newFileVersion, MemoryDatabase winningDatabase) { - super(config, winningDatabase, null, newFileVersion); + public NewFileSystemAction(Config config, MemoryDatabase winningDatabase, Assembler assembler, FileVersion newFileVersion) { + super(config, winningDatabase, assembler, null, newFileVersion); } @Override diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewSymlinkFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewSymlinkFileSystemAction.java index b0b826c1..b9f65301 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewSymlinkFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/NewSymlinkFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/RenameFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/RenameFileSystemAction.java index 26f5612c..875547a7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/RenameFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/RenameFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/SetAttributesFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/SetAttributesFileSystemAction.java index eb6ee081..42417c9f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/SetAttributesFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/down/actions/SetAttributesFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/AbstractInitOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/AbstractInitOperation.java index 1a8aa029..f274479a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/AbstractInitOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/AbstractInitOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLink.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLink.java index 4e22bb76..e6decd1f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLink.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLink.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLinkShortenerResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLinkShortenerResponse.java index 733360a9..eb6d4b8a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLinkShortenerResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/ApplicationLinkShortenerResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperation.java index 45f72d60..9f217fd7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -315,7 +315,7 @@ private String getOrAskPassword() { throw new RuntimeException("Repository file is encrypted, but password cannot be queried (no listener)."); } - return listener.onUserPassword(null, "Password: "); + return listener.onUserPassword(null, "Master Password: "); } else { return options.getPassword(); diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationOptions.java index da9c5671..d68ec1f1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationResult.java index 4cc2180b..28d16b85 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperation.java index 3fdfb182..28f41d52 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationOptions.java index f2c7c6b1..60957694 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationResult.java index 5060ff74..9ee0cf6d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/GenlinkOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperation.java index 63fde3e0..a4043c38 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationOptions.java index e389ea5d..1f9fadab 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationResult.java index 15e6a566..a3066380 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/init/InitOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/log/LightweightDatabaseVersion.java b/core/syncany-lib/src/main/java/org/syncany/operations/log/LightweightDatabaseVersion.java index 706f9ef1..4accd5d6 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/log/LightweightDatabaseVersion.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/log/LightweightDatabaseVersion.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperation.java index f73a2182..7ddf8db0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationOptions.java index c1d2c052..e9dd9a1f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationResult.java index b1de3e2b..0fec6676 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/log/LogOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperation.java index f0d9f963..30ba477e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationOptions.java index caf17eb4..01350813 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationResult.java index 08becb6b..9e396050 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ls/LsOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperation.java index 524bd1ad..a26a2740 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperationResult.java index e9e37ee1..873c9120 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/ls_remote/LsRemoteOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/ExtendedPluginInfo.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/ExtendedPluginInfo.java index 9c34e2e9..defd107c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/ExtendedPluginInfo.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/ExtendedPluginInfo.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginInfo.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginInfo.java index 9431bb55..7f861973 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginInfo.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginInfo.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginListResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginListResponse.java index 90276be1..382dfebd 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginListResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginListResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperation.java index 0d5d9280..4b11f871 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationAction.java index c7ab20df..4a7f743b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationOptions.java index dabf026b..05e26936 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationResult.java index 4fd03af1..26991684 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/plugin/PluginOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemAction.java index 0cffdc73..c0c745db 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,14 +25,15 @@ import org.syncany.database.FileVersion.FileStatus; import org.syncany.database.FileVersion.FileType; import org.syncany.database.MemoryDatabase; +import org.syncany.operations.Assembler; import org.syncany.operations.down.actions.FileCreatingFileSystemAction; import org.syncany.util.NormalizedPath; public class RestoreFileSystemAction extends FileCreatingFileSystemAction { private String relativeTargetPath; - public RestoreFileSystemAction(Config config, FileVersion fileVersion, String relativeTargetPath) { - super(config, new MemoryDatabase(), null, fileVersion); + public RestoreFileSystemAction(Config config, Assembler assembler, FileVersion fileVersion, String relativeTargetPath) { + super(config, new MemoryDatabase(), assembler, null, fileVersion); this.relativeTargetPath = relativeTargetPath; } @@ -45,10 +46,6 @@ else if (fileVersion2.getType() == FileType.SYMLINK) { throw new Exception("Not yet implemented."); } else { - if (fileVersion2.getStatus() == FileStatus.DELETED) { - throw new Exception("Cannot restore version marked DELETED. Try previous version."); - } - // Assemble file to cache File cacheFile = assembleFileToCache(fileVersion2); diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemActionResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemActionResult.java index 49ddecc0..f2bce1fa 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemActionResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreFileSystemActionResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperation.java index 9536b5c2..34e5ca25 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +32,7 @@ import org.syncany.database.PartialFileHistory.FileHistoryId; import org.syncany.database.SqlDatabase; import org.syncany.operations.AbstractTransferOperation; +import org.syncany.operations.Assembler; import org.syncany.operations.Downloader; import org.syncany.operations.restore.RestoreOperationResult.RestoreResultCode; import org.syncany.plugins.transfer.StorageException; @@ -45,6 +46,8 @@ public class RestoreOperation extends AbstractTransferOperation { private SqlDatabase localDatabase; private Downloader downloader; + private Assembler assembler; + public RestoreOperation(Config config) { this(config, new RestoreOperationOptions()); } @@ -55,6 +58,7 @@ public RestoreOperation(Config config, RestoreOperationOptions options) { this.options = options; this.localDatabase = new SqlDatabase(config); this.downloader = new Downloader(config, transferManager); + this.assembler = new Assembler(config, localDatabase, null); } @Override @@ -88,7 +92,7 @@ else if (restoreFileVersion.getType() == FileType.FOLDER) { // Restore file logger.log(Level.INFO, "- Restoring: " + restoreFileVersion); - RestoreFileSystemAction restoreAction = new RestoreFileSystemAction(config, restoreFileVersion, options.getRelativeTargetPath()); + RestoreFileSystemAction restoreAction = new RestoreFileSystemAction(config, assembler, restoreFileVersion, options.getRelativeTargetPath()); RestoreFileSystemActionResult restoreResult = restoreAction.execute(); return new RestoreOperationResult(RestoreResultCode.ACK, restoreResult.getTargetFile()); @@ -106,8 +110,13 @@ private FileVersion findRestoreFileVersion(FileHistoryId restoreFileHistoryId) { List fileHistory = localDatabase.getFileHistory(restoreFileHistoryId); if (fileHistory.size() >= 2) { + // In this case, we automatically restore the "previous" version return fileHistory.get(fileHistory.size()-2); } + else if (fileHistory.size() == 1){ + // In this case, we restore the last version. This is likely a deleted version. + return fileHistory.get(0); + } else { return null; } diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationOptions.java index 748b7131..5d7e9fed 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationResult.java index 8a49a382..ca18d6ed 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/restore/RestoreOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperation.java index b21c32f5..53325973 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,111 +47,112 @@ * The status operation analyzes the local file tree and compares it to the current local * database. It uses the {@link FileVersionComparator} to determine differences and returns * new/changed/deleted files in form of a {@link ChangeSet}. - * + * * @author Philipp C. Heckel */ public class StatusOperation extends Operation { - private static final Logger logger = Logger.getLogger(StatusOperation.class.getSimpleName()); - - private FileVersionComparator fileVersionComparator; + private static final Logger logger = Logger.getLogger(StatusOperation.class.getSimpleName()); + + private FileVersionComparator fileVersionComparator; private SqlDatabase localDatabase; private StatusOperationOptions options; - + private LocalEventBus eventBus; - + public StatusOperation(Config config) { this(config, new StatusOperationOptions()); - } - + } + public StatusOperation(Config config, StatusOperationOptions options) { - super(config); - + super(config); + this.fileVersionComparator = new FileVersionComparator(config.getLocalDir(), config.getChunker().getChecksumAlgorithm()); this.localDatabase = new SqlDatabase(config); - this.options = options; - + this.options = options; + this.eventBus = LocalEventBus.getInstance(); - } - + } + @Override public StatusOperationResult execute() throws Exception { logger.log(Level.INFO, ""); - logger.log(Level.INFO, "Running 'Status' at client "+config.getMachineName()+" ..."); + logger.log(Level.INFO, "Running 'Status' at client " + config.getMachineName() + " ..."); logger.log(Level.INFO, "--------------------------------------------"); - + if (options != null && options.isForceChecksum()) { logger.log(Level.INFO, "Force checksum ENABLED."); } - + if (options != null && !options.isDelete()) { logger.log(Level.INFO, "Delete missing files DISABLED."); } - + // Get local database - logger.log(Level.INFO, "Querying current file tree from database ..."); - eventBus.post(new StatusStartSyncExternalEvent(config.getLocalDir().getAbsolutePath())); - + logger.log(Level.INFO, "Querying current file tree from database ..."); + eventBus.post(new StatusStartSyncExternalEvent(config.getLocalDir().getAbsolutePath())); + // Path to actual file version final Map filesInDatabase = localDatabase.getCurrentFileTree(); // Find local changes - logger.log(Level.INFO, "Analyzing local folder "+config.getLocalDir()+" ..."); + logger.log(Level.INFO, "Analyzing local folder " + config.getLocalDir() + " ..."); ChangeSet localChanges = findLocalChanges(filesInDatabase); - + if (!localChanges.hasChanges()) { logger.log(Level.INFO, "- No changes to local database"); } - + // Return result StatusOperationResult statusResult = new StatusOperationResult(); statusResult.setChangeSet(localChanges); - - eventBus.post(new StatusEndSyncExternalEvent(config.getLocalDir().getAbsolutePath(), localChanges.hasChanges())); - + + eventBus.post(new StatusEndSyncExternalEvent(config.getLocalDir().getAbsolutePath(), localChanges.hasChanges())); + return statusResult; } private ChangeSet findLocalChanges(final Map filesInDatabase) throws FileNotFoundException, IOException { ChangeSet localChanges = findLocalChangedAndNewFiles(config.getLocalDir(), filesInDatabase); - + if (options == null || options.isDelete()) { findAndAppendDeletedFiles(localChanges, filesInDatabase); } - + return localChanges; - } - - private ChangeSet findLocalChangedAndNewFiles(final File root, Map filesInDatabase) throws FileNotFoundException, IOException { + } + + private ChangeSet findLocalChangedAndNewFiles(final File root, Map filesInDatabase) + throws FileNotFoundException, IOException { Path rootPath = Paths.get(root.getAbsolutePath()); - - StatusFileVisitor fileVisitor = new StatusFileVisitor(rootPath, filesInDatabase); + + StatusFileVisitor fileVisitor = new StatusFileVisitor(rootPath, filesInDatabase); Files.walkFileTree(rootPath, fileVisitor); - - return fileVisitor.getChangeSet(); + + return fileVisitor.getChangeSet(); } - - private void findAndAppendDeletedFiles(ChangeSet localChanges, Map filesInDatabase) { + + private void findAndAppendDeletedFiles(ChangeSet localChanges, Map filesInDatabase) { for (FileVersion lastLocalVersion : filesInDatabase.values()) { // Check if file exists, remove if it doesn't - File lastLocalVersionOnDisk = new File(config.getLocalDir()+File.separator+lastLocalVersion.getPath()); - + File lastLocalVersionOnDisk = new File(config.getLocalDir() + File.separator + lastLocalVersion.getPath()); + // Ignore this file history if the last version is marked "DELETED" if (lastLocalVersion.getStatus() == FileStatus.DELETED) { continue; } - + // If file has VANISHED, mark as DELETED if (!FileUtil.exists(lastLocalVersionOnDisk)) { localChanges.getDeletedFiles().add(lastLocalVersion.getPath()); } - } + } } - + private class StatusFileVisitor implements FileVisitor { private Path root; - private ChangeSet changeSet; + private ChangeSet changeSet; private Map currentFileTree; - + public StatusFileVisitor(Path root, Map currentFileTree) { this.root = root; this.changeSet = new ChangeSet(); @@ -161,65 +162,65 @@ public StatusFileVisitor(Path root, Map currentFileTree) { public ChangeSet getChangeSet() { return changeSet; } - + @Override public FileVisitResult visitFile(Path actualLocalFile, BasicFileAttributes attrs) throws IOException { String relativeFilePath = FileUtil.getRelativeDatabasePath(root.toFile(), actualLocalFile.toFile()); //root.relativize(actualLocalFile).toString(); - + // Skip Syncany root folder if (actualLocalFile.toFile().equals(config.getLocalDir())) { return FileVisitResult.CONTINUE; } - + // Skip .syncany (or app related acc. to config) - boolean isAppRelatedDir = - actualLocalFile.toFile().equals(config.getAppDir()) - || actualLocalFile.toFile().equals(config.getCache()) - || actualLocalFile.toFile().equals(config.getDatabaseDir()) - || actualLocalFile.toFile().equals(config.getLogDir()); - + boolean isAppRelatedDir = actualLocalFile.toFile().equals(config.getAppDir()) + || actualLocalFile.toFile().equals(config.getCache()) + || actualLocalFile.toFile().equals(config.getDatabaseDir()) + || actualLocalFile.toFile().equals(config.getLogDir()); + if (isAppRelatedDir) { logger.log(Level.FINEST, "- Ignoring file (syncany app-related): {0}", relativeFilePath); return FileVisitResult.SKIP_SUBTREE; } - + // Check if file is locked boolean fileLocked = FileUtil.isFileLocked(actualLocalFile.toFile()); - + if (fileLocked) { - logger.log(Level.FINEST, "- Ignoring file (locked): {0}", relativeFilePath); + logger.log(Level.FINEST, "- Ignoring file (locked): {0}", relativeFilePath); return FileVisitResult.CONTINUE; - } - + } + // Check database by file path FileVersion expectedLastFileVersion = currentFileTree.get(relativeFilePath); - - if (expectedLastFileVersion != null) { + + if (expectedLastFileVersion != null) { // Compare boolean forceChecksum = options != null && options.isForceChecksum(); - FileVersionComparison fileVersionComparison = fileVersionComparator.compare(expectedLastFileVersion, actualLocalFile.toFile(), forceChecksum); - + FileVersionComparison fileVersionComparison = fileVersionComparator.compare(expectedLastFileVersion, actualLocalFile.toFile(), + forceChecksum); + if (fileVersionComparison.areEqual()) { changeSet.getUnchangedFiles().add(relativeFilePath); } else { changeSet.getChangedFiles().add(relativeFilePath); - } + } } else { - if (!config.getIgnoredFiles().isFileIgnored(relativeFilePath)) { + if (!config.getIgnoredFiles().isFileIgnored(relativeFilePath, actualLocalFile.toFile().getName())) { changeSet.getNewFiles().add(relativeFilePath); - logger.log(Level.FINEST, "- New file: "+relativeFilePath); + logger.log(Level.FINEST, "- New file: " + relativeFilePath); } else { logger.log(Level.FINEST, "- Ignoring file; " + relativeFilePath); return FileVisitResult.SKIP_SUBTREE; } - } - + } + // Check if file is symlink directory boolean isSymlinkDir = attrs.isDirectory() && attrs.isSymbolicLink(); - + if (isSymlinkDir) { logger.log(Level.FINEST, " + File is sym. directory. Skipping subtree."); return FileVisitResult.SKIP_SUBTREE; @@ -228,8 +229,9 @@ public FileVisitResult visitFile(Path actualLocalFile, BasicFileAttributes attrs return FileVisitResult.CONTINUE; } } - - @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { return visitFile(dir, attrs); } diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationOptions.java index ff7b4cea..6e19dca1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationResult.java index 1a1481c4..90414db1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/status/StatusOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/up/BlockingTransfersException.java b/core/syncany-lib/src/main/java/org/syncany/operations/up/BlockingTransfersException.java index 9b5d5b37..d6ac073a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/up/BlockingTransfersException.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/up/BlockingTransfersException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/up/Indexer.java b/core/syncany-lib/src/main/java/org/syncany/operations/up/Indexer.java index f20a70c5..ce083e08 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/up/Indexer.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/up/Indexer.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperation.java index 9247ce76..aae105c2 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -106,6 +106,11 @@ public class UpOperation extends AbstractTransferOperation { private UpOperationResult result; private SqlDatabase localDatabase; + + private boolean resuming; + private TransactionRemoteFile transactionRemoteFileToResume; + private Collection remoteTransactionsToResume; + private BlockingQueue databaseVersionQueue; public UpOperation(Config config) { this(config, new UpOperationOptions()); @@ -117,6 +122,11 @@ public UpOperation(Config config, UpOperationOptions options) { this.options = options; this.result = new UpOperationResult(); this.localDatabase = new SqlDatabase(config); + + this.resuming = false; + this.transactionRemoteFileToResume = null; + this.remoteTransactionsToResume = null; + this.databaseVersionQueue = new LinkedBlockingQueue<>(); } @Override @@ -135,82 +145,28 @@ public UpOperationResult execute() throws Exception { // Upload action file (lock for cleanup) startOperation(); - TransactionRemoteFile transactionRemoteFileToResume = null; - Collection remoteTransactionsToResume = null; - - BlockingQueue databaseVersionQueue = new LinkedBlockingQueue<>(); - boolean resuming = false; - - if (options.isResume()) { - Collection versionsToResume = transferManager.loadPendingTransactionList(); - if (versionsToResume != null && versionsToResume.size() != 0) { - logger.log(Level.INFO, "Found local transaction to resume."); - logger.log(Level.INFO, "Attempting to find transactionRemoteFile"); - - remoteTransactionsToResume = attemptResumeTransactions(versionsToResume); - Collection remoteDatabaseVersionsToResume = attemptResumeDatabaseVersions(versionsToResume); - - if (remoteDatabaseVersionsToResume != null && remoteTransactionsToResume != null && - remoteDatabaseVersionsToResume.size() == remoteTransactionsToResume.size()) { - databaseVersionQueue.addAll(remoteDatabaseVersionsToResume); - resuming = true; - } - // Add stopping marker - databaseVersionQueue.add(new DatabaseVersion()); - - try { - transactionRemoteFileToResume = attemptResumeTransactionRemoteFile(); - } - catch (BlockingTransfersException e) { - stopBecauseOfBlockingTransactions(); - return result; - } - } - else { - transferManager.clearResumableTransactions(); + try { + if (options.isResume()) { + prepareResume(); } - } - if (!resuming) { - // Get a list of files that have been updated - ChangeSet localChanges = result.getStatusResult().getChangeSet(); - List locallyUpdatedFiles = extractLocallyUpdatedFiles(localChanges); - List locallyDeletedFiles = extractLocallyDeletedFiles(localChanges); - // Iterate over the changes, deduplicate, and feed DatabaseVersions into an iterator - Deduper deduper = new Deduper(config.getChunker(), config.getMultiChunker(), config.getTransformer(), options.getTransactionSizeLimit(), - options.getTransactionFileLimit()); - - AsyncIndexer asyncIndexer = new AsyncIndexer(config, deduper, locallyUpdatedFiles, locallyDeletedFiles, databaseVersionQueue); - new Thread(asyncIndexer).start(); - } - - // If we are not resuming from a remote transaction, we need to clean transactions. - if (transactionRemoteFileToResume == null) { - try { - transferManager.cleanTransactions(); - } - catch (BlockingTransfersException e) { - stopBecauseOfBlockingTransactions(); - return result; + if (!resuming) { + startIndexerThread(databaseVersionQueue); } - } - int numberOfPerformedTransactions = 0; - if (resuming) { - numberOfPerformedTransactions = executeTransactions(databaseVersionQueue, remoteTransactionsToResume.iterator(), transactionRemoteFileToResume); + // If we are not resuming from a remote transaction, we need to clean transactions. + if (transactionRemoteFileToResume == null) { + transferManager.cleanTransactions(); + } } - else { - numberOfPerformedTransactions = executeTransactions(databaseVersionQueue); + catch (BlockingTransfersException e) { + stopBecauseOfBlockingTransactions(); + return result; } - // Check if anything has happened. - if (numberOfPerformedTransactions == 0) { - logger.log(Level.INFO, "Local database is up-to-date. NOTHING TO DO!"); - result.setResultCode(UpResultCode.OK_NO_CHANGES); - } else { - logger.log(Level.INFO, "Sync up done."); - result.setResultCode(UpResultCode.OK_CHANGES_UPLOADED); - } + // Go wild + int numberOfPerformedTransactions = executeTransactions(); + updateResult(numberOfPerformedTransactions); // Close database connection localDatabase.finalize(); @@ -218,17 +174,62 @@ public UpOperationResult execute() throws Exception { // Finish 'up' before 'cleanup' starts finishOperation(); fireEndEvent(); + return result; } - /** - * Transfers the given {@link DatabaseVersion} objects to the remote. - * Each {@link DatabaseVersion} will be transferred in its own {@link RemoteTransaction} object. - * - * @param databaseVersions The {@link DatabaseVersion} objects to send to the remote. - */ - private int executeTransactions(BlockingQueue databaseVersionQueue) throws Exception { - return executeTransactions(databaseVersionQueue, null, null); + private void updateResult(int numberOfPerformedTransactions) { + if (numberOfPerformedTransactions == 0) { + logger.log(Level.INFO, "Local database is up-to-date. NOTHING TO DO!"); + result.setResultCode(UpResultCode.OK_NO_CHANGES); + } + else { + logger.log(Level.INFO, "Sync up done."); + result.setResultCode(UpResultCode.OK_CHANGES_UPLOADED); + } + } + + private void startIndexerThread(BlockingQueue databaseVersionQueue) { + // Get a list of files that have been updated + ChangeSet localChanges = result.getStatusResult().getChangeSet(); + List locallyUpdatedFiles = extractLocallyUpdatedFiles(localChanges); + List locallyDeletedFiles = extractLocallyDeletedFiles(localChanges); + + // Iterate over the changes, deduplicate, and feed DatabaseVersions into an iterator + Deduper deduper = new Deduper(config.getChunker(), config.getMultiChunker(), config.getTransformer(), options.getTransactionSizeLimit(), + options.getTransactionFileLimit()); + + AsyncIndexer asyncIndexer = new AsyncIndexer(config, deduper, locallyUpdatedFiles, locallyDeletedFiles, databaseVersionQueue); + new Thread(asyncIndexer, "AsyncI/" + config.getLocalDir().getName()).start(); + } + + private void prepareResume() throws Exception { + Collection versionsToResume = transferManager.loadPendingTransactionList(); + boolean hasVersionsToResume = versionsToResume != null && versionsToResume.size() > 0; + + if (hasVersionsToResume) { + logger.log(Level.INFO, "Found local transaction to resume."); + logger.log(Level.INFO, "Attempting to find transactionRemoteFile"); + + remoteTransactionsToResume = attemptResumeTransactions(versionsToResume); + Collection remoteDatabaseVersionsToResume = attemptResumeDatabaseVersions(versionsToResume); + + resuming = remoteDatabaseVersionsToResume != null && remoteTransactionsToResume != null && + remoteDatabaseVersionsToResume.size() == remoteTransactionsToResume.size(); + + if (resuming) { + databaseVersionQueue.addAll(remoteDatabaseVersionsToResume); + databaseVersionQueue.add(new DatabaseVersion()); // Empty database version is the stopping marker + + transactionRemoteFileToResume = attemptResumeTransactionRemoteFile(); + } + else { + transferManager.clearResumableTransactions(); + } + } + else { + transferManager.clearResumableTransactions(); + } } /** @@ -246,16 +247,9 @@ private int executeTransactions(BlockingQueue databaseVersionQu * @param remoteTransactionsToResume {@link RemoteTransaction} objects that correspond to the given {@link DatabaseVersion} objects. * @param transactionRemoteFileToResume The file on the remote that was used for the specific transaction that was interrupted. */ - private int executeTransactions(BlockingQueue databaseVersionQueue, Iterator remoteTransactionsToResume, - TransactionRemoteFile transactionRemoteFileToResume) - throws Exception { + private int executeTransactions() throws Exception { + Iterator remoteTransactionsToResumeIterator = (resuming) ? remoteTransactionsToResume.iterator() : null; - boolean resuming = true; - - if (remoteTransactionsToResume == null) { - resuming = false; - } - // At this point, if a failure occurs from which we can resume, new transaction files will be written // Delete any old transaction files transferManager.clearPendingTransactions(); @@ -267,14 +261,17 @@ private int executeTransactions(BlockingQueue databaseVersionQu DatabaseVersion databaseVersion = databaseVersionQueue.take(); boolean noDatabaseVersions = databaseVersion.isEmpty(); + // Add dirty data to first database addDirtyData(databaseVersion); // while (!databaseVersion.isEmpty()) { RemoteTransaction remoteTransaction = null; + if (!resuming) { VectorClock newVectorClock = findNewVectorClock(); + databaseVersion.setVectorClock(newVectorClock); databaseVersion.setTimestamp(new Date()); databaseVersion.setClient(config.getMachineName()); @@ -283,11 +280,12 @@ private int executeTransactions(BlockingQueue databaseVersionQu // Add multichunks to transaction logger.log(Level.INFO, "Uploading new multichunks ..."); + // This call adds newly changed chunks to a "RemoteTransaction", so they can be uploaded later. addMultiChunksToTransaction(remoteTransaction, databaseVersion.getMultiChunks()); } else { - remoteTransaction = remoteTransactionsToResume.next(); + remoteTransaction = remoteTransactionsToResumeIterator.next(); } logger.log(Level.INFO, "Uploading database: " + databaseVersion); @@ -395,6 +393,7 @@ private TransactionRemoteFile attemptResumeTransactionRemoteFile() throws Storag else { transactionRemoteFile = transactions.get(0); } + return transactionRemoteFile; } @@ -674,6 +673,7 @@ private void addMultiChunksToTransaction(RemoteTransaction remoteTransaction, Co private void addLocalDatabaseToTransaction(RemoteTransaction remoteTransaction, File localDatabaseFile, DatabaseRemoteFile remoteDatabaseFile) throws InterruptedException, StorageException { + logger.log(Level.INFO, "- Uploading " + localDatabaseFile + " to " + remoteDatabaseFile + " ..."); remoteTransaction.upload(localDatabaseFile, remoteDatabaseFile); } @@ -727,56 +727,70 @@ private VectorClock findNewVectorClock() { return newVectorClock; } - private Collection attemptResumeTransactions(Collection versions) throws Exception { - Collection remoteTransactions = new ArrayList<>(); - for (Long version : versions) { - File transactionFile = config.getTransactionFile(version); + private Collection attemptResumeTransactions(Collection versions) { + try { + Collection remoteTransactions = new ArrayList<>(); - // If a single transaction file is missing, we should restart - if (!transactionFile.exists()) { - return null; - } + for (Long version : versions) { + File transactionFile = config.getTransactionFile(version); + + // If a single transaction file is missing, we should restart + if (!transactionFile.exists()) { + return null; + } - TransactionTO transactionTO = TransactionTO.load(null, transactionFile); + TransactionTO transactionTO = TransactionTO.load(null, transactionFile); - // Verify if all files needed are in cache. - for (ActionTO action : transactionTO.getActions()) { - if (action.getType() == ActionType.UPLOAD) { - if (action.getStatus() == ActionStatus.UNSTARTED) { - if (!action.getLocalTempLocation().exists()) { - // Unstarted upload has no cached local copy, abort - return null; + // Verify if all files needed are in cache. + for (ActionTO action : transactionTO.getActions()) { + if (action.getType() == ActionType.UPLOAD) { + if (action.getStatus() == ActionStatus.UNSTARTED) { + if (!action.getLocalTempLocation().exists()) { + // Unstarted upload has no cached local copy, abort + return null; + } } } } - } - remoteTransactions.add(new RemoteTransaction(config, transferManager, transactionTO)); + remoteTransactions.add(new RemoteTransaction(config, transferManager, transactionTO)); + } + + return remoteTransactions; + } catch (Exception e) { + logger.log(Level.WARNING, "Invalid transaction file. Cannot resume!"); + return null; } - return remoteTransactions; } private Collection attemptResumeDatabaseVersions(Collection versions) throws Exception { - Collection databaseVersions = new ArrayList<>(); - for (Long version : versions) { - File databaseFile = config.getTransactionDatabaseFile(version); + try { + Collection databaseVersions = new ArrayList<>(); + + for (Long version : versions) { + File databaseFile = config.getTransactionDatabaseFile(version); - // If a single database file is missing, we should restart - if (!databaseFile.exists()) { - return null; - } + // If a single database file is missing, we should restart + if (!databaseFile.exists()) { + return null; + } - DatabaseXmlSerializer databaseSerializer = new DatabaseXmlSerializer(); - MemoryDatabase memoryDatabase = new MemoryDatabase(); - databaseSerializer.load(memoryDatabase, databaseFile, null, null, DatabaseReadType.FULL); + DatabaseXmlSerializer databaseSerializer = new DatabaseXmlSerializer(); + MemoryDatabase memoryDatabase = new MemoryDatabase(); + databaseSerializer.load(memoryDatabase, databaseFile, null, null, DatabaseReadType.FULL); - if (memoryDatabase.getDatabaseVersions().size() == 0) { - return null; - } + if (memoryDatabase.getDatabaseVersions().size() == 0) { + return null; + } - databaseVersions.add(memoryDatabase.getLastDatabaseVersion()); + databaseVersions.add(memoryDatabase.getLastDatabaseVersion()); + } + + return databaseVersions; + } catch (Exception e) { + logger.log(Level.WARNING, "Cannot load database versions from 'state'. Cannot resume."); + return null; } - return databaseVersions; } /** diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationOptions.java index a6e856a0..4d0db3b0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationResult.java index 6f2a8004..49fb4fe2 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/up/UpOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfo.java b/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfo.java index fab324d5..ba916616 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfo.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfo.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfoResponse.java b/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfoResponse.java index 929459aa..cb70d929 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfoResponse.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/update/AppInfoResponse.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperation.java index 42503f3d..112f94aa 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationAction.java b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationAction.java index 2c6a9d4e..dae4719e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationAction.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationOptions.java index db93a687..7b899b1b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationResult.java index ade88c3a..b4016826 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/update/UpdateOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/DefaultRecursiveWatcher.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/DefaultRecursiveWatcher.java index 0646cda4..93fb8906 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/DefaultRecursiveWatcher.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/DefaultRecursiveWatcher.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/NotificationListener.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/NotificationListener.java index fe15cfc3..db9ed9b8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/NotificationListener.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/NotificationListener.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/RecursiveWatcher.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/RecursiveWatcher.java index 591405e4..b23290e1 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/RecursiveWatcher.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/RecursiveWatcher.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java index b0aa7e64..3fd14bee 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationOptions.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationOptions.java index b09a1c36..2ca9c3ab 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationResult.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationResult.java index 0ae13bd2..80c450eb 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperationResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WindowsRecursiveWatcher.java b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WindowsRecursiveWatcher.java index 7ca71ff0..4a4d634b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/operations/watch/WindowsRecursiveWatcher.java +++ b/core/syncany-lib/src/main/java/org/syncany/operations/watch/WindowsRecursiveWatcher.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/Plugin.java b/core/syncany-lib/src/main/java/org/syncany/plugins/Plugin.java index 92bcd03c..1c60523c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/Plugin.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/Plugin.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/Plugins.java b/core/syncany-lib/src/main/java/org/syncany/plugins/Plugins.java index ece0c3ee..f836529c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/Plugins.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/Plugins.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/UserInteractionListener.java b/core/syncany-lib/src/main/java/org/syncany/plugins/UserInteractionListener.java index 5a730e49..361d405a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/UserInteractionListener.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/UserInteractionListener.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferManager.java index 1422059b..4c76d77a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -229,7 +229,7 @@ public Map list(Class remoteFileClass) thro } catch (StorageException e) { logger.log(Level.INFO, "Cannot create instance of " + remoteFileClass.getSimpleName() + " for file " + path - + "; maybe invalid file name pattern. Ignoring file.", e); + + "; maybe invalid file name pattern. Ignoring file."); } } } diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferPlugin.java b/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferPlugin.java index 1cd31eb0..b059de20 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferPlugin.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferPlugin.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferSettings.java b/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferSettings.java index f22c3720..1f273ed0 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferSettings.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferSettings.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/AbstractTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/AbstractTransferManager.java index 9c1d8f5b..e447087c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/AbstractTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/AbstractTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Encrypted.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Encrypted.java index bfaaeadf..8afa58d2 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Encrypted.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Encrypted.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/FileType.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/FileType.java index a767a5cf..3ed676bf 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/FileType.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/FileType.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/NestedTransferPluginOption.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/NestedTransferPluginOption.java index 7bc21e65..3256ef9d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/NestedTransferPluginOption.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/NestedTransferPluginOption.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/RemoteTransaction.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/RemoteTransaction.java index d549f588..97d29c70 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/RemoteTransaction.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/RemoteTransaction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Setup.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Setup.java index ac428453..25f3ea5c 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Setup.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/Setup.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageException.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageException.java index 29436e1a..edeaa994 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageException.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageFileNotFoundException.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageFileNotFoundException.java index 480329da..7dcdf3ce 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageFileNotFoundException.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageFileNotFoundException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageMoveException.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageMoveException.java index bea2b3a9..c8d7faa7 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageMoveException.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageMoveException.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageTestResult.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageTestResult.java index b5a2e9ec..98191cdf 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageTestResult.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/StorageTestResult.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManager.java index 64d2032b..8052401e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManagerFactory.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManagerFactory.java index 16b54db1..44c76170 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManagerFactory.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManagerFactory.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPlugin.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPlugin.java index bf363626..a23ba4d2 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPlugin.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPlugin.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOption.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOption.java index c1cf92c3..2ef62c3a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOption.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOption.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionCallback.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionCallback.java index da8bfb6b..2db2bda8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionCallback.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionCallback.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionConverter.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionConverter.java index 83b4caf3..10cdd211 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionConverter.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptionConverter.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptions.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptions.java index dfd225ef..3ea75388 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptions.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginOptions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginUtil.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginUtil.java index 3c9c162e..e94c2832 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginUtil.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferPluginUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferSettings.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferSettings.java index ef092189..c301c33a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferSettings.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferSettings.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Feature.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Feature.java index e6802286..900fdc6f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Feature.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Feature.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureExtension.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureExtension.java index 97beeebc..ae55c456 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureExtension.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureExtension.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureTransferManager.java index 4a63d892..e9708579 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/FeatureTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAware.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAware.java index 0c2c39cb..d298d70e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAware.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAware.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureExtension.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureExtension.java index 098716fc..3cb85f3a 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureExtension.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureExtension.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureTransferManager.java index 990b245a..43efa688 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/PathAwareFeatureTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistent.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistent.java index 33950107..c0b27a40 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistent.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistent.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureExtension.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureExtension.java index 1a101720..54519dff 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureExtension.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureExtension.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureTransferManager.java index 9cae79f5..d8b3d4f5 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/ReadAfterWriteConsistentFeatureTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Retriable.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Retriable.java index 766704bb..297dcf20 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Retriable.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/Retriable.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/RetriableFeatureTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/RetriableFeatureTransferManager.java index ddcf62e1..f434c774 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/RetriableFeatureTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/RetriableFeatureTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAware.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAware.java index cfa5c2dc..9934efb5 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAware.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAware.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAwareFeatureTransferManager.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAwareFeatureTransferManager.java index bc5c5827..b8ec4a2d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAwareFeatureTransferManager.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/features/TransactionAwareFeatureTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -279,16 +279,25 @@ public void clearPendingTransactions() throws IOException { */ public Collection loadPendingTransactionList() throws IOException { Objects.requireNonNull(config, "Cannot read pending transaction list if config is null."); + Collection databaseVersionNumbers = new ArrayList<>(); File transactionListFile = config.getTransactionListFile(); + if (!transactionListFile.exists()) { return Collections.emptyList(); } Collection transactionLines = Files.readAllLines(transactionListFile.toPath(), Charset.forName("UTF-8")); + for (String transactionLine : transactionLines) { - databaseVersionNumbers.add(Long.parseLong(transactionLine)); + try { + databaseVersionNumbers.add(Long.parseLong(transactionLine)); + } catch (NumberFormatException e) { + logger.log(Level.WARNING, "Cannot parse line in transaction list: " + transactionLine + ". Cannot resume."); + return Collections.emptyList(); + } } + return databaseVersionNumbers; } diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/ActionRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/ActionRemoteFile.java index a4d37801..f3ac0365 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/ActionRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/ActionRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/CleanupRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/CleanupRemoteFile.java index d9b35f3a..e746f9b5 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/CleanupRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/CleanupRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/DatabaseRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/DatabaseRemoteFile.java index a09f0a82..7c8f8b2e 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/DatabaseRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/DatabaseRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MasterRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MasterRemoteFile.java index c900a835..64c71885 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MasterRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MasterRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MultichunkRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MultichunkRemoteFile.java index 94064b8e..f33a746f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MultichunkRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/MultichunkRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFile.java index d95b4121..7308fed8 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFileAttributes.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFileAttributes.java index 8b4a57a8..3ec13bed 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFileAttributes.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/RemoteFileAttributes.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/SyncanyRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/SyncanyRemoteFile.java index 0159fde2..66e34129 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/SyncanyRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/SyncanyRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TempRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TempRemoteFile.java index 6688260a..000e64aa 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TempRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TempRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TransactionRemoteFile.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TransactionRemoteFile.java index f6471030..7d501be3 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TransactionRemoteFile.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/files/TransactionRemoteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuth.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuth.java index c4ae2576..2351b357 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuth.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuth.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuthGenerator.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuthGenerator.java index 7e539d15..65bdb74f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuthGenerator.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/oauth/OAuthGenerator.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/ActionTO.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/ActionTO.java index c5b9f683..2fb1783d 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/ActionTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/ActionTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/TransactionTO.java b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/TransactionTO.java index a1858d74..41d2fbed 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/TransactionTO.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/transfer/to/TransactionTO.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java b/core/syncany-lib/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java index 8d73ed20..5437a62b 100644 --- a/core/syncany-lib/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java +++ b/core/syncany-lib/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/main/java/org/syncany/util/SqlRunner.java b/core/syncany-lib/src/main/java/org/syncany/util/SqlRunner.java index e4a2cd5e..18893f8f 100644 --- a/core/syncany-lib/src/main/java/org/syncany/util/SqlRunner.java +++ b/core/syncany-lib/src/main/java/org/syncany/util/SqlRunner.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningTestSuite.java index f877a748..c93e4b57 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningWithEncryptionTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningWithEncryptionTestSuite.java index cc4a183e..0aacca68 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningWithEncryptionTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllExceptLongRunningWithEncryptionTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllTestSuite.java index 11e97f77..f1fb6f10 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/AllTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/DaemonTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/DaemonTestSuite.java index e1faaf05..aa5f18df 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/DaemonTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/DaemonTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/DatabaseTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/DatabaseTestSuite.java index 4588c360..869ba94c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/DatabaseTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/DatabaseTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/LongRunningTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/LongRunningTestSuite.java index 2c7a6bf5..29ec9b99 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/LongRunningTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/LongRunningTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/OperationTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/OperationTestSuite.java index b027b562..ca382da2 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/OperationTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/OperationTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/OtherShortTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/OtherShortTestSuite.java index a8a38df1..47ef0b12 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/OtherShortTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/OtherShortTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/ScenarioTestSuite.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/ScenarioTestSuite.java index f24be0dc..8b37800c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/ScenarioTestSuite.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/ScenarioTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,6 +48,8 @@ import org.syncany.tests.integration.scenarios.Issue303ScenarioTest; import org.syncany.tests.integration.scenarios.Issue316ScenarioTest; import org.syncany.tests.integration.scenarios.Issue374Pre1965DateScenarioTest; +import org.syncany.tests.integration.scenarios.Issue429ScenarioTest; +import org.syncany.tests.integration.scenarios.Issue520NoResumeOnCorruptXmlScenarioTest; import org.syncany.tests.integration.scenarios.ManyRenamesScenarioTest; import org.syncany.tests.integration.scenarios.ManySyncUpsAndDatabaseFileCleanupScenarioTest; import org.syncany.tests.integration.scenarios.ManySyncUpsAndOtherClientSyncDownScenarioTest; @@ -94,6 +96,7 @@ Issue303ScenarioTest.class, Issue316ScenarioTest.class, Issue374Pre1965DateScenarioTest.class, + Issue520NoResumeOnCorruptXmlScenarioTest.class, ManyRenamesScenarioTest.class, ManySyncUpsAndDatabaseFileCleanupScenarioTest.class, ManySyncUpsLargeFileScenarioTest.class, diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/BasicWatchServerTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/BasicWatchServerTest.java index 13b8fe59..85c396f0 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/BasicWatchServerTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/BasicWatchServerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/NoCliRequestsWhileSyncingTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/NoCliRequestsWhileSyncingTest.java index 456d1100..b9755dcd 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/NoCliRequestsWhileSyncingTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/daemon/NoCliRequestsWhileSyncingTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/DatabaseReconciliatorTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/DatabaseReconciliatorTest.java index 5c8ba7b4..23bee13a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/DatabaseReconciliatorTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/DatabaseReconciliatorTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/FileVersionComparatorTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/FileVersionComparatorTest.java index 6e9d31d6..ed260d30 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/FileVersionComparatorTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/FileVersionComparatorTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/MemoryDatabaseCacheTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/MemoryDatabaseCacheTest.java index 9a6cf895..01e0f3ee 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/MemoryDatabaseCacheTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/MemoryDatabaseCacheTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/PartialFileHistoryTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/PartialFileHistoryTest.java index 513c549a..1296e9ed 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/PartialFileHistoryTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/PartialFileHistoryTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ApplicationDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ApplicationDaoTest.java index f750d659..9f3df57b 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ApplicationDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ApplicationDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ChunkDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ChunkDaoTest.java index 8614c9c9..a22c0a12 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ChunkDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/ChunkDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/DatabaseVersionDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/DatabaseVersionDaoTest.java index 268b39da..c673a694 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/DatabaseVersionDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/DatabaseVersionDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileContentDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileContentDaoTest.java index f3a84b11..bd05cd52 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileContentDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileContentDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileVersionDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileVersionDaoTest.java index 8140f37b..366eaac7 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileVersionDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/FileVersionDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/MultiChunkDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/MultiChunkDaoTest.java index 8ab2db3f..c04c6e98 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/MultiChunkDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/MultiChunkDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/XmlDatabaseDaoTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/XmlDatabaseDaoTest.java index 5e0d7277..b3c2c3f9 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/XmlDatabaseDaoTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/database/dao/XmlDatabaseDaoTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/AssemblerTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/AssemblerTest.java index d862793c..eb716a3a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/AssemblerTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/AssemblerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/CleanupOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/CleanupOperationTest.java index a29b9761..8251f4e5 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/CleanupOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/CleanupOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/ConnectOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/ConnectOperationTest.java index 834bfdd0..2d3fe00a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/ConnectOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/ConnectOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionComparatorTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionComparatorTest.java index 1648abc1..c19be8b1 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionComparatorTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionComparatorTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -83,7 +83,7 @@ private DeleteFileSystemAction createDeleteFileSystemAction(String path, FileTyp private NewFileSystemAction createNewFileSystemAction(String path, FileType type) throws Exception { FileVersion firstFileVersion = createFileVersion(path, type); - return new NewFileSystemAction(createDummyConfig(), firstFileVersion, null); + return new NewFileSystemAction(createDummyConfig(), null, null, firstFileVersion); } private RenameFileSystemAction createRenameFileSystemAction(String fromPath, String toPath, FileType type) throws Exception { diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionReconciliatorTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionReconciliatorTest.java index 82ec7f42..85b491a6 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionReconciliatorTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/FileSystemActionReconciliatorTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/IndexerTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/IndexerTest.java index 847600c3..31587cc8 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/IndexerTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/IndexerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/InitOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/InitOperationTest.java index 09af2e0c..146de128 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/InitOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/InitOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/LogOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/LogOperationTest.java index cac1359f..5135a0e5 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/LogOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/LogOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/NotificationListenerTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/NotificationListenerTest.java index 92ed838f..9f0e5a2a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/NotificationListenerTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/NotificationListenerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/OperationPerformanceTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/OperationPerformanceTest.java index 92881bca..6b2aafb2 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/OperationPerformanceTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/OperationPerformanceTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/PluginOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/PluginOperationTest.java index 2ddd4755..ca74d57e 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/PluginOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/PluginOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/RecursiveWatcherTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/RecursiveWatcherTest.java index d6fb4e7c..4ff88f83 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/RecursiveWatcherTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/RecursiveWatcherTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/StatusOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/StatusOperationTest.java index 52f5aea6..f3261ff1 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/StatusOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/StatusOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpOperationTest.java index 776ff972..fceb297d 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpdateOperationTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpdateOperationTest.java index 4f3a19e1..f72d4846 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpdateOperationTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/operations/UpdateOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/AbstractTransferManagerTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/AbstractTransferManagerTest.java index f20e7fe0..c669247e 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/AbstractTransferManagerTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/AbstractTransferManagerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginOptionsTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginOptionsTest.java index 1a728271..2ac1e42b 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginOptionsTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginOptionsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginsTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginsTest.java index 5cb18ccc..f234f014 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginsTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/PluginsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/TransferSettingsTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/TransferSettingsTest.java index ce2c665f..be31ecc7 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/TransferSettingsTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/TransferSettingsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/local/LocalTransferManagerPluginTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/local/LocalTransferManagerPluginTest.java index ce3e9a70..022e14bb 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/local/LocalTransferManagerPluginTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/local/LocalTransferManagerPluginTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/CleanupInterruptedTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/CleanupInterruptedTest.java index d290b830..1fc354aa 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/CleanupInterruptedTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/CleanupInterruptedTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/UploadInterruptedTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/UploadInterruptedTest.java index 088cfcec..7a0228f0 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/UploadInterruptedTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/plugins/unreliable_local/UploadInterruptedTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/AllFilePossibilitiesScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/AllFilePossibilitiesScenarioTest.java index 60f09af2..4a14f505 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/AllFilePossibilitiesScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/AllFilePossibilitiesScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CallUpWhileStillWritingFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CallUpWhileStillWritingFileScenarioTest.java index b759ed7b..3f2719d9 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CallUpWhileStillWritingFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CallUpWhileStillWritingFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedAttributesScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedAttributesScenarioTest.java index 9cc0ae8c..e0e63872 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedAttributesScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedAttributesScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedModifiedDateScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedModifiedDateScenarioTest.java index 1308f7b9..68ad915c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedModifiedDateScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedModifiedDateScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedTypeScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedTypeScenarioTest.java index 2dee4516..e069d66a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedTypeScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ChangedTypeScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CleanupMergeDatabaseFilesScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CleanupMergeDatabaseFilesScenarioTest.java index 9ba73078..39a1d066 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CleanupMergeDatabaseFilesScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CleanupMergeDatabaseFilesScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CreateSimilarFileParallelScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CreateSimilarFileParallelScenarioTest.java index 6ba58416..3fd69176 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CreateSimilarFileParallelScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/CreateSimilarFileParallelScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseScenarioTest.java index a6f3e89d..c35504e2 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseVersionsScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseVersionsScenarioTest.java index 4921e7eb..b3c31928 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseVersionsScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DirtyDatabaseVersionsScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DoSameActionAtTwoClientsTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DoSameActionAtTwoClientsTest.java index 8ab233a7..9aee2883 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DoSameActionAtTwoClientsTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/DoSameActionAtTwoClientsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFileScenarioTest.java index 71dd35df..721c31ad 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFolderScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFolderScenarioTest.java index b99bc2cf..0c43f4d4 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFolderScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EmptyFolderScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EvilCUpWithoutDownScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EvilCUpWithoutDownScenarioTest.java index c8f90855..c2097382 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EvilCUpWithoutDownScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/EvilCUpWithoutDownScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileLockedScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileLockedScenarioTest.java index 7cd5a73f..dcbd69db 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileLockedScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileLockedScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileTreeMoveToSubfolderScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileTreeMoveToSubfolderScenarioTest.java index 7e6ddb56..a8340de9 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileTreeMoveToSubfolderScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileTreeMoveToSubfolderScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileVanishedScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileVanishedScenarioTest.java index 8f76a433..3204dd1b 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileVanishedScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FileVanishedScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FilenameCapitalizationWindowsScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FilenameCapitalizationWindowsScenarioTest.java index b205ea1e..33cababc 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FilenameCapitalizationWindowsScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FilenameCapitalizationWindowsScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FirstVersionDirtyScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FirstVersionDirtyScenarioTest.java index 4a89f2e9..35a39791 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FirstVersionDirtyScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FirstVersionDirtyScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FolderPermissionChangeScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FolderPermissionChangeScenarioTest.java index cba7b0f6..256487d5 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FolderPermissionChangeScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/FolderPermissionChangeScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IdenticalFileMoveScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IdenticalFileMoveScenarioTest.java index 3d684e31..ff6b34a9 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IdenticalFileMoveScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IdenticalFileMoveScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IgnoredFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IgnoredFileScenarioTest.java index 3f399443..cfeacbf0 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IgnoredFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/IgnoredFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.FileInputStream; import org.junit.Test; import org.syncany.config.Config; @@ -30,28 +31,28 @@ import org.syncany.tests.util.TestConfigUtil; public class IgnoredFileScenarioTest { - + @Test public void testIgnoredFileBasic() throws Exception { // Scenario: A ignores a file, creates it then ups, B should not have the file - - // Setup + + // Setup File tempDir = TestFileUtil.createTempDirectoryInSystemTemp(); - - TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); + + TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); TestClient clientA = new TestClient("A", testConnection); TestClient clientB = new TestClient("B", testConnection); - + //Create ignore file and reload it File syncanyIgnore = clientA.getLocalFile(Config.FILE_IGNORE); TestFileUtil.createFileWithContent(syncanyIgnore, "ignoredfile.txt"); clientA.getConfig().getIgnoredFiles().loadPatterns(); - + // A new/up - clientA.createNewFile("ignoredfile.txt"); + clientA.createNewFile("ignoredfile.txt"); clientA.createNewFile("nonignoredfile.txt"); clientA.up(); - + clientB.down(); // The ignored file should not exist at B @@ -59,14 +60,14 @@ public void testIgnoredFileBasic() throws Exception { assertTrue(clientA.getLocalFile("nonignoredfile.txt").exists()); assertFalse(clientB.getLocalFile("ignoredfile.txt").exists()); assertTrue(clientB.getLocalFile("nonignoredfile.txt").exists()); - + //Delete ignore file and reload patterns TestFileUtil.deleteFile(syncanyIgnore); clientA.getConfig().getIgnoredFiles().loadPatterns(); clientA.up(); - + clientB.down(); - + // All files should be synced assertTrue(clientA.getLocalFile("ignoredfile.txt").exists()); assertTrue(clientA.getLocalFile("nonignoredfile.txt").exists()); @@ -77,96 +78,151 @@ public void testIgnoredFileBasic() throws Exception { clientB.deleteTestData(); TestFileUtil.deleteDirectory(tempDir); } - + + @Test + public void testIgnoredFileBasicRecursive() throws Exception { + // Scenario: A ignores a file, creates it then ups, B should not have the file + + // Setup + File tempDir = TestFileUtil.createTempDirectoryInSystemTemp(); + + TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); + TestClient clientA = new TestClient("A", testConnection); + TestClient clientB = new TestClient("B", testConnection); + + //Create ignore file and reload it + File syncanyIgnore = clientA.getLocalFile(Config.FILE_IGNORE); + TestFileUtil.createFileWithContent(syncanyIgnore, "ignoredfile.txt"); + clientA.getConfig().getIgnoredFiles().loadPatterns(); + + // A new/up + clientA.createNewFile("ignoredfile.txt"); + clientA.createNewFile("nonignoredfile.txt"); + clientA.createNewFolder("sub"); + clientA.createNewFileInFolder("ignoredfile.txt", "sub"); + clientA.up(); + + clientB.down(); + + // The ignored file should not exist at B + assertTrue(clientA.getLocalFile("ignoredfile.txt").exists()); + assertTrue(clientA.getLocalFile("nonignoredfile.txt").exists()); + assertTrue(clientA.getLocalFile("sub").exists()); + assertTrue(clientA.getLocalFileInFolder("ignoredfile.txt", "sub").exists()); + assertFalse(clientB.getLocalFile("ignoredfile.txt").exists()); + assertTrue(clientB.getLocalFile("nonignoredfile.txt").exists()); + assertTrue(clientB.getLocalFile("sub").exists()); + assertFalse(clientB.getLocalFileInFolder("ignoredfile.txt", "sub").exists()); + + //Delete ignore file and reload patterns + TestFileUtil.deleteFile(syncanyIgnore); + clientA.getConfig().getIgnoredFiles().loadPatterns(); + clientA.up(); + + clientB.down(); + + // All files should be synced + assertTrue(clientA.getLocalFile("ignoredfile.txt").exists()); + assertTrue(clientA.getLocalFile("nonignoredfile.txt").exists()); + assertTrue(clientA.getLocalFile("sub").exists()); + assertTrue(clientA.getLocalFileInFolder("ignoredfile.txt", "sub").exists()); + assertTrue(clientB.getLocalFile("ignoredfile.txt").exists()); + assertTrue(clientB.getLocalFile("nonignoredfile.txt").exists()); + assertTrue(clientB.getLocalFile("sub").exists()); + assertTrue(clientB.getLocalFileInFolder("ignoredfile.txt", "sub").exists()); + // Tear down + clientA.deleteTestData(); + clientB.deleteTestData(); + TestFileUtil.deleteDirectory(tempDir); + } + @Test public void testIgnoredFileRegex() throws Exception { // Scenario: A ignores files with a regular expression, creates it then ups, B should not have the file // Setup File tempDir = TestFileUtil.createTempDirectoryInSystemTemp(); - - TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); + + TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); TestClient clientA = new TestClient("A", testConnection); TestClient clientB = new TestClient("B", testConnection); - + //Create ignore file and reload it File syncanyIgnore = clientA.getLocalFile(Config.FILE_IGNORE); TestFileUtil.createFileWithContent(syncanyIgnore, "regex:.*.bak"); clientA.getConfig().getIgnoredFiles().loadPatterns(); - + // A new/up - clientA.createNewFile("ignoredfile.bak"); + clientA.createNewFile("ignoredfile.bak"); clientA.up(); - + clientB.down(); // The ignored file should not exist at B assertTrue(clientA.getLocalFile("ignoredfile.bak").exists()); assertFalse(clientB.getLocalFile("ignoredfile.bak").exists()); - - + // Tear down clientA.deleteTestData(); clientB.deleteTestData(); TestFileUtil.deleteDirectory(tempDir); } - + @Test public void testIgnoredDirectory() throws Exception { // Scenario: A ignores files with a regular expression, creates it then ups, B should not have the file // Setup File tempDir = TestFileUtil.createTempDirectoryInSystemTemp(); - - TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); + + TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); TestClient clientA = new TestClient("A", testConnection); TestClient clientB = new TestClient("B", testConnection); - + //Create ignore file and reload it File syncanyIgnore = clientA.getLocalFile(Config.FILE_IGNORE); TestFileUtil.createFileWithContent(syncanyIgnore, "builds"); clientA.getConfig().getIgnoredFiles().loadPatterns(); - + // A new/up clientA.createNewFolder("builds"); clientA.createNewFile("builds/test.txt"); clientA.up(); - + clientB.down(); // The ignored file should not exist at B assertTrue(clientA.getLocalFile("builds/test.txt").exists()); assertFalse(clientB.getLocalFile("builds/test.txt").exists()); - - + // Tear down clientA.deleteTestData(); clientB.deleteTestData(); TestFileUtil.deleteDirectory(tempDir); } - + @Test public void testIgnoredFileWildcard() throws Exception { // Scenario: A ignores files using wildcards, creates it then ups, B should not have the file // Setup File tempDir = TestFileUtil.createTempDirectoryInSystemTemp(); - - TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); + + TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); TestClient clientA = new TestClient("A", testConnection); TestClient clientB = new TestClient("B", testConnection); - + //Create ignore file and reload it File syncanyIgnore = clientA.getLocalFile(Config.FILE_IGNORE); TestFileUtil.createFileWithContent(syncanyIgnore, "*.bak\nignoredarchive.r??"); clientA.getConfig().getIgnoredFiles().loadPatterns(); - + // A new/up - clientA.createNewFile("ignoredfile.bak"); + clientA.createNewFile("ignoredfile.bak"); clientA.createNewFile("nonignoredfile.bar"); - clientA.createNewFile("ignoredarchive.r01"); + clientA.createNewFile("ignoredarchive.r01"); clientA.up(); - + clientB.down(); // The ignored file should not exist at B @@ -176,7 +232,7 @@ public void testIgnoredFileWildcard() throws Exception { assertTrue(clientB.getLocalFile("nonignoredfile.bar").exists()); assertTrue(clientA.getLocalFile("ignoredarchive.r01").exists()); assertFalse(clientB.getLocalFile("ignoredarchive.r01").exists()); - + // Tear down clientA.deleteTestData(); clientB.deleteTestData(); diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue143ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue143ScenarioTest.java index 44b67018..a6116e5f 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue143ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue143ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue200ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue200ScenarioTest.java index fe4f8f58..1a63400d 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue200ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue200ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue227_2_ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue227_2_ScenarioTest.java index 81b614ea..f316e123 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue227_2_ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue227_2_ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue247ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue247ScenarioTest.java index 85531a7f..59bbfb03 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue247ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue247ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue288ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue288ScenarioTest.java index 6475814f..48cd7d87 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue288ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue288ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue303ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue303ScenarioTest.java index 64a34dea..d5086718 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue303ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue303ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue316ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue316ScenarioTest.java index e3b136ce..81da7e57 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue316ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue316ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue374Pre1965DateScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue374Pre1965DateScenarioTest.java index 1c6ff38f..a39a518c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue374Pre1965DateScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue374Pre1965DateScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue429ScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue429ScenarioTest.java index aa3c5084..3da070da 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue429ScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue429ScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue520NoResumeOnCorruptXmlScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue520NoResumeOnCorruptXmlScenarioTest.java new file mode 100644 index 00000000..22c2705e --- /dev/null +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/Issue520NoResumeOnCorruptXmlScenarioTest.java @@ -0,0 +1,77 @@ +/* + * Syncany, www.syncany.org + * Copyright (C) 2011-2016 Philipp C. Heckel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.syncany.tests.integration.scenarios; + +import java.io.File; + +import org.junit.Test; +import org.syncany.plugins.local.LocalTransferSettings; +import org.syncany.tests.unit.util.TestFileUtil; +import org.syncany.tests.util.TestAssertUtil; +import org.syncany.tests.util.TestClient; +import org.syncany.tests.util.TestConfigUtil; + +import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class Issue520NoResumeOnCorruptXmlScenarioTest { + @Test + public void testCorruptTransactionListFile() throws Exception { + // Setup + LocalTransferSettings testConnection = (LocalTransferSettings) TestConfigUtil.createTestLocalConnection(); + + TestClient clientA = new TestClient("A", testConnection); + + clientA.createNewFile("file1.txt", 1024); + clientA.upWithForceChecksum(); + + TestFileUtil.createFileWithContent(new File(clientA.getConfig().getAppDir(), "/state/transaction-list.txt"), "INVALID"); + + clientA.createNewFile("file2.txt", 1024); + clientA.upWithForceChecksum(); // This did FAIL due to an XML parsing exception + + assertEquals("There should be exactly two database files", 2, new File(testConnection.getPath() + "/databases").listFiles().length); + assertEquals("There should be exactly two multichunks", 2, new File(testConnection.getPath() + "/multichunks").listFiles().length); + + // Tear down + clientA.deleteTestData(); + } + + @Test + public void testCorruptTransactionFile() throws Exception { + // Setup + LocalTransferSettings testConnection = (LocalTransferSettings) TestConfigUtil.createTestLocalConnection(); + + TestClient clientA = new TestClient("A", testConnection); + + clientA.createNewFile("file1.txt", 1024); + clientA.upWithForceChecksum(); + + TestFileUtil.createFileWithContent(new File(clientA.getConfig().getAppDir(), "/state/transaction-list.txt"), "0000000001"); + TestFileUtil.createFileWithContent(new File(clientA.getConfig().getAppDir(), "/state/transaction-database.0000000001.xml"), "invalid"); + + clientA.createNewFile("file2.txt", 1024); + clientA.upWithForceChecksum(); // This did FAIL due to an XML parsing exception + + assertEquals("There should be exactly two database files", 2, new File(testConnection.getPath() + "/databases").listFiles().length); + assertEquals("There should be exactly two multichunks", 2, new File(testConnection.getPath() + "/multichunks").listFiles().length); + + // Tear down + clientA.deleteTestData(); + } +} diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManyRenamesScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManyRenamesScenarioTest.java index 41f637f6..1c43884a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManyRenamesScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManyRenamesScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndDatabaseFileCleanupScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndDatabaseFileCleanupScenarioTest.java index 2b175553..5003bec3 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndDatabaseFileCleanupScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndDatabaseFileCleanupScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndOtherClientSyncDownScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndOtherClientSyncDownScenarioTest.java index 0c4d3c06..84519fca 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndOtherClientSyncDownScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsAndOtherClientSyncDownScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsLargeFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsLargeFileScenarioTest.java index 921fea41..7dd769bd 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsLargeFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/ManySyncUpsLargeFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MixedUpDownScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MixedUpDownScenarioTest.java index c4d1b2e0..6b64e254 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MixedUpDownScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MixedUpDownScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MoveFolderWithQuotesOnWindowsScenario.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MoveFolderWithQuotesOnWindowsScenario.java index 72c77b7f..d492ee7c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MoveFolderWithQuotesOnWindowsScenario.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/MoveFolderWithQuotesOnWindowsScenario.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameDeleteScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameDeleteScenarioTest.java index 8d1ba719..ab4eb6cf 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameDeleteScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameDeleteScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameFileWithDiffModifiedDateScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameFileWithDiffModifiedDateScenarioTest.java index 3512800c..72cc78c6 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameFileWithDiffModifiedDateScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameFileWithDiffModifiedDateScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameNoDownloadMultiChunksScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameNoDownloadMultiChunksScenarioTest.java index 558a53fc..81283fe0 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameNoDownloadMultiChunksScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameNoDownloadMultiChunksScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameToExistingFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameToExistingFileScenarioTest.java index 53c131d0..241c146b 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameToExistingFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RenameToExistingFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestoreFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestoreFileScenarioTest.java index a185996d..397bd88e 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestoreFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestoreFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ public void testRestoreDeletedFile() throws Exception { } @Test - public void testRestoreDeletedFileWithTargetFile() throws Exception { + public void testRestoreDeletedFileWithTargetFile() throws Exception { // Setup File tempDir = TestFileUtil.createTempDirectoryInSystemTemp(); TransferSettings testConnection = TestConfigUtil.createTestLocalConnection(); diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestrictedXmlCharInFilenameScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestrictedXmlCharInFilenameScenarioTest.java index ddf7621a..de902390 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestrictedXmlCharInFilenameScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/RestrictedXmlCharInFilenameScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFileNoConflictsScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFileNoConflictsScenarioTest.java index 3fb6fde3..1a129665 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFileNoConflictsScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFileNoConflictsScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFolderNoConflictsScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFolderNoConflictsScenarioTest.java index 7c30ab25..f39ce561 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFolderNoConflictsScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SingleFolderNoConflictsScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SymlinkSyncScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SymlinkSyncScenarioTest.java index 5513f8f3..e3b8bdc4 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SymlinkSyncScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/SymlinkSyncScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/AbstractClientAction.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/AbstractClientAction.java index c7764ffa..3155a9e8 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/AbstractClientAction.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/AbstractClientAction.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeContentWithoutFileSize.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeContentWithoutFileSize.java index 5c05de14..30632047 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeContentWithoutFileSize.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeContentWithoutFileSize.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeFileSize.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeFileSize.java index 633dfb9f..711e04ff 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeFileSize.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeFileSize.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeLastModifiedDate.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeLastModifiedDate.java index afd06b08..3e15cc4f 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeLastModifiedDate.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeLastModifiedDate.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFile.java index 3c0c0783..09dc141b 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFolder.java index 8389d35b..a29edcaa 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangePermissionsOfFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeSymlinkTarget.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeSymlinkTarget.java index fd1a7d1d..dc4d02a4 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeSymlinkTarget.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeSymlinkTarget.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToFolder.java index d7ae5cc8..7701acd4 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithNonExistingTarget.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithNonExistingTarget.java index 61857ce3..4087e5cc 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithNonExistingTarget.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithNonExistingTarget.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFile.java index 73458a79..ebc41d60 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFolder.java index 0f0bdb6d..2759136b 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFileToSymlinkWithTargetFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToFile.java index 4ab2aa4a..40dcfca3 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithNonExistingTarget.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithNonExistingTarget.java index 67ac7280..922a63ff 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithNonExistingTarget.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithNonExistingTarget.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFile.java index d7d1b7ae..7109511a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFolder.java index 8e5e9c65..fb20e041 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeFolderToSymlinkWithTargetFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFile.java index 382c0fdb..aaf6e070 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFolder.java index 2a3ed091..882914ca 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithNonExistingTargetToFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFile.java index 25111e6c..f40205d8 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFolder.java index 6c88c48c..2feb633e 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFileToFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFile.java index 36642e53..563c73ad 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFolder.java index ed655e12..f4e86938 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ChangeTypeSymlinkWithTargetFolderToFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ClientActions.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ClientActions.java index 2436f942..4e9cbd72 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ClientActions.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/ClientActions.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFile.java index 8ed36255..eec0ade4 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFileTree.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFileTree.java index bd454434..99b6190a 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFileTree.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFileTree.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFolder.java index f906c064..7360006c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFile.java index 605b9a83..6b1343fe 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFolder.java index 7bd92aff..7282f5fe 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToNonExisting.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToNonExisting.java index e496ee0e..36258e19 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToNonExisting.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/CreateSymlinkToNonExisting.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFile.java index f9555d44..0a583bb9 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFolder.java index 9e47f458..32a4b6a7 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/DeleteFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/Executable.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/Executable.java index 92ff30d3..8a0e7002 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/Executable.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/Executable.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/LockFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/LockFile.java index b78a3fd1..ebf9503d 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/LockFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/LockFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileToOtherFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileToOtherFolder.java index 11f8d320..762d39f0 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileToOtherFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileToOtherFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileWithinFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileWithinFolder.java index 7dc83772..36b235f1 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileWithinFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFileWithinFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderToOtherFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderToOtherFolder.java index 7d71a873..0b631e15 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderToOtherFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderToOtherFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderWithinFolder.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderWithinFolder.java index d9d2956d..98f8cb7f 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderWithinFolder.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/MoveFolderWithinFolder.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/UnlockFile.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/UnlockFile.java index 023fb83e..a47bff03 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/UnlockFile.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/framework/UnlockFile.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLargeFileScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLargeFileScenarioTest.java index 976959c9..e311c02c 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLargeFileScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLargeFileScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLotsOfSmallFilesScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLotsOfSmallFilesScenarioTest.java index 44c6554a..934f8f7d 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLotsOfSmallFilesScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningLotsOfSmallFilesScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningNewAndDeleteScenarioTest.java b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningNewAndDeleteScenarioTest.java index 7e6353ca..0c6f5bea 100644 --- a/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningNewAndDeleteScenarioTest.java +++ b/core/syncany-lib/src/test/integration/java/org/syncany/tests/integration/scenarios/longrunning/LongRunningNewAndDeleteScenarioTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferManager.java b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferManager.java index 9a83f522..84fb5991 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferManager.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferPlugin.java b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferPlugin.java index 70ee8001..10e007df 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferPlugin.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferPlugin.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferSettings.java b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferSettings.java index d228f01f..a1f8d357 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferSettings.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/dummy/DummyTransferSettings.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferManager.java b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferManager.java index 0dcbce05..934d1d46 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferManager.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferManager.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferPlugin.java b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferPlugin.java index 2301cbb0..b4d1a17b 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferPlugin.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferPlugin.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferSettings.java b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferSettings.java index f0ad6401..8747fe3f 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferSettings.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/plugins/unreliable_local/UnreliableLocalTransferSettings.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FixedOffsetChunkerTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FixedOffsetChunkerTest.java index 5e0d945b..b6d3109e 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FixedOffsetChunkerTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FixedOffsetChunkerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FrameworkCombinationTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FrameworkCombinationTest.java index 4ad9d215..1a367605 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FrameworkCombinationTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/FrameworkCombinationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/MultiChunkerTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/MultiChunkerTest.java index dcd62610..4df940e7 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/MultiChunkerTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/MultiChunkerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/TTTDChunkerTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/TTTDChunkerTest.java index 72395323..fa549dfc 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/TTTDChunkerTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/chunk/TTTDChunkerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/CacheTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/CacheTest.java index 40d74557..f036e6be 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/CacheTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/CacheTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigHelperTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigHelperTest.java index f15f742b..ad26789e 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigHelperTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigHelperTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigTest.java index b26ac661..c107fc4a 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/config/ConfigTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/AesGcmWithBcInputStreamTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/AesGcmWithBcInputStreamTest.java index cd7dea61..065b363c 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/AesGcmWithBcInputStreamTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/AesGcmWithBcInputStreamTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSessionTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSessionTest.java index 3e0d8b88..5f32e97d 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSessionTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSessionTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSpecsTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSpecsTest.java index f27e4848..26fb29c1 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSpecsTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherSpecsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilMasterKeyCreationTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilMasterKeyCreationTest.java index b0ef08fa..7e97f24a 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilMasterKeyCreationTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilMasterKeyCreationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilTest.java index 5b08fc75..4e79baac 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/CipherUtilTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/ListAvailableCryptoPropertiesTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/ListAvailableCryptoPropertiesTest.java index 31cc6f14..4dd2505f 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/ListAvailableCryptoPropertiesTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/ListAvailableCryptoPropertiesTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/MultiCipherStreamsTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/MultiCipherStreamsTest.java index 03d0f89c..5c0611fc 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/MultiCipherStreamsTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/crypto/MultiCipherStreamsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/ObjectIdTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/ObjectIdTest.java index 0ffb9301..12d59ba4 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/ObjectIdTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/ObjectIdTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/VectorClockTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/VectorClockTest.java index cd5b1c8e..3415706d 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/VectorClockTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/database/VectorClockTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/ControlServerTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/ControlServerTest.java index 2811c5eb..67e57571 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/ControlServerTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/ControlServerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationOptionsTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationOptionsTest.java index 8c14c466..7fd7a0b2 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationOptionsTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationOptionsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationResultTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationResultTest.java index ad135eda..18daa54a 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationResultTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationResultTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationTest.java index bed8c42f..7e265ed3 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/DaemonOperationTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/JsonMessageFactoryTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/JsonMessageFactoryTest.java index 7f2d955a..3bd8eca9 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/JsonMessageFactoryTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/JsonMessageFactoryTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/WatchTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/WatchTest.java index c86ddc55..a1ac990c 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/WatchTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/WatchTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/XmlMessageFactoryTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/XmlMessageFactoryTest.java index 9a7ecef9..3dbeea2d 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/XmlMessageFactoryTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/daemon/XmlMessageFactoryTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/watch/RecursiveWatcherTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/watch/RecursiveWatcherTest.java index 388e2821..e4a84c6a 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/watch/RecursiveWatcherTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/operations/watch/RecursiveWatcherTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/plugins/transfer/TransferPluginOptionsTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/plugins/transfer/TransferPluginOptionsTest.java index 0c6ea538..b7f50bcf 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/plugins/transfer/TransferPluginOptionsTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/unit/plugins/transfer/TransferPluginOptionsTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/SqlRunnerTest.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/SqlRunnerTest.java index e37d0c80..41c0f7fd 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/SqlRunnerTest.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/SqlRunnerTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestAssertUtil.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestAssertUtil.java index c7e1cc3b..96cdb0ad 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestAssertUtil.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestAssertUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestClient.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestClient.java index 02e4c5eb..6ab5b172 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestClient.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestClient.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ public class TestClient extends Client { private Config config; - + public TestClient(String machineName, TransferSettings connection) throws Exception { Config testConfig = TestConfigUtil.createTestLocalConfig(machineName, connection); @@ -127,8 +127,8 @@ public LogOperationResult log(LogOperationOptions options) throws Exception { } public void watch(WatchOperationOptions options) throws Exception { - new WatchOperation(config, options).execute(); - } + new WatchOperation(config, options).execute(); + } public GenlinkOperationResult genlink(GenlinkOperationOptions options) throws Exception { return new GenlinkOperation(config, options).execute(); @@ -148,7 +148,7 @@ public ConnectOperationResult connect(ConnectOperationOptions options) throws Ex public ConnectOperationResult connect(ConnectOperationOptions options, UserInteractionListener listener) throws Exception, CipherException { - + return new ConnectOperation(options, listener).execute(); } @@ -163,10 +163,11 @@ public CleanupOperationResult cleanup(CleanupOperationOptions options) throws Ex public PluginOperationResult plugin(PluginOperationOptions options) throws Exception { return new PluginOperation(config, options).execute(); } - + public UpdateOperationResult update(UpdateOperationOptions options) throws Exception { return new UpdateOperation(config, options).execute(); } + public UpOperationResult upWithForceChecksum() throws Exception { StatusOperationOptions statusOptions = new StatusOperationOptions(); statusOptions.setForceChecksum(true); @@ -214,6 +215,10 @@ public File createNewFile(String name) throws IOException { return createNewFile(name, 50 * 1024); } + public File createNewFileInFolder(String name, String rootFolder) throws IOException { + return createNewFileInFolder(name, rootFolder, 50 * 1024); + } + public File createNewFile(String name, long size) throws IOException { File localFile = getLocalFile(name); TestFileUtil.createNonRandomFile(localFile, size); @@ -221,6 +226,13 @@ public File createNewFile(String name, long size) throws IOException { return localFile; } + public File createNewFileInFolder(String name, String rootFolder, long size) throws IOException { + File localFile = getLocalFileInFolder(name, rootFolder); + TestFileUtil.createNonRandomFile(localFile, size); + + return localFile; + } + public File createFileWithContent(String name, String content) throws IOException { File localFile = getLocalFile(name); TestFileUtil.createFileWithContent(localFile, content); @@ -268,6 +280,10 @@ public File getLocalFile(String name) { return new File(config.getLocalDir() + "/" + name); } + public File getLocalFileInFolder(String name, String rootFolder) { + return new File(config.getLocalDir() + "/" + rootFolder + "/" + name); + } + public Map getLocalFiles() throws FileNotFoundException { return TestFileUtil.getLocalFiles(config.getLocalDir()); } diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestCollectionUtil.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestCollectionUtil.java index 6d3cea04..5393f643 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestCollectionUtil.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestCollectionUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestConfigUtil.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestConfigUtil.java index ebb6a32f..3456521f 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestConfigUtil.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestConfigUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDaemonUtil.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDaemonUtil.java index 405666b9..979c9b8e 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDaemonUtil.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDaemonUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDatabaseUtil.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDatabaseUtil.java index de9734fa..5dcd378a 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDatabaseUtil.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestDatabaseUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlDatabase.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlDatabase.java index f123f2d3..6e503776 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlDatabase.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlDatabase.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlUtil.java b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlUtil.java index 3de4993e..39a08880 100644 --- a/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlUtil.java +++ b/core/syncany-lib/src/test/unit/java/org/syncany/tests/util/TestSqlUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/CollectionUtil.java b/core/syncany-util/src/main/java/org/syncany/util/CollectionUtil.java index 34dc0817..915f6ebd 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/CollectionUtil.java +++ b/core/syncany-util/src/main/java/org/syncany/util/CollectionUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/EnvironmentUtil.java b/core/syncany-util/src/main/java/org/syncany/util/EnvironmentUtil.java index 6082410e..f910ae5b 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/EnvironmentUtil.java +++ b/core/syncany-util/src/main/java/org/syncany/util/EnvironmentUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/FileUtil.java b/core/syncany-util/src/main/java/org/syncany/util/FileUtil.java index 443329a9..ada1c80d 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/FileUtil.java +++ b/core/syncany-util/src/main/java/org/syncany/util/FileUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/LimitedDosFileAttributes.java b/core/syncany-util/src/main/java/org/syncany/util/LimitedDosFileAttributes.java index 51416ff4..11853c6b 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/LimitedDosFileAttributes.java +++ b/core/syncany-util/src/main/java/org/syncany/util/LimitedDosFileAttributes.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/NormalizedPath.java b/core/syncany-util/src/main/java/org/syncany/util/NormalizedPath.java index b17c953b..624b8563 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/NormalizedPath.java +++ b/core/syncany-util/src/main/java/org/syncany/util/NormalizedPath.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/PidFileUtil.java b/core/syncany-util/src/main/java/org/syncany/util/PidFileUtil.java index a376b9fc..a118bfaf 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/PidFileUtil.java +++ b/core/syncany-util/src/main/java/org/syncany/util/PidFileUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/ReflectionUtil.java b/core/syncany-util/src/main/java/org/syncany/util/ReflectionUtil.java index 32e7ba25..7e579bcb 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/ReflectionUtil.java +++ b/core/syncany-util/src/main/java/org/syncany/util/ReflectionUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/main/java/org/syncany/util/StringUtil.java b/core/syncany-util/src/main/java/org/syncany/util/StringUtil.java index 69d68a8c..9d68ca87 100644 --- a/core/syncany-util/src/main/java/org/syncany/util/StringUtil.java +++ b/core/syncany-util/src/main/java/org/syncany/util/StringUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/integration/java/org/syncany/tests/UtilTestSuite.java b/core/syncany-util/src/test/integration/java/org/syncany/tests/UtilTestSuite.java index 836f6057..181c086b 100644 --- a/core/syncany-util/src/test/integration/java/org/syncany/tests/UtilTestSuite.java +++ b/core/syncany-util/src/test/integration/java/org/syncany/tests/UtilTestSuite.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/Base58Test.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/Base58Test.java index 36052759..2d8aa771 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/Base58Test.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/Base58Test.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/CollectionUtilTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/CollectionUtilTest.java index 68ec748a..0618bac5 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/CollectionUtilTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/CollectionUtilTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/FileUtilTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/FileUtilTest.java index 7e31d682..4c5a09b2 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/FileUtilTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/FileUtilTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedDosFileAttributesTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedDosFileAttributesTest.java index 5396967f..e4e539cb 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedDosFileAttributesTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedDosFileAttributesTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedSortedSetTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedSortedSetTest.java index a8083646..cc5ceab4 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedSortedSetTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/LimitedSortedSetTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/NormalizedPathTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/NormalizedPathTest.java index fd515243..badd634b 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/NormalizedPathTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/NormalizedPathTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/PidFileUtilTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/PidFileUtilTest.java index 936ccbbf..ae484e40 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/PidFileUtilTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/PidFileUtilTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/ReflectionUtilTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/ReflectionUtilTest.java index a19fc5be..b0de6d10 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/ReflectionUtilTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/ReflectionUtilTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/StringUtilTest.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/StringUtilTest.java index 2905a834..16277619 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/StringUtilTest.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/StringUtilTest.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/TestFileUtil.java b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/TestFileUtil.java index e0ee8273..c86a5f05 100644 --- a/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/TestFileUtil.java +++ b/core/syncany-util/src/test/unit/java/org/syncany/tests/unit/util/TestFileUtil.java @@ -1,6 +1,6 @@ /* * Syncany, www.syncany.org - * Copyright (C) 2011-2015 Philipp C. Heckel + * Copyright (C) 2011-2016 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ /** * This class provides file I/O helper methods for writing tests - * + * * @author Philipp Heckel * @author Nikolai Hellwig * @author Andreas Fenske @@ -69,23 +69,23 @@ public static File copyFile(File fromFile, File toFile) throws IOException { toFile.setLastModified(fromFile.lastModified()); // Windows changes last modified when copying file - return toFile; + return toFile; } - + public static File createTempDirectoryInSystemTemp() throws Exception { return createTempDirectoryInSystemTemp("syncanytest"); } public static File getAppTempDir() { String tempDirStr = System.getProperty("org.syncany.test.tmpdir"); - + if (tempDirStr == null) { tempDirStr = System.getProperty("java.io.tmpdir"); } - + return new File(tempDirStr, "syncanytest"); } - + public static File createTempDirectoryInSystemTemp(String prefix) throws Exception { File tempDirectoryInSystemTemp = new File(getAppTempDir() + "/" + prefix); @@ -241,8 +241,8 @@ public static File createRandomFileInDirectory(File rootFolder, long sizeInBytes public static void createNonRandomFile(File fileToCreate, long sizeInBytes) throws IOException { createFile(fileToCreate, sizeInBytes, nonRandomGen); } - - public static void createFileWithContent(File fileToCreate,String content) throws IOException { + + public static void createFileWithContent(File fileToCreate, String content) throws IOException { if (fileToCreate != null && fileToCreate.exists()) { throw new IOException("File already exists"); } @@ -335,7 +335,7 @@ public static Map getLocalFiles(File root, FileFilter filter) thro * Replaces the {@link File#canRead() canRead()} method in the {@link File} class by taking * symlinks into account. Returns true if a symlink exists even if its target file * does not exist and can hence not be read. - * + * * @param file A file * @return Returns true if the file can be read (or the symlink exists), false otherwise */ @@ -346,15 +346,15 @@ public static boolean canRead(File file) { else { return file.canRead(); } - } - + } + public static void writeToFile(byte[] bytes, File file) throws IOException { FileOutputStream outputStream = new FileOutputStream(file); - + IOUtils.copy(new ByteArrayInputStream(bytes), outputStream); outputStream.close(); } - + public static String getBasename(String filename) { int dot = filename.lastIndexOf("."); @@ -364,7 +364,6 @@ public static String getBasename(String filename) { return filename.substring(0, dot); } - public static List getRecursiveFileList(File root) throws FileNotFoundException { return getRecursiveFileList(root, false, false);