Skip to content

Commit 945d28f

Browse files
grantfitzsimmonsgrantfitzsimmons
authored
Merge pull request #1189 from specify/v6.8.03
Update to v6.8.03
2 parents bd3da81 + cce5ce9 commit 945d28f

30 files changed

Lines changed: 333 additions & 103 deletions

‎.install4j/i4jparams.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<config install4jVersion="5.0.8" install4jBuild="5311" type="windows" archive="false">
3-
<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" />
3+
<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" />
44
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
55
<variable id="en" name="English" messageFile="i4j_extf_0_zpmake.utf8" customLocalizationFile="i4j_extf_1_zpmake.utf8" />
66
<variable id="pt" name="Portuguese" messageFile="i4j_extf_2_zpmake.utf8" customLocalizationFile="i4j_extf_3_zpmake.utf8" />
77
</languages>
88
<compilerVariables>
9-
<variable name="sys.version" value="6.8.02" />
9+
<variable name="sys.version" value="6.8.03" />
1010
<variable name="sys.shortName" value="Specify" />
1111
<variable name="sys.fullName" value="Specify" />
1212
<variable name="sys.publisher" value="Biodiversity Research Center, University of Kansas" />
@@ -114,7 +114,7 @@
114114
</void>
115115
</void>
116116
<void property="subTitle">
117-
<string>Specify 6.8.02 includes the following changes:</string>
117+
<string>Specify 6.8.03 includes the following changes:</string>
118118
</void>
119119
<void property="title">
120120
<string>New This Release</string>
@@ -207,7 +207,7 @@
207207
<java class="java.beans.XMLDecoder">
208208
<object class="com.install4j.runtime.beans.actions.desktop.RegisterAddRemoveAction">
209209
<void property="itemName">
210-
<string>Specify 6.8.02</string>
210+
<string>Specify 6.8.03</string>
211211
</void>
212212
</object>
213213
</java>

‎packaging/readme.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<body>
77
<h3>Greetings from the Specify Collections Consortium Lab!
88
<br>
9-
<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>
9+
<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>
1010
</body>
1111
</html>

‎src/edu/ku/brc/af/ui/forms/FormViewObj.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.beans.PropertyChangeListener;
4444
import java.beans.PropertyDescriptor;
4545
import java.lang.reflect.Method;
46+
import java.math.BigDecimal;
4647
import java.sql.SQLException;
4748
import java.util.ArrayList;
4849
import java.util.Calendar;
@@ -57,7 +58,6 @@
5758
import java.util.Map;
5859
import java.util.Set;
5960
import java.util.Vector;
60-
6161
import javax.swing.AbstractAction;
6262
import javax.swing.Action;
6363
import javax.swing.BorderFactory;
@@ -88,8 +88,6 @@
8888
import javax.swing.SwingUtilities;
8989

9090
import edu.ku.brc.specify.datamodel.CollectionObject;
91-
import edu.ku.brc.specify.datamodel.Determination;
92-
import edu.ku.brc.specify.datamodel.Taxon;
9391
import edu.ku.brc.ui.*;
9492
import org.apache.commons.beanutils.PropertyUtils;
9593
import org.apache.commons.lang.StringUtils;
@@ -5297,7 +5295,7 @@ protected void setDataIntoUI(final boolean doResetAfterFill,
52975295
}
52985296

52995297
Object[] values = UIHelper.getFieldValues(cellField.getFieldNames(), dataObj, dg);
5300-
5298+
53015299
setDataIntoUIComp(comp, DataObjFieldFormatMgr.getInstance().format(values[0], dataObjFormatName), defaultValue);
53025300

53035301
} else
@@ -5839,7 +5837,17 @@ public static void setDataIntoUIComp(final Component comp, final Object data, fi
58395837
} else if (comp instanceof JTextField)
58405838
{
58415839
JTextField tf = (JTextField)comp;
5842-
tf.setText(data == null ? "" : data.toString());
5840+
tf.setText(
5841+
data == null
5842+
? ""
5843+
// If the BigDecimal is an integer and not zero, format it to #.0
5844+
// otherwise, strip the zeros
5845+
: data instanceof BigDecimal
5846+
? ((((BigDecimal)data).stripTrailingZeros().scale() <= 0 && ((BigDecimal)data).signum() != 0)
5847+
? ((BigDecimal)data).stripTrailingZeros().setScale(1).toPlainString()
5848+
: ((BigDecimal)data).stripTrailingZeros().toPlainString())
5849+
: data.toString()
5850+
);
58435851
tf.setCaretPosition(0);
58445852

58455853
} else if (comp instanceof JTextArea)

