Fix part of #33: update specimen parts table on attribute change

BernhardWebstudio · Jan 27, 2021 · e540683 · e540683
1 parent c1510b6
commit e540683
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 294 deletions.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/SpecimenPartAttribute.java b/src/main/java/edu/harvard/mcz/imagecapture/entity/SpecimenPartAttribute.java
@@ -179,7 +179,7 @@ public Object clone() {
     SpecimenPartAttribute newAttr = new SpecimenPartAttribute(
         null, attributeType, attributeValue,
         attributeUnits, attributeRemark, attributeDeterminer,
-        (Date)attributeDate.clone());
+        attributeDate == null ? null : (Date)attributeDate.clone());
     return newAttr;
   }
 }
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/ui/ButtonEditor.java b/src/main/java/edu/harvard/mcz/imagecapture/ui/ButtonEditor.java
@@ -275,11 +275,7 @@ public void actionPerformed(ActionEvent e) {
           ((PositionTemplateEditor)parentComponent)
               .setTemplate((String)targetId);
         } catch (NoSuchTemplateException e1) {
-          log.error("No such template on button press on a template in list.");
-          log.error("Error", e1);
-          ;
-          log.trace("Trace", e1);
-          ;
+          log.error("No such template on button press on a template in list.", e1);
         }
 
         break;
@@ -332,7 +328,7 @@ public void actionPerformed(ActionEvent e) {
         break;
       case OPEN_SPECIMENPARTATTRIBUTES:
         SpecimenPartAttributeDialog attrDialog =
-            new SpecimenPartAttributeDialog((SpecimenPart)targetId);
+            new SpecimenPartAttributeDialog((SpecimenPart)targetId, parentComponent);
         attrDialog.setVisible(true);
         break;
       }