From 40d31ff0257b5fe9291d76dd33d5b3568006635b Mon Sep 17 00:00:00 2001
From: Craig Raw <craig@quirk.biz>
Date: Wed, 29 Apr 2020 12:12:30 +0200
Subject: [PATCH] usb keystore importing #2

---
 .../sparrow/keystoreimport/KeystoreImportController.java     | 5 +++--
 .../keystoreimport/{usb-devices.fxml => hw_usb-devices.fxml} | 0
 .../keystoreimport/{usb-error.fxml => hw_usb-error.fxml}     | 0
 .../sparrow/keystoreimport/{usb.fxml => hw_usb.fxml}         | 0
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename src/main/resources/com/sparrowwallet/sparrow/keystoreimport/{usb-devices.fxml => hw_usb-devices.fxml} (100%)
 rename src/main/resources/com/sparrowwallet/sparrow/keystoreimport/{usb-error.fxml => hw_usb-error.fxml} (100%)
 rename src/main/resources/com/sparrowwallet/sparrow/keystoreimport/{usb.fxml => hw_usb.fxml} (100%)

diff --git a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportController.java b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportController.java
index a8f73079..4d417de6 100644
--- a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportController.java
@@ -38,18 +38,19 @@ public class KeystoreImportController implements Initializable {
         this.wallet = wallet;
         importMenu.selectedToggleProperty().addListener((observable, oldValue, selectedToggle) -> {
             KeystoreSource importType = (KeystoreSource) selectedToggle.getUserData();
+            System.out.println(importType);
             setImportPane(importType.toString().toLowerCase());
         });
     }
 
     void showUsbDevices(List<Device> devices) {
-        FXMLLoader loader = setImportPane("usb-devices");
+        FXMLLoader loader = setImportPane("hw_usb-devices");
         UsbDevicesController controller = loader.getController();
         controller.initializeView(devices);
     }
 
     void showUsbError(String message) {
-        FXMLLoader loader = setImportPane("usb-error");
+        FXMLLoader loader = setImportPane("hw_usb-error");
         UsbScanController controller = loader.getController();
         controller.initializeView(message);
     }
diff --git a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/usb-devices.fxml b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml
similarity index 100%
rename from src/main/resources/com/sparrowwallet/sparrow/keystoreimport/usb-devices.fxml
rename to src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml
diff --git a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/usb-error.fxml b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-error.fxml
similarity index 100%
rename from src/main/resources/com/sparrowwallet/sparrow/keystoreimport/usb-error.fxml
rename to src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-error.fxml
diff --git a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/usb.fxml b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb.fxml
similarity index 100%
rename from src/main/resources/com/sparrowwallet/sparrow/keystoreimport/usb.fxml
rename to src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb.fxml