Use memoization to speed up generation of scientific names on long taxon list

Author: GenieTim

.gitignore

@@ -8,4 +8,6 @@ PreCapture.jar
 target/
 precapturedebug.log
 VESPIDAE_EUMENIDAE_MASARIDAE_authority_file.csv
-precapture.log
+precapture.log
+PRECAPTURE2.trace.db
+PRECAPTURE2.mv.db

PRECAPTURE2.h2.db

@@ -316,7 +316,7 @@ public void setTribe(String tribe) {
 	 * @return the scientificName
 	 */
 	public String getScientificName() {
-	    if (this.scientificName != null && !this.scientificName.equals("")) {
+	    if (this.scientificName != null && !this.scientificName.trim().equals("")) {
             return scientificName;
         }
 	    this.scientificName = UnitTrayLabelLifeCycle.getScientificName(this);

PRECAPTURE2.trace.db

@@ -417,17 +417,22 @@ private QrCode getQRCodeMatrix() throws WriterException {
                 break;
         }
         String data = label.toJSON();
-        byte[] compressedStrBytes = data.getBytes(StandardCharsets.UTF_8);
-        // compress message
+        boolean compress = false;
+        if (compress) {
+            byte[] compressedStrBytes = data.getBytes(StandardCharsets.UTF_8);
+            // compress message
 //        try {
 //            compressedStrBytes = GZipCompressor.compress(data);
 //        } catch (IOException e) {
 //            // fallback to uncompressed
 //            log.error("Failed to compress: " + e.getMessage());
 //            log.error(e);
 //        }
-        // add the bytes to the QR Code
-        qr_writer.addBytes(compressedStrBytes);
+            // add the bytes to the QR Code
+            qr_writer.addBytes(compressedStrBytes);
+        } else {
+            qr_writer.addAutomatic(data);
+        }
         return qr_writer.fixate();
     }
 

PRECAPTURE2?characterEncoding=UTF-8.h2.db

@@ -42,12 +42,15 @@ public class FilteringJComboBox extends JComboBox implements FocusListener {
 
     private String familyLimit;
     private String genusLimit;
+    private UnitTrayLabelComboBoxModel initialModel;
 
     /**
      * Default no argument constructor, constructs a new FilteringJComboBox instance.
      */
     public FilteringJComboBox() {
-        super.setModel(new UnitTrayLabelComboBoxModel());
+        UnitTrayLabelLifeCycle uls = new UnitTrayLabelLifeCycle();
+        initialModel = new UnitTrayLabelComboBoxModel(uls.findAll());
+        super.setModel(initialModel);
         init();
     }
 
@@ -90,18 +93,17 @@ public void resetFilter(boolean changePopupState) {
     protected void filter(String enteredText, boolean changePopupState) {
         if (enteredText == null || enteredText.length() == 0) {
             // If entry is blank, show full list.
-            // TODO: Filter by family/genus.
             UnitTrayLabelLifeCycle uls = new UnitTrayLabelLifeCycle();
-            if (familyLimit == null && genusLimit == null) {
-                super.setModel(new UnitTrayLabelComboBoxModel(uls.findAll()));
+            if ((familyLimit == null || familyLimit.length() == 0) && (genusLimit == null || genusLimit.length() == 0)) {
+                super.setModel(this.initialModel);
             } else {
+                // Filter by family/genus.
                 UnitTrayLabel pattern = new UnitTrayLabel();
                 if (familyLimit != null && familyLimit.length() > 0) {
                     pattern.setFamily(familyLimit);
-                } else {
-                    if (genusLimit != null && genusLimit.length() > 0) {
-                        pattern.setGenus(genusLimit);
-                    }
+                }
+                if (genusLimit != null && genusLimit.length() > 0) {
+                    pattern.setGenus(genusLimit);
                 }
                 super.setModel(new UnitTrayLabelComboBoxModel(uls.findByExample(pattern)));
             }

PRECAPTURE2?characterEncoding=UTF-8.trace.db

@@ -109,7 +109,11 @@ public int getSize() {
     }
 
     public Object getElementAt(int index) {
-        return UnitTrayLabelLifeCycle.getScientificName(model.get(index));
+        if (model.get(index) != null) {
+            return model.get(index).getScientificName();
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -131,7 +135,10 @@ public void removeListDataListener(ListDataListener l) {
     }
 
     public Object getSelectedItem() {
-        return UnitTrayLabelLifeCycle.getScientificName(selectedItem);
+        if (selectedItem != null) {
+            return selectedItem.getScientificName();
+        }
+        return null;
     }
 
     public void setSelectedItem(Object anItem) {