Fix isssue where Province was not pasted

BernhardWebstudio · May 13, 2021 · 65f079e · 65f079e
1 parent 79752f3
commit 65f079e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/EncryptPassword.java b/src/main/java/edu/harvard/mcz/imagecapture/EncryptPassword.java
@@ -16,6 +16,7 @@ public static void main(String[] args) {
         String passwordToEncrypt = in.nextLine();
         System.out.println("Please enter the password for the encryption");
         String encryptPassword = in.nextLine();
+        in.close();
         AES256TextEncryptor textEncryptor = new AES256TextEncryptor();
         textEncryptor.setPassword(encryptPassword);
         System.out.println(textEncryptor.encrypt(passwordToEncrypt));

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/ui/frame/SpecimenDetailsViewPane.java b/src/main/java/edu/harvard/mcz/imagecapture/ui/frame/SpecimenDetailsViewPane.java
@@ -1648,7 +1648,11 @@ public void setLocationData(String verbatimLoc, String specificLoc, String count
                         ((JTextField) field).setText(value);
                     }
                 } else if (field instanceof JComboBox) {
-                    if (((JComboBox<?>) field).getSelectedItem().toString().trim().equals("") || settings.getProperty(ImageCaptureProperties.KEY_EXCEL_OVERWRITE).equals("true")) {
+                    String content = "";
+                    if (((JComboBox<?>) field).getSelectedItem() != null) {
+                        content = ((JComboBox<?>) field).getSelectedItem().toString();
+                    }
+                    if (content.trim().equals("") || settings.getProperty(ImageCaptureProperties.KEY_EXCEL_OVERWRITE).equals("true")) {
                         ((JComboBox<?>) field).setSelectedItem(value);
                     }
                 }