Merge pull request #1189 from specify/v6.8.03

Update to v6.8.03
specify · Mar 6, 2023 · 945d28f · 945d28f
2 parents bd3da81 + cce5ce9
commit 945d28f
Show file tree

Hide file tree

Showing 30 changed files with 333 additions and 103 deletions.
diff --git a/.install4j/i4jparams.conf b/.install4j/i4jparams.conf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config install4jVersion="5.0.8" install4jBuild="5311" type="windows" archive="false">
-  <general applicationName="Specify" applicationVersion="6.8.02" mediaSetId="176" applicationId="5397-6897-2502-8965" status="LCOK" mediaName="Specify_windows" jreVersion="" minJavaVersion="1.6" publisherName="Biodiversity Research Center, University of Kansas" publisherURL="http://www.specifysoftware.org" jreShared="false" lzmaCompression="false" pack200Compression="false" installerType="1" addOnAppId="" suggestPreviousLocations="false" uninstallerFilename="uninstall" uninstallerDirectory="." defaultInstallationDirectory="{appdir}{/}Specify" />
+  <general applicationName="Specify" applicationVersion="6.8.03" mediaSetId="176" applicationId="5397-6897-2502-8965" status="LCOK" mediaName="Specify_windows" jreVersion="" minJavaVersion="1.6" publisherName="Biodiversity Research Center, University of Kansas" publisherURL="http://www.specifysoftware.org" jreShared="false" lzmaCompression="false" pack200Compression="false" installerType="1" addOnAppId="" suggestPreviousLocations="false" uninstallerFilename="uninstall" uninstallerDirectory="." defaultInstallationDirectory="{appdir}{/}Specify" />
   <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
     <variable id="en" name="English" messageFile="i4j_extf_0_zpmake.utf8" customLocalizationFile="i4j_extf_1_zpmake.utf8" />
     <variable id="pt" name="Portuguese" messageFile="i4j_extf_2_zpmake.utf8" customLocalizationFile="i4j_extf_3_zpmake.utf8" />
   </languages>
   <compilerVariables>
-    <variable name="sys.version" value="6.8.02" />
+    <variable name="sys.version" value="6.8.03" />
     <variable name="sys.shortName" value="Specify" />
     <variable name="sys.fullName" value="Specify" />
     <variable name="sys.publisher" value="Biodiversity Research Center, University of Kansas" />
@@ -114,7 +114,7 @@
                 </void>
               </void>
               <void property="subTitle">
-                <string>Specify 6.8.02 includes the following changes:</string>
+                <string>Specify 6.8.03 includes the following changes:</string>
               </void>
               <void property="title">
                 <string>New This Release</string>
@@ -207,7 +207,7 @@
               <java class="java.beans.XMLDecoder">
                 <object class="com.install4j.runtime.beans.actions.desktop.RegisterAddRemoveAction">
                   <void property="itemName">
-                    <string>Specify 6.8.02</string>
+                    <string>Specify 6.8.03</string>
                   </void>
                 </object>
               </java>

diff --git a/packaging/readme.html b/packaging/readme.html
@@ -6,6 +6,6 @@
 <body>
 <h3>Greetings from the Specify Collections Consortium Lab!
     <br>
-    <p> <a href="https://discourse.specifysoftware.org/t/specify-6-8-02-and-schema-2-10-release-notes/830">Release Notes for Specify 6.8.02 are available here.</a></p></h3>
+    <p> <a href="https://discourse.specifysoftware.org/t/specify-6-8-03-release-notes/1050">Release Notes for Specify 6.8.03 are available here.</a></p></h3>
 </body>
 </html>
diff --git a/src/edu/ku/brc/af/ui/forms/FormViewObj.java b/src/edu/ku/brc/af/ui/forms/FormViewObj.java
@@ -43,6 +43,7 @@
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -57,7 +58,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.BorderFactory;
@@ -88,8 +88,6 @@
 import javax.swing.SwingUtilities;
 
 import edu.ku.brc.specify.datamodel.CollectionObject;
-import edu.ku.brc.specify.datamodel.Determination;
-import edu.ku.brc.specify.datamodel.Taxon;
 import edu.ku.brc.ui.*;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
@@ -5297,7 +5295,7 @@ protected void setDataIntoUI(final boolean doResetAfterFill,
                         }
 
                         Object[] values = UIHelper.getFieldValues(cellField.getFieldNames(), dataObj, dg);
-                        
+
                         setDataIntoUIComp(comp, DataObjFieldFormatMgr.getInstance().format(values[0], dataObjFormatName), defaultValue);
 
                     } else