‎src/edu/ku/brc/af/ui/forms/ViewFactory.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
import edu.ku.brc.af.ui.forms.validation.ValidatedJPanel;
125125
import edu.ku.brc.af.ui.weblink.WebLinkButton;
126126
import edu.ku.brc.exceptions.ConfigurationException;
127+
import edu.ku.brc.specify.plugins.LocalityWorldWindPlugin;
127128
import edu.ku.brc.specify.plugins.SeriesProcCatNumPlugin;
128129
import edu.ku.brc.ui.ColorChooser;
129130
import edu.ku.brc.ui.ColorWrapper;
@@ -1096,6 +1097,13 @@ protected static UIPluginable createPlugin(final MultiView parent,
10961097
}
10971098
}
10981099
}
1100+
} else if (uiPlugin instanceof LocalityWorldWindPlugin)
1101+
{
1102+
if (UIHelper.getOSType().equals(UIHelper.OSTYPE.MacOSX))
1103+
{
1104+
log.error("The WorldWind plugin has been deprecated on MACOS and was hidden on the form");
1105+
return null;
1106+
}
10991107
}
11001108

11011109
// This needs to be done before the initialize.

‎src/edu/ku/brc/af/ui/forms/formatters/UIFieldFormatter.java‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import edu.ku.brc.af.core.db.AutoNumberIFace;
2323
import edu.ku.brc.af.prefs.AppPrefsCache;
24+
import edu.ku.brc.af.ui.forms.formatters.UIFieldFormatterField.FieldType;
2425
import edu.ku.brc.ui.DateWrapper;
2526
import edu.ku.brc.ui.UIRegistry;
2627
import edu.ku.brc.util.Pair;
@@ -458,7 +459,7 @@ public Number getMinValue()
458459
{
459460
if (minValue == null && dataClass == BigDecimal.class)
460461
{
461-
minValue = Double.MIN_VALUE;
462+
minValue = -Double.MAX_VALUE;
462463
}
463464
return minValue;
464465
}
@@ -615,7 +616,7 @@ public String toPattern()
615616
StringBuilder str = new StringBuilder();
616617
for (UIFieldFormatterField field : fields)
617618
{
618-
str.append(field.getValue());
619+
str.append(field.getValue());
619620
}
620621
return str.toString();
621622
}
@@ -765,13 +766,20 @@ public Object formatToUI(Object...datas)
765766
//fmt = "%" + (size-2) + ".2f";
766767

767768
/*
768-
* using doubleValue() eliminates trailing zeroes but
769-
* that leads to conflict with the way big decimals are
770-
* displayed in view mode on forms and in query results
769+
* This was originally being cast to a double and then converted to string.
770+
* This may cause unwanted issues when displaying certain values.
771+
* (See https://stackoverflow.com/questions/16098046/how-do-i-print-a-double-value-without-scientific-notation-using-java)
772+
* To avoid these issues, the BigDecimal is first stripped of it's trailing zeros and then directly converted to string.
771773
*/
772-
//return String.valueOf(((Number )data).doubleValue());
774+
BigDecimal strippedDecimal = ((BigDecimal) data).stripTrailingZeros();
773775

