From e48dcc07b0a851243356be162128f2cedf955ac3 Mon Sep 17 00:00:00 2001 From: Pavel Smagin Date: Sat, 9 Feb 2019 10:41:57 +0200 Subject: [PATCH] Delete .idea folder from repository --- .gitignore | 4 +--- .idea/.name | 1 - .idea/codeStyleSettings.xml | 13 ------------- .idea/copyright/profiles_settings.xml | 3 --- .idea/scopes/scope_settings.xml | 5 ----- .../src/main/java/com/turn/ttorrent/Constants.java | 5 ++++- 6 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/scopes/scope_settings.xml diff --git a/.gitignore b/.gitignore index f77703ab3..e64eb55de 100644 --- a/.gitignore +++ b/.gitignore @@ -13,13 +13,11 @@ /.classpath /.project /.settings -/.idea/workspace.xml # Ignore common editor swap files *.swp *.bak *~ -*~ #ignore idea workspace file and idea module files *.iml -.idea/workspace.xml +.idea \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 41d889fca..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -ttorrent \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 9178b389f..000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf337..000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b84..000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/common/src/main/java/com/turn/ttorrent/Constants.java b/common/src/main/java/com/turn/ttorrent/Constants.java index 001bda2e6..00323a641 100644 --- a/common/src/main/java/com/turn/ttorrent/Constants.java +++ b/common/src/main/java/com/turn/ttorrent/Constants.java @@ -24,9 +24,12 @@ * Time: 2:57 PM */ public class Constants { + + + public static final int DEFAULT_ANNOUNCE_INTERVAL_SEC = 15; - public final static int DEFAULT_SOCKET_CONNECTION_TIMEOUT_MILLIS = 100000; + public static final int DEFAULT_SOCKET_CONNECTION_TIMEOUT_MILLIS = 100000; public static final int DEFAULT_CONNECTION_TIMEOUT_MILLIS = 10000; public static final int DEFAULT_MAX_CONNECTION_COUNT = 100;