summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAdrien Hopkins <adrien.p.hopkins@gmail.com>2025-06-15 19:37:19 -0500
committerAdrien Hopkins <adrien.p.hopkins@gmail.com>2025-06-15 19:37:19 -0500
commitbccb5b5e3452421c81c1fb58f83391ba6584807c (patch)
tree4c908950d9b049394f8160b8159b498aec586ecc /src/main
parentda740edd3972fa049c4c8d0e43448c10a6a65dce (diff)
Bump version number to 1.0.0v1.0.0
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/sevenUnits/ProgramInfo.java5
-rw-r--r--src/main/java/sevenUnits/unit/LinearUnit.java6
-rw-r--r--src/main/java/sevenUnits/unit/LinearUnitValue.java3
-rw-r--r--src/main/java/sevenUnits/unit/UnitDatabase.java13
-rw-r--r--src/main/java/sevenUnits/utils/SemanticVersionNumber.java5
-rw-r--r--src/main/java/sevenUnits/utils/UncertainDouble.java8
-rw-r--r--src/main/java/sevenUnitsGUI/DefaultPrefixRepetitionRule.java3
-rw-r--r--src/main/java/sevenUnitsGUI/Presenter.java3
-rw-r--r--src/main/java/sevenUnitsGUI/SearchBoxList.java4
9 files changed, 22 insertions, 28 deletions
diff --git a/src/main/java/sevenUnits/ProgramInfo.java b/src/main/java/sevenUnits/ProgramInfo.java
index 5ed1309..e74a99b 100644
--- a/src/main/java/sevenUnits/ProgramInfo.java
+++ b/src/main/java/sevenUnits/ProgramInfo.java
@@ -25,10 +25,9 @@ import sevenUnits.utils.SemanticVersionNumber;
* @since v0.3.1
*/
public final class ProgramInfo {
-
- /** The version number (1.0.0-beta.2) */
+ /** The version number (1.0.0) */
public static final SemanticVersionNumber VERSION = SemanticVersionNumber
- .preRelease(1, 0, 0, "beta", 2);
+ .stableVersion(1, 0, 0);
private ProgramInfo() {
// this class is only for static variables, you shouldn't be able to
diff --git a/src/main/java/sevenUnits/unit/LinearUnit.java b/src/main/java/sevenUnits/unit/LinearUnit.java
index 22105b6..85f6dd9 100644
--- a/src/main/java/sevenUnits/unit/LinearUnit.java
+++ b/src/main/java/sevenUnits/unit/LinearUnit.java
@@ -220,8 +220,7 @@ public final class LinearUnit extends Unit {
Objects.requireNonNull(divisor, "other must not be null");
// divide the units
- final var base = this.getBase()
- .dividedBy(divisor.getBase());
+ final var base = this.getBase().dividedBy(divisor.getBase());
return valueOf(base,
this.getConversionFactor() / divisor.getConversionFactor());
}
@@ -382,8 +381,7 @@ public final class LinearUnit extends Unit {
Objects.requireNonNull(multiplier, "other must not be null");
// multiply the units
- final var base = this.getBase()
- .times(multiplier.getBase());
+ final var base = this.getBase().times(multiplier.getBase());
return valueOf(base,
this.getConversionFactor() * multiplier.getConversionFactor());
}
diff --git a/src/main/java/sevenUnits/unit/LinearUnitValue.java b/src/main/java/sevenUnits/unit/LinearUnitValue.java
index 9a99e00..ce60e3b 100644
--- a/src/main/java/sevenUnits/unit/LinearUnitValue.java
+++ b/src/main/java/sevenUnits/unit/LinearUnitValue.java
@@ -150,8 +150,7 @@ public final class LinearUnitValue {
remaining = remaining.minus(value);
}
- final var lastValue = remaining
- .convertTo(others.get(others.size() - 1));
+ final var lastValue = remaining.convertTo(others.get(others.size() - 1));
values.add(lastValue);
return values;
}
diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 05e9cc9..36c225f 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -1229,12 +1229,10 @@ public final class UnitDatabase {
private final ExpressionParser<UnitPrefix> prefixExpressionParser = new ExpressionParser.Builder<>(
this::getPrefix).addBinaryOperator("+", UnitPrefix::plus, 0)
.addBinaryOperator("-", UnitPrefix::minus, 0)
- .addBinaryOperator("*", UnitPrefix::times, 1)
- .addSpaceFunction("*")
+ .addBinaryOperator("*", UnitPrefix::times, 1).addSpaceFunction("*")
.addBinaryOperator("/", UnitPrefix::dividedBy, 1)
- .addBinaryOperator("|", UnitPrefix::dividedBy, 3)
- .addBinaryOperator("^", (o1, o2) -> o1.toExponent(o2.getMultiplier()),
- 2)
+ .addBinaryOperator("|", UnitPrefix::dividedBy, 3).addBinaryOperator(
+ "^", (o1, o2) -> o1.toExponent(o2.getMultiplier()), 2)
.build();
/**
@@ -1624,9 +1622,8 @@ public final class UnitDatabase {
if (unit instanceof LinearUnit)
return (LinearUnit) unit;
- else
- throw new IllegalArgumentException(
- String.format("%s is not a linear unit.", name));
+ throw new IllegalArgumentException(
+ String.format("%s is not a linear unit.", name));
}
/**
diff --git a/src/main/java/sevenUnits/utils/SemanticVersionNumber.java b/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
index c081a25..4bb7ce5 100644
--- a/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
+++ b/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
@@ -332,7 +332,7 @@ public final class SemanticVersionNumber
if (aNumber < bNumber)
return -1;
- else if (aNumber > bNumber)
+ if (aNumber > bNumber)
return 1;
} else if (NUMERIC_IDENTIFER.matcher(bElement).matches())
// aElement is not a number but bElement is
@@ -602,7 +602,8 @@ public final class SemanticVersionNumber
return false;
} else if (!this.buildMetadata.equals(other.buildMetadata))
return false;
- if ((this.major != other.major) || (this.minor != other.minor) || (this.patch != other.patch))
+ if ((this.major != other.major) || (this.minor != other.minor)
+ || (this.patch != other.patch))
return false;
if (this.preReleaseIdentifiers == null) {
if (other.preReleaseIdentifiers != null)
diff --git a/src/main/java/sevenUnits/utils/UncertainDouble.java b/src/main/java/sevenUnits/utils/UncertainDouble.java
index ecee586..24ada20 100644
--- a/src/main/java/sevenUnits/utils/UncertainDouble.java
+++ b/src/main/java/sevenUnits/utils/UncertainDouble.java
@@ -207,7 +207,8 @@ public final class UncertainDouble implements Comparable<UncertainDouble> {
if (!(obj instanceof UncertainDouble))
return false;
final var other = (UncertainDouble) obj;
- if ((Double.compare(this.value, other.value) != 0) || (Double.compare(this.uncertainty, other.uncertainty) != 0))
+ if ((Double.compare(this.value, other.value) != 0)
+ || (Double.compare(this.uncertainty, other.uncertainty) != 0))
return false;
return true;
}
@@ -470,10 +471,9 @@ public final class UncertainDouble implements Comparable<UncertainDouble> {
final var bigUncertainty = BigDecimal.valueOf(this.uncertainty);
final var displayScale = this.getDisplayScale();
- final var roundedUncertainty = bigUncertainty
- .setScale(displayScale, roundingMode);
- final var roundedValue = bigValue.setScale(displayScale,
+ final var roundedUncertainty = bigUncertainty.setScale(displayScale,
roundingMode);
+ final var roundedValue = bigValue.setScale(displayScale, roundingMode);
valueString = roundedValue.toString();
uncertaintyString = roundedUncertainty.toString();
diff --git a/src/main/java/sevenUnitsGUI/DefaultPrefixRepetitionRule.java b/src/main/java/sevenUnitsGUI/DefaultPrefixRepetitionRule.java
index a441911..0e38c67 100644
--- a/src/main/java/sevenUnitsGUI/DefaultPrefixRepetitionRule.java
+++ b/src/main/java/sevenUnitsGUI/DefaultPrefixRepetitionRule.java
@@ -74,7 +74,8 @@ public enum DefaultPrefixRepetitionRule implements Predicate<List<UnitPrefix>> {
for (final UnitPrefix prefix : prefixes) {
// check that the current prefix is metric and appropriately
// magnifying/reducing
- if (!Metric.DECIMAL_PREFIXES.contains(prefix) || (magnifying != prefix.getMultiplier() > 1))
+ if (!Metric.DECIMAL_PREFIXES.contains(prefix)
+ || (magnifying != prefix.getMultiplier() > 1))
return false;
// check if the current prefix is correct
diff --git a/src/main/java/sevenUnitsGUI/Presenter.java b/src/main/java/sevenUnitsGUI/Presenter.java
index 7fd979a..d258e1f 100644
--- a/src/main/java/sevenUnitsGUI/Presenter.java
+++ b/src/main/java/sevenUnitsGUI/Presenter.java
@@ -766,8 +766,7 @@ public final class Presenter {
}
}
if (LOCAL_LOCALES.contains(this.userLocale)) {
- final var filename = String.format("/about/%s.txt",
- this.userLocale);
+ final var filename = String.format("/about/%s.txt", this.userLocale);
return this.formatAboutText(
Presenter.getLinesFromResource(filename).stream());
}
diff --git a/src/main/java/sevenUnitsGUI/SearchBoxList.java b/src/main/java/sevenUnitsGUI/SearchBoxList.java
index bddce04..96f71de 100644
--- a/src/main/java/sevenUnitsGUI/SearchBoxList.java
+++ b/src/main/java/sevenUnitsGUI/SearchBoxList.java
@@ -237,7 +237,7 @@ final class SearchBoxList<E> extends JPanel {
public void reapplyFilter() {
final var searchText = this.searchBoxEmpty ? ""
: this.searchBox.getText();
- final var comparator = new FilterComparator<E>(searchText,
+ final var comparator = new FilterComparator<>(searchText,
this.defaultOrdering, this.caseSensitive);
final var searchFilter = this.getSearchFilter(searchText);
@@ -300,7 +300,7 @@ final class SearchBoxList<E> extends JPanel {
}
final var searchText = this.searchBoxEmpty ? ""
: this.searchBox.getText();
- final var comparator = new FilterComparator<E>(searchText,
+ final var comparator = new FilterComparator<>(searchText,
this.defaultOrdering, this.caseSensitive);
final var searchFilter = this.getSearchFilter(searchText);