774-
return String.valueOf(data);
776+
// If the BigDecimal is an integer and not zero
777+
if (strippedDecimal.scale() <= 0 && strippedDecimal.signum() != 0)
778+
{
779+
// Add a decimal place so the format is #.0
780+
strippedDecimal = strippedDecimal.setScale(1);
781+
}
782+
return strippedDecimal.toPlainString();
775783
} else
776784
{
777785
//fmt = "%d";

‎src/edu/ku/brc/af/ui/forms/formatters/UIFieldFormatterField.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ public UIFieldFormatterField(final FieldType type,
115115
this.minSize = minSize;
116116
this.value = value;
117117
if (type.equals(FieldType.regex)) {
118-
this.regex = value;
119-
this.value = pattern;
118+
this.regex = value;
119+
this.value = pattern;
120120
}
121121
this.incrementer = incrementer;
122122
this.byYear = byYear;
@@ -299,7 +299,7 @@ public String getSample()
299299
{
300300
return value.substring(0, value.length());
301301
}
302-
302+
303303
if (sample.length() == 0)
304304
{
305305
return "";
@@ -354,7 +354,7 @@ public String getRegExpGrp(int idx) {
354354
}
355355
return result;
356356
}
357-
357+
358358
public boolean isOptional() {
359359
return isOptional;
360360
}
@@ -458,7 +458,7 @@ public void setByYear(boolean byYear)
458458
{
459459
this.byYear = byYear;
460460
}
461-
461+
462462
public boolean isCurrentYear()
463463
{
464464
return ((type == FieldType.year) && (value.equals("YEAR")));

‎src/edu/ku/brc/af/ui/forms/formatters/UIFormatterEditorDlg.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ private void typeChanged()
500500
FieldType fieldType = (FieldType)fieldTypeCbx.getSelectedItem();
501501
switch (fieldType)
502502
{
503-
case alphanumeric :
504-
case alpha :
503+
case alphanumeric : break;
504+
case alpha : break;
505505
case anychar :
506506
cardKey = "size";
507507
break;
@@ -522,6 +522,8 @@ private void typeChanged()
522522
case year :
523523
cardKey = "none";
524524
break;
525+
526+
default: break;
525527
}
526528
}
527529
cardLayout.show(cardPanel, cardKey);
@@ -805,7 +807,8 @@ protected void updateEnabledState()
805807
// save Btn
806808
if (currentField != null)
807809
{
808-
fieldsPanel.getEditBtn().setEnabled(fieldHasChanged && (currentField.getType() == FieldType.constant ? !fieldTxt.getText().isEmpty() : true));
810+
fieldsPanel.getEditBtn().setEnabled(fieldHasChanged && (currentField.getType() == FieldType.constant ?
811+
!fieldTxt.getText().isEmpty() : true));
809812
}
810813

811814
orderUpBtn.setEnabled(inx > 0);
@@ -849,7 +852,8 @@ protected void getDataFromUI()
849852
if (fields.size() == 1 && fields.get(0).getType() == FieldType.numeric)
850853
{
851854
//selectedFormat.setType(UIFieldFormatterIFace.FormatterType.numeric);
852-
} else
855+
}
856+
else
853857
{
854858
selectedFormat.setType(UIFieldFormatterIFace.FormatterType.generic);
855859
}
@@ -972,7 +976,7 @@ protected void changed(DocumentEvent e)
972976
}
973977

974978
/**
975-
* @param txtFld
979+
* @param currLen
976980
* @param maxLen
977981
* @return
978982
*/
@@ -1086,6 +1090,7 @@ protected void updateUIEnabled()
10861090
case year :
10871091
totalLen += 4;
10881092
break;
1093+
10891094
}
10901095
}
10911096
}

‎src/edu/ku/brc/af/ui/forms/validation/ValFormattedTextField.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
/**
7878
* A Multiple JTextFields (wrapped inside a JPanel) that provides for "formatted" input. The format "mask" is define in XML
79-
* via the UIFieldFormatterMgr class. This is idea for text fields that have a standard size and a specific format (i.e. Dates)
79+
* via the UIFieldFormatterMgr class. This is ideal for text fields that have a standard size and a specific format (i.e. Dates)
8080
* The mask enables the "fields" and separators to be specifically defined.
8181
*
8282
* 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) {
11861186
}
11871187
needsUpdating = (StringUtils.isEmpty(strValue) || strValue.length() != formatter.getLength() || strValue.contains("#"))
11881188
&& formatter.getAutoNumber() != null && formatter.isIncrementer();
1189-
1189+
11901190
fmtVal = (String)formatter.formatToUI(strValue);
11911191

1192+
11921193
} else {
11931194
if (value == null) {
11941195
needsUpdating = true;

‎src/edu/ku/brc/af/ui/forms/validation/ValFormattedTextFieldSingle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ protected UIValidatable.ErrorType validateNumeric(final String value)
818818
try {
819819
if (cls == BigDecimal.class) {
820820
if (bdValidator == null) {
821-
bdValidator = CurrencyValidator.getInstance();
821+
bdValidator = BigDecimalValidator.getInstance();
822822
}
823823

824824
Number maxVal = formatter.getMaxValue();

0 commit comments

Comments
 (0)