@@ -5839,7 +5837,17 @@ public static void setDataIntoUIComp(final Component comp, final Object data, fi
         } else if (comp instanceof JTextField)
         {
             JTextField tf = (JTextField)comp;
-            tf.setText(data == null ? "" : data.toString());
+            tf.setText(
+                data == null
+                    ? ""
+                    // If the BigDecimal is an integer and not zero, format it to #.0
+                    // otherwise, strip the zeros
+                    : data instanceof BigDecimal
+                    ? ((((BigDecimal)data).stripTrailingZeros().scale() <= 0 && ((BigDecimal)data).signum() != 0) 
+                    		? ((BigDecimal)data).stripTrailingZeros().setScale(1).toPlainString() 
+                    		: ((BigDecimal)data).stripTrailingZeros().toPlainString())
+                    : data.toString()
+            );
             tf.setCaretPosition(0);
 
         } else if (comp instanceof JTextArea)

diff --git a/src/edu/ku/brc/af/ui/forms/ViewFactory.java b/src/edu/ku/brc/af/ui/forms/ViewFactory.java
@@ -124,6 +124,7 @@
 import edu.ku.brc.af.ui.forms.validation.ValidatedJPanel;
 import edu.ku.brc.af.ui.weblink.WebLinkButton;
 import edu.ku.brc.exceptions.ConfigurationException;
+import edu.ku.brc.specify.plugins.LocalityWorldWindPlugin;
 import edu.ku.brc.specify.plugins.SeriesProcCatNumPlugin;
 import edu.ku.brc.ui.ColorChooser;
 import edu.ku.brc.ui.ColorWrapper;
@@ -1096,6 +1097,13 @@ protected static UIPluginable createPlugin(final MultiView     parent,
                             }
                         }                        
                     }
+                } else if (uiPlugin instanceof LocalityWorldWindPlugin)
+                {
+                	if (UIHelper.getOSType().equals(UIHelper.OSTYPE.MacOSX))
+                	{
+                		log.error("The WorldWind plugin has been deprecated on MACOS and was hidden on the form");
+                		return null;
+                	}
                 }
 
                 // This needs to be done before the initialize.

diff --git a/src/edu/ku/brc/af/ui/forms/formatters/UIFieldFormatter.java b/src/edu/ku/brc/af/ui/forms/formatters/UIFieldFormatter.java
@@ -21,6 +21,7 @@
 
 import edu.ku.brc.af.core.db.AutoNumberIFace;
 import edu.ku.brc.af.prefs.AppPrefsCache;
+import edu.ku.brc.af.ui.forms.formatters.UIFieldFormatterField.FieldType;
 import edu.ku.brc.ui.DateWrapper;
 import edu.ku.brc.ui.UIRegistry;
 import edu.ku.brc.util.Pair;
@@ -458,7 +459,7 @@ public Number getMinValue()
     {
         if (minValue == null && dataClass == BigDecimal.class)
         {
-            minValue = Double.MIN_VALUE;
+            minValue = -Double.MAX_VALUE;
         }
         return minValue;
     }
@@ -615,7 +616,7 @@ public String toPattern()
         StringBuilder str = new StringBuilder();
         for (UIFieldFormatterField field : fields)
         {
-            str.append(field.getValue());
+        	str.append(field.getValue());
         }
         return str.toString();
     }
@@ -765,13 +766,20 @@ public Object formatToUI(Object...datas)
                 //fmt = "%" + (size-2) + ".2f";
 
             	/*
-            	 * using doubleValue() eliminates trailing zeroes but 
-            	 * that leads to conflict with the way big decimals are
-            	 * displayed in view mode on forms and in query results
+            	 * This was originally being cast to a double and then converted to string.
+            	 * This may cause unwanted issues when displaying certain values.
+            	 * (See https://stackoverflow.com/questions/16098046/how-do-i-print-a-double-value-without-scientific-notation-using-java)
+            	 * To avoid these issues, the BigDecimal is first stripped of it's trailing zeros and then directly converted to string.
             	 */
-                //return String.valueOf(((Number )data).doubleValue());
+            	BigDecimal strippedDecimal = ((BigDecimal) data).stripTrailingZeros();
 
