From 00dd67e345524df0cbaee2407d5fde296d2929ab Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Tue, 21 Jul 2020 15:16:53 +0200
Subject: [PATCH] Refactoring

---
 .../cryptomator/common/vaults/VaultStats.java | 20 +++++++++----------
 main/ui/src/main/resources/fxml/stats.fxml    |  6 +++---
 .../resources/fxml/vault_detail_unlocked.fxml |  1 -
 .../main/resources/i18n/strings.properties    |  4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 7b83a8a8c..c3b3cc5ab 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -64,17 +64,17 @@ public class VaultStats {
 
 	private void updateStats(Optional<CryptoFileSystemStats> stats) {
 		assert Platform.isFxApplicationThread();
-		bytesPerSecondRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0l));
-		bytesPerSecondWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0l));
+		bytesPerSecondRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0L));
+		bytesPerSecondWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0L));
 		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
-		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l));
-		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l));
-		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0l));
-		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0l));
-		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesEncrypted).orElse(0l));
-		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesDecrypted).orElse(0l));
-		filesRead.set(stats.map(CryptoFileSystemStats::pollAmountOfFilesRead).orElse(0l));
-		filesWritten.set(stats.map(CryptoFileSystemStats::pollAmountOfFilesWritten).orElse(0l));
+		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0L));
+		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0L));
+		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0L));
+		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0L));
+		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesEncrypted).orElse(0L));
+		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesDecrypted).orElse(0L));
+		filesRead.set(stats.map(CryptoFileSystemStats::pollAmountOfAccessesRead).orElse(0L));
+		filesWritten.set(stats.map(CryptoFileSystemStats::pollAmountOfAccessesWritten).orElse(0L));
 
 	}
 
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index 75482e2ab..97446ac70 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -16,7 +16,7 @@
 <HBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.stats.VaultStatisticsController"
-	  prefWidth="1000.0" spacing="12">
+	  prefWidth="800.0" spacing="12">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
@@ -36,7 +36,7 @@
 	</VBox>
 
 	<!-- Read -->
-	<VBox prefWidth="400" prefHeight="200">
+	<VBox prefWidth="300" prefHeight="300">
 		<HBox spacing="12" alignment="CENTER">
 			<Label styleClass="label-large" text="%stats.readDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
@@ -71,7 +71,7 @@
 	</VBox>
 
 	<!-- Write -->
-	<VBox prefWidth="400" prefHeight="200">
+	<VBox prefWidth="300" prefHeight="300">
 		<HBox alignment="CENTER">
 			<Label styleClass="label-large" text="%stats.writtenDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index fbc257e56..9f360afcf 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -5,7 +5,6 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailUnlockedController"
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 4a03ffb21..859186671 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -169,8 +169,8 @@ stats.totalMiBRead=Total Read:
 stats.totalMiBWritten=Total Written: 
 stats.totalMiBEncrypted=Total Encypted: 
 stats.totalMiBDecrypted=Total Decrypted: 
-stats.totalReads=%s Files Read
-stats.totalWrites=%s Files Written
+stats.totalReads=%s Number of Reads
+stats.totalWrites=%s Number of Writes
 stats.data.bytes=%s Bytes
 stats.data.kiB=%.1f KiB
 stats.data.miB=%.1f MiB