Merge release 1.0.0 into stable branchHEADstable

See the tag 'v1.0.0' or the changelog for more information about this
release.

1 files changed, 14 insertions, 19 deletions

diff --git a/src/main/java/sevenUnitsGUI/PrefixSearchRule.java b/src/main/java/sevenUnitsGUI/PrefixSearchRule.java
index 69f09e6..73d12bc 100644
--- a/src/main/java/sevenUnitsGUI/PrefixSearchRule.java
+++ b/src/main/java/sevenUnitsGUI/PrefixSearchRule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2022 Adrien Hopkins
+ * Copyright (C) 2022, 2024, 2025 Adrien Hopkins
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -34,8 +34,8 @@ import sevenUnits.unit.UnitPrefix;
  * A search rule that applies a certain set of prefixes to a unit. It always
  * includes the original unit in the output map.
  *
- * @since v0.4.0
  * @since 2022-07-06
+ * @since v0.4.0
  */
 public final class PrefixSearchRule implements
 		Function<Map.Entry<String, LinearUnit>, Map<String, LinearUnit>> {
@@ -70,10 +70,10 @@ public final class PrefixSearchRule implements
 	 *
 	 * @param prefixes prefixes to apply
 	 * @return prefix rule
-	 * @since v0.4.0
 	 * @since 2022-07-06
+	 * @since v0.4.0
 	 */
-	public static final PrefixSearchRule getCoherentOnlyRule(
+	public static PrefixSearchRule getCoherentOnlyRule(
 			Set<UnitPrefix> prefixes) {
 		return new PrefixSearchRule(prefixes,
 				u -> u.isCoherent() && !u.getName().equals("kilogram"));
@@ -84,30 +84,25 @@ public final class PrefixSearchRule implements
 	 *
 	 * @param prefixes prefixes to apply
 	 * @return prefix rule
-	 * @since v0.4.0
 	 * @since 2022-07-06
+	 * @since v0.4.0
 	 */
-	public static final PrefixSearchRule getUniversalRule(
-			Set<UnitPrefix> prefixes) {
+	public static PrefixSearchRule getUniversalRule(Set<UnitPrefix> prefixes) {
 		return new PrefixSearchRule(prefixes, u -> true);
 	}
 
-	/**
-	 * The set of prefixes that will be applied to the unit.
-	 */
+	/** The set of prefixes that will be applied to the unit. */
 	private final Set<UnitPrefix> prefixes;
 
-	/**
-	 * Determines which units are given prefixes.
-	 */
+	/** Determines which units are given prefixes. */
 	private final Predicate<LinearUnit> prefixableUnitRule;
 
 	/**
 	 * @param prefixes           prefixes to add to units
 	 * @param prefixableUnitRule function that determines which units get
 	 *                           prefixes
-	 * @since v0.4.0
 	 * @since 2022-07-06
+	 * @since v0.4.0
 	 */
 	public PrefixSearchRule(Set<UnitPrefix> prefixes,
 			Predicate<LinearUnit> prefixableUnitRule) {
@@ -118,8 +113,8 @@ public final class PrefixSearchRule implements
 	@Override
 	public Map<String, LinearUnit> apply(Entry<String, LinearUnit> t) {
 		final Map<String, LinearUnit> outputUnits = new HashMap<>();
-		final String originalName = t.getKey();
-		final LinearUnit originalUnit = t.getValue();
+		final var originalName = t.getKey();
+		final var originalUnit = t.getValue();
 		outputUnits.put(originalName, originalUnit);
 		if (this.prefixableUnitRule.test(originalUnit)) {
 			for (final UnitPrefix prefix : this.prefixes) {
@@ -136,15 +131,15 @@ public final class PrefixSearchRule implements
 			return true;
 		if (!(obj instanceof PrefixSearchRule))
 			return false;
-		final PrefixSearchRule other = (PrefixSearchRule) obj;
+		final var other = (PrefixSearchRule) obj;
 		return Objects.equals(this.prefixableUnitRule, other.prefixableUnitRule)
 				&& Objects.equals(this.prefixes, other.prefixes);
 	}
 
 	/**
 	 * @return rule that determines which units get prefixes
-	 * @since v0.4.0
 	 * @since 2022-07-09
+	 * @since v0.4.0
 	 */
 	public Predicate<LinearUnit> getPrefixableUnitRule() {
 		return this.prefixableUnitRule;
@@ -152,8 +147,8 @@ public final class PrefixSearchRule implements
 
 	/**
 	 * @return the prefixes that are applied by this rule
-	 * @since v0.4.0
 	 * @since 2022-07-06
+	 * @since v0.4.0
 	 */
 	public Set<UnitPrefix> getPrefixes() {
 		return this.prefixes;