Skip to content

IIA-1831 changed to match Integer where if the input string value is … #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdsmithsos merged 3 commits into from
Apr 18, 2025
Merged

IIA-1831 changed to match Integer where if the input string value is … #384

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af6a553
IIA-1831 changed to match Integer where if the input string value is …
Apr 16, 2025
ab06875
Merge pull request #3 from jdsmithsos/main
jdsmithsos Apr 17, 2025
2c79f82
Merge branch 'main' into feature/finished/IIA-1831-float-field-error-…
dholubek Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions kview/src/main/java/dev/ikm/komet/kview/controls/skin/KLFloatControlSkin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@ public KLFloatControlSkin(KLFloatControl control) {
// - adding '-' or '+' if empty or ends in e/E
// - back when text ends in [-/+, e, e-/+, E, E-/+]
// - pattern
if (newText.isEmpty() ||
(hasExponent(newText) && !hasExponent(oldText) && !oldText.isEmpty()) ||
(("-".equals(addedText) || "+".equals(addedText)) && (oldText.isEmpty() || endsWithExponent(oldText))) ||
(addedText.isEmpty() && ("+".equals(newText) || "-".equals(newText) || hasExponent(newText) || hasSignedExponent(newText))) ||
NUMERICAL_PATTERN.matcher(newText).matches()) {
try {
double value = Double.parseDouble(newText);
// discard if we have a valid value, but it is infinite or NaN
if (Double.isInfinite(value) || Double.isNaN(value)) {
if (newText.isEmpty() || NUMERICAL_PATTERN.matcher(newText).matches()) {
if (!newText.isEmpty() && ((hasExponent(newText) && !hasExponent(oldText) && !oldText.isEmpty()) ||
(("-".equals(addedText) || "+".equals(addedText)) && (oldText.isEmpty() || endsWithExponent(oldText))) ||
(addedText.isEmpty() && ("+".equals(newText) || "-".equals(newText) || hasExponent(newText) || hasSignedExponent(newText))))) {
try {
double value = Double.parseDouble(newText);
// discard if we have a valid value, but it is infinite or NaN
if (Double.isInfinite(value) || Double.isNaN(value)) {
errorLabel.setText(resources.getString("error.float.text"));
control.setShowError(true);
return null;
}
} catch (NumberFormatException nfe) {
errorLabel.setText(resources.getString("error.float.text"));
control.setShowError(true);
return null;
}
} catch (NumberFormatException nfe) {
errorLabel.setText(resources.getString("error.float.text"));
control.setShowError(true);
}
return change;
} else if ("-".equals(addedText) || "+".equals(addedText)) { // typing '-'/'+' in any other position
Expand Down