From 37a12b9db0d05cd536992b9117d82d12ae2c86d7 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Thu, 13 Oct 2016 12:13:35 +0200 Subject: [PATCH] 1.26e --- src/megabasterd/Download.java | 1 - src/megabasterd/Transference.java | 1 + src/megabasterd/Upload.java | 10 ++-------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/megabasterd/Download.java b/src/megabasterd/Download.java index 31aa641f6..ffbe548b7 100644 --- a/src/megabasterd/Download.java +++ b/src/megabasterd/Download.java @@ -54,7 +54,6 @@ import static megabasterd.MiscTools.truncateText; public final class Download implements Transference, Runnable, SecureNotifiable { public static final boolean VERIFY_CBC_MAC_DEFAULT=false; - public static final boolean USE_SLOTS_DEFAULT = false; public static final Object CBC_LOCK=new Object(); private final MainPanel _main_panel; diff --git a/src/megabasterd/Transference.java b/src/megabasterd/Transference.java index 25f28ccae..b94976bca 100644 --- a/src/megabasterd/Transference.java +++ b/src/megabasterd/Transference.java @@ -11,6 +11,7 @@ public interface Transference { int MIN_WORKERS = 2; int MAX_WORKERS = 20; int MAX_SIM_TRANSFERENCES=20; + boolean USE_SLOTS_DEFAULT = false; int WORKERS_DEFAULT = 4; int SIM_TRANSFERENCES_DEFAULT=2; boolean LIMIT_TRANSFERENCE_SPEED_DEFAULT=false; diff --git a/src/megabasterd/Upload.java b/src/megabasterd/Upload.java index d9d749dc8..ab5d29a01 100644 --- a/src/megabasterd/Upload.java +++ b/src/megabasterd/Upload.java @@ -33,9 +33,7 @@ import static megabasterd.MiscTools.truncateText; * @author tonikelope */ public final class Upload implements Transference, Runnable, SecureNotifiable { - - public static final boolean USE_SLOTS_DEFAULT = true; - + private final MainPanel _main_panel; private UploadView _view=null; //lazy init private SpeedMeter _speed_meter=null; //lazy init @@ -53,7 +51,7 @@ public final class Upload implements Transference, Runnable, SecureNotifiable { private long _last_chunk_id_dispatched; private final ConcurrentLinkedQueue _partialProgressQueue; private final ExecutorService _thread_pool; - private volatile int[] _file_meta_mac; + private int[] _file_meta_mac; private boolean _finishing_upload; private String _fid; private boolean _notified; @@ -154,10 +152,6 @@ public final class Upload implements Transference, Runnable, SecureNotifiable { return _thread_pool; } - public int[] getFile_meta_mac() { - return _file_meta_mac; - } - public String getFid() { return _fid; }