Possibly fix the nr. of ':' being too big in labels

Author: GenieTim

labels.pdf

@@ -50,7 +50,7 @@
         <tns:NewLine>false</tns:NewLine>
         <tns:FontSize>12</tns:FontSize>
         <tns:DefaultValue></tns:DefaultValue>
-        <tns:Suffix>:</tns:Suffix>
+<!--        <tns:Suffix>:</tns:Suffix>-->
     </tns:FieldInList>
     <tns:FieldInList>
         <tns:Label>Subfamily</tns:Label>
@@ -62,7 +62,7 @@
         <tns:NewLine>false</tns:NewLine>
         <tns:FontSize>12</tns:FontSize>
         <tns:DefaultValue></tns:DefaultValue>
-        <tns:Suffix>:</tns:Suffix>
+<!--        <tns:Suffix>:</tns:Suffix>-->
     </tns:FieldInList>
     <tns:FieldInList>
         <tns:Label>Tribe</tns:Label>

src/edu/harvard/mcz/precapture/resources/ETHZ_PrecaptureFields.xml

@@ -240,10 +240,10 @@ public PdfPCell toPDFCell(LabelDefinitionType printDefinition) {
         boolean added = false;
         boolean hasContent = false;
         for (int i = 0; i < fields.size(); i++) {
-            log.debug(i);
+            log.debug("Handling field #" + i);
             if (fields.get(i).getField().isNewLine() || (i == fields.size() - 1)) {
                 if (!higher.isEmpty()) {
-                    log.debug(higher.getContent());
+                    log.debug("Higher has content: " + higher.getContent());
                     cell.addElement(higher);
                 }
                 leading = (int) (fields.get(i).getField().getFontSize() + printDefinition.getFontDelta() + fontIncrement) - 1;
@@ -255,9 +255,10 @@ public PdfPCell toPDFCell(LabelDefinitionType printDefinition) {
                 added = false;
                 hasContent = false;
             }
-            log.debug(fields.get(i).getTextField().getText().trim());
 
             String text = fields.get(i).getTextField().getText().trim();
+            log.debug("Text of field #" + i + ": " + text);
+
             if (!text.equals("")
                     && !fields.get(i).getField().getVocabularyTerm().equals("dwc:specificEpithet")
                     && !fields.get(i).getField().getVocabularyTerm().equals("dwc:subspecificEpithet")
@@ -270,6 +271,7 @@ public PdfPCell toPDFCell(LabelDefinitionType printDefinition) {
                     && !text.equals("")
                     && !text.trim().endsWith(":")
                     && !fields.get(i + 1).getTextField().getText().trim().equals("")) {
+                log.debug("Adding : for field: " + fields.get(i).getField().getVocabularyTerm() + " with text: " + text);
                 text = text + ":";
             }
 
@@ -292,8 +294,9 @@ public PdfPCell toPDFCell(LabelDefinitionType printDefinition) {
                 higher.setSpacingBefore(lineSpacing);
                 higher.setSpacingAfter(lineSpacing);
                 higher.add(chunk);
-                log.debug(fields.get(i).getField().getSuffix());
-                if (fields.get(i).getField().getSuffix() != null && fields.get(i).getField().getSuffix().length() > 0) {
+                String suffix = fields.get(i).getField().getSuffix();
+                log.debug("Field " + i + " has suffix: " + suffix);
+                if (suffix != null && suffix.length() > 0) {
                     higher.add(new Chunk(fields.get(i).getField().getSuffix()));
                 }
                 if (fields.get(i).getTextField().getText().trim().length() > 0) {
@@ -303,9 +306,10 @@ public PdfPCell toPDFCell(LabelDefinitionType printDefinition) {
             }
         }
         if (!added) {
-            log.debug(higher.getContent());
+            log.debug("Not added. Higher content: " + higher.getContent());
             cell.addElement(higher);
         }
+        log.debug("Assembled text: " + higher.toString());
 		/*String extraText = PreCaptureSingleton.getInstance().getProperties().getProperties().getProperty(PreCaptureProperties.KEY_EXTRAHUMANTEXT);
 		if (extraText!=null && extraText.length()>0) { 
 			log.debug(extraText);

src/edu/harvard/mcz/precapture/ui/ContainerLabel.java

@@ -152,10 +152,10 @@ protected void filter(String enteredText, boolean changePopupState) {
                 }
             }
             log.debug("Filtered down to " + arrayWithFilter.size() + " entities.");
-            UnitTrayLabelComboBoxModel oldModel = (UnitTrayLabelComboBoxModel) this.getModel();
-            oldModel.removeAllElements();
+            UnitTrayLabelComboBoxModel currentModel = (UnitTrayLabelComboBoxModel) this.getModel();
+            currentModel.removeAllElements();
             for (UnitTrayLabel label : arrayWithFilter) {
-                oldModel.addElement(label);
+                currentModel.addElement(label);
                 if (label.toString().equalsIgnoreCase(enteredText)) {
                     isExactMatch = true;
                     this.getModel().setSelectedItem(label);