-            	return String.valueOf(data);
+            	// If the BigDecimal is an integer and not zero
+            	if (strippedDecimal.scale() <= 0 && strippedDecimal.signum() != 0)
+        		{
+        			// Add a decimal place so the format is #.0
+            		strippedDecimal = strippedDecimal.setScale(1);
+        		}
+            	return strippedDecimal.toPlainString();
             } else
             {
                 //fmt = "%d";

diff --git a/src/edu/ku/brc/af/ui/forms/formatters/UIFieldFormatterField.java b/src/edu/ku/brc/af/ui/forms/formatters/UIFieldFormatterField.java
@@ -115,8 +115,8 @@ public UIFieldFormatterField(final FieldType type,
         this.minSize = minSize;
         this.value       = value;
         if (type.equals(FieldType.regex)) {
-            this.regex = value;
-            this.value = pattern;
+              this.regex = value;
+              this.value = pattern;
         }
         this.incrementer = incrementer;
         this.byYear      = byYear;
@@ -299,7 +299,7 @@ public String getSample()
         {
             return value.substring(0, value.length());
         }
-        
+
 		if (sample.length() == 0)
 		{
 			return "";
@@ -354,7 +354,7 @@ public String getRegExpGrp(int idx) {
         }
         return result;
     }
-
+    
     public boolean isOptional() {
         return isOptional;
     }
@@ -458,7 +458,7 @@ public void setByYear(boolean byYear)
     {
         this.byYear = byYear;
     }
-
+    
     public boolean isCurrentYear()
     {
         return ((type == FieldType.year) && (value.equals("YEAR")));

diff --git a/src/edu/ku/brc/af/ui/forms/formatters/UIFormatterEditorDlg.java b/src/edu/ku/brc/af/ui/forms/formatters/UIFormatterEditorDlg.java
@@ -500,8 +500,8 @@ private void typeChanged()
             FieldType fieldType = (FieldType)fieldTypeCbx.getSelectedItem();
             switch (fieldType)
             {
-                case alphanumeric : 
-                case alpha : 
+                case alphanumeric : break;
+                case alpha : break;
                 case anychar : 
                     cardKey = "size";
                     break;
@@ -522,6 +522,8 @@ private void typeChanged()
                 case year :
                     cardKey = "none";
                     break;
+
+                default: break;
             }
         }
         cardLayout.show(cardPanel, cardKey);
@@ -805,7 +807,8 @@ protected void updateEnabledState()
         // save Btn
         if (currentField != null)
         {
-            fieldsPanel.getEditBtn().setEnabled(fieldHasChanged && (currentField.getType() == FieldType.constant ? !fieldTxt.getText().isEmpty() : true));
+        	fieldsPanel.getEditBtn().setEnabled(fieldHasChanged && (currentField.getType() == FieldType.constant ? 
+        			!fieldTxt.getText().isEmpty() : true));
         }
 
         orderUpBtn.setEnabled(inx > 0);
@@ -849,7 +852,8 @@ protected void getDataFromUI()
         if (fields.size() == 1 && fields.get(0).getType() == FieldType.numeric)
         {
             //selectedFormat.setType(UIFieldFormatterIFace.FormatterType.numeric);
-        } else
+        }
+        else
         {
             selectedFormat.setType(UIFieldFormatterIFace.FormatterType.generic);
         }
@@ -972,7 +976,7 @@ protected void changed(DocumentEvent e)
     }
 
     /**
-     * @param txtFld
+     * @param currLen
      * @param maxLen
      * @return
      */
@@ -1086,6 +1090,7 @@ protected void updateUIEnabled()
                         case year :
                             totalLen += 4;
                             break;
+
                     }
                 }
             }

diff --git a/src/edu/ku/brc/af/ui/forms/validation/ValFormattedTextField.java b/src/edu/ku/brc/af/ui/forms/validation/ValFormattedTextField.java
@@ -76,7 +76,7 @@
 
 /**
  * A Multiple JTextFields (wrapped inside a JPanel) that provides for "formatted" input. The format "mask" is define in XML
- * via the UIFieldFormatterMgr class. This is idea for text fields that have a standard size and a specific format (i.e. Dates)
+ * via the UIFieldFormatterMgr class. This is ideal for text fields that have a standard size and a specific format (i.e. Dates)
  * The mask enables the "fields" and separators to be specifically defined.
  * 
  * NOTE: This impl has multiple Text Field, one for each part of the format.
@@ -1186,9 +1186,10 @@ public String getFmtVal(final String strValue, final Object value) {
                 }
                 needsUpdating = (StringUtils.isEmpty(strValue) || strValue.length() != formatter.getLength() || strValue.contains("#"))
                         && formatter.getAutoNumber() != null && formatter.isIncrementer();
-
+                
                 fmtVal = (String)formatter.formatToUI(strValue);
 
+
             } else {
                 if (value == null) {
                     needsUpdating = true;

diff --git a/src/edu/ku/brc/af/ui/forms/validation/ValFormattedTextFieldSingle.java b/src/edu/ku/brc/af/ui/forms/validation/ValFormattedTextFieldSingle.java
@@ -818,7 +818,7 @@ protected UIValidatable.ErrorType validateNumeric(final String value)
 		try {
 			if (cls == BigDecimal.class) {
 				if (bdValidator == null) {
-					bdValidator = CurrencyValidator.getInstance();
+					bdValidator = BigDecimalValidator.getInstance();
 				}
 
 				Number maxVal = formatter.getMaxValue();