Former-commit-id: f890d1abb16ea2c5de32d77d05f94040c222274a

iterate-ch · Dec 17, 2012 · 223442b · 223442b
1 parent ed31575
commit 223442b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/source/ch/cyberduck/core/Preferences.java b/source/ch/cyberduck/core/Preferences.java
@@ -463,8 +463,6 @@ protected void setDefaults() {
          */
         defaults.put("queue.download.bandwidth.bytes", String.valueOf(-1));
 
-        defaults.put("speedometer.overall", String.valueOf(true));
-
         /**
          * While downloading, update the icon of the downloaded file as a progress indicator
          */

diff --git a/source/ch/cyberduck/core/transfer/Speedometer.java b/source/ch/cyberduck/core/transfer/Speedometer.java
@@ -18,7 +18,6 @@
  *  dkocher@cyberduck.ch
  */
 
-import ch.cyberduck.core.Preferences;
 import ch.cyberduck.core.date.PeriodFormatter;
 import ch.cyberduck.core.date.RemainingPeriodFormatter;
 import ch.cyberduck.core.formatter.SizeFormatter;
@@ -50,11 +49,6 @@ public class Speedometer {
      */
     private long last = 0L;
 
-    /**
-     * Show overall transfer speed or per interval
-     */
-    private boolean overall = Preferences.instance().getBoolean("speedometer.overall");
-
     /**
      * Formatter for remaining time
      */
@@ -71,9 +65,7 @@ protected double getSpeed(final long transferred) {
             final long differential = transferred - last;
             // Remember for next iteration
             last = transferred;
-            if(!overall) {
-                timestamp = System.currentTimeMillis();
-            }
+            timestamp = System.currentTimeMillis();
             // The throughput is usually measured in bits per second
             return (double) differential / elapsed;
         }