Minor fixes

wylliec · Feb 28, 2016 · f5a35fc · f5a35fc
1 parent 9eb9b14
commit f5a35fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/keymix/Controller.java b/src/keymix/Controller.java
@@ -60,7 +60,7 @@ public class Controller {
         List<File> files = fileChooser.showOpenMultipleDialog(message.getScene().getWindow());
         if(files != null) {
             importedSounds.addAll(files);
-            message.setText(files.size() + " files were added.");
+            message.setText(files.size() + " file(s) were added.");
         } else {
 
         }
@@ -74,8 +74,10 @@ public class Controller {
 
         Optional<File> result = dialog.showAndWait();
         result.ifPresent(file -> {
-            importedSounds.remove(file);
-            message.setText(file.getName() + " was removed.");
+            if (!file.toString().equals(DEFAULT_OPTION)) {
+                importedSounds.remove(file);
+                message.setText(file.getName() + " was removed.");
+            }
         });
 
         event.consume();

diff --git a/src/keymix/Sample.java b/src/keymix/Sample.java
@@ -3,7 +3,6 @@
 import javafx.scene.media.AudioClip;
 
 import java.io.IOException;
-import java.io.ObjectStreamException;
 import java.io.Serializable;
 
 /**

diff --git a/src/keymix/app.fxml b/src/keymix/app.fxml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>