summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.org4
-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
-rw-r--r--src/test/java/sevenUnits/unit/UnitTest.java9
-rw-r--r--src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java3
-rw-r--r--src/test/java/sevenUnits/utils/SemanticVersionTest.java21
-rw-r--r--src/test/java/sevenUnits/utils/UncertainDoubleTest.java9
14 files changed, 38 insertions, 58 deletions
diff --git a/README.org b/README.org
index ff46ae2..2e3f227 100644
--- a/README.org
+++ b/README.org
@@ -1,5 +1,5 @@
-* 7Units Version 1.0.0-beta.2
-(this project uses Semantic Versioning)
+* 7Units Version 1.0.0
+This project uses Semantic Versioning, and its public API is all public code in ~src/main/java~.
[[http://unmaintained.tech/][http://unmaintained.tech/badge.svg]]
** What is it?
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);
diff --git a/src/test/java/sevenUnits/unit/UnitTest.java b/src/test/java/sevenUnits/unit/UnitTest.java
index 7ae550f..fb21723 100644
--- a/src/test/java/sevenUnits/unit/UnitTest.java
+++ b/src/test/java/sevenUnits/unit/UnitTest.java
@@ -60,10 +60,8 @@ class UnitTest {
// test with LinearUnitValue
final var value1 = LinearUnitValue.getExact(Metric.METRE, 15);
final var value2 = LinearUnitValue.getExact(foot, 120);
- final var value3 = LinearUnitValue.getExact(Metric.METRE,
- 0.5);
- final var value4 = LinearUnitValue.getExact(Metric.KILOGRAM,
- 60);
+ final var value3 = LinearUnitValue.getExact(Metric.METRE, 0.5);
+ final var value4 = LinearUnitValue.getExact(Metric.KILOGRAM, 60);
// make sure addition is done correctly
assertEquals(51.576, value1.plus(value2).getValueExact(), 0.001);
@@ -151,8 +149,7 @@ class UnitTest {
@Test
public void testPrefixes() {
- final var generatedKilometre = Metric.METRE
- .withPrefix(Metric.KILO);
+ final var generatedKilometre = Metric.METRE.withPrefix(Metric.KILO);
final var actualKilometre = Metric.METRE.times(1000);
assertEquals(generatedKilometre, actualKilometre);
diff --git a/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java b/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java
index f203fad..8711847 100644
--- a/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java
+++ b/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java
@@ -120,8 +120,7 @@ class ConditionalExistenceCollectionsTest {
/** Test method for the ConditionalExistenceCollection's iterator. */
@Test
void testIterator() {
- final var testIterator = this
- .getTestIterator();
+ final var testIterator = this.getTestIterator();
assertTrue(testIterator.hasNext);
assertTrue(testIterator.hasNext());
diff --git a/src/test/java/sevenUnits/utils/SemanticVersionTest.java b/src/test/java/sevenUnits/utils/SemanticVersionTest.java
index 047f0b5..5b74812 100644
--- a/src/test/java/sevenUnits/utils/SemanticVersionTest.java
+++ b/src/test/java/sevenUnits/utils/SemanticVersionTest.java
@@ -72,14 +72,12 @@ public final class SemanticVersionTest {
*/
@Test
public void testComplexToString() {
- final var v1 = builder(1, 2, 3).preRelease(1, 2, 3)
- .build();
+ final var v1 = builder(1, 2, 3).preRelease(1, 2, 3).build();
assertEquals("1.2.3-1.2.3", v1.toString());
final var v2 = builder(4, 5, 6).preRelease("abc", 123)
.buildMetadata("2022-02-19").build();
assertEquals("4.5.6-abc.123+2022-02-19", v2.toString());
- final var v3 = builder(1, 0, 0)
- .preRelease("x-y-z", "--").build();
+ final var v3 = builder(1, 0, 0).preRelease("x-y-z", "--").build();
assertEquals("1.0.0-x-y-z.--", v3.toString());
}
@@ -91,8 +89,7 @@ public final class SemanticVersionTest {
*/
@Test
public void testComplexVersions() {
- final var v1 = builder(1, 2, 3).preRelease(1, 2, 3)
- .build();
+ final var v1 = builder(1, 2, 3).preRelease(1, 2, 3).build();
assertEquals(1, v1.majorVersion());
assertEquals(2, v1.minorVersion());
assertEquals(3, v1.patchVersion());
@@ -107,8 +104,7 @@ public final class SemanticVersionTest {
assertEquals(List.of("abc", "123"), v2.preReleaseIdentifiers());
assertEquals(List.of("2022-02-19"), v2.buildMetadata());
- final var v3 = builder(1, 0, 0)
- .preRelease("x-y-z", "--").build();
+ final var v3 = builder(1, 0, 0).preRelease("x-y-z", "--").build();
assertEquals(1, v3.majorVersion());
assertEquals(0, v3.minorVersion());
assertEquals(0, v3.patchVersion());
@@ -298,13 +294,10 @@ public final class SemanticVersionTest {
*/
@Test
public void testOrder() {
- final var v100a = builder(1, 0, 0).preRelease("alpha")
- .build(); // 1.0.0-alpha
+ final var v100a = builder(1, 0, 0).preRelease("alpha").build(); // 1.0.0-alpha
final var v100a1 = preRelease(1, 0, 0, "alpha", 1); // 1.0.0-alpha.1
- final var v100ab = builder(1, 0, 0)
- .preRelease("alpha", "beta").build(); // 1.0.0-alpha.beta
- final var v100b = builder(1, 0, 0).preRelease("beta")
- .build(); // 1.0.0-alpha
+ final var v100ab = builder(1, 0, 0).preRelease("alpha", "beta").build(); // 1.0.0-alpha.beta
+ final var v100b = builder(1, 0, 0).preRelease("beta").build(); // 1.0.0-alpha
final var v100b2 = preRelease(1, 0, 0, "beta", 2); // 1.0.0-beta.2
final var v100b11 = preRelease(1, 0, 0, "beta", 11); // 1.0.0-beta.11
final var v100rc1 = preRelease(1, 0, 0, "rc", 1); // 1.0.0-rc.1
diff --git a/src/test/java/sevenUnits/utils/UncertainDoubleTest.java b/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
index 8dcd595..733a308 100644
--- a/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
+++ b/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
@@ -49,15 +49,12 @@ class UncertainDoubleTest {
final var x = UncertainDouble.of(Math.PI, 0.1);
// slightly different because roundoff errors
- final var x1 = UncertainDouble.of(Math.PI + Math.E - Math.E,
- 0.1);
- final var x2 = UncertainDouble.of(Math.PI * Math.E / Math.E,
- 0.1);
+ final var x1 = UncertainDouble.of(Math.PI + Math.E - Math.E, 0.1);
+ final var x2 = UncertainDouble.of(Math.PI * Math.E / Math.E, 0.1);
// get results
final var result1 = x.plusExact(Math.E).minusExact(Math.E);
- final var result2 = x.timesExact(Math.E)
- .dividedByExact(Math.E);
+ final var result2 = x.timesExact(Math.E).dividedByExact(Math.E);
// test that these operations work & don't change uncertainty
assertEquals(x1, result1);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-02 22:54:21 +0000