diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/sevenUnits/ProgramInfo.java | 2 | ||||
| -rw-r--r-- | src/main/java/sevenUnits/utils/SemanticVersionNumber.java (renamed from src/main/java/sevenUnits/SemanticVersionNumber.java) | 8 | ||||
| -rw-r--r-- | src/test/java/sevenUnits/utils/SemanticVersionTest.java (renamed from src/test/java/sevenUnits/SemanticVersionTest.java) | 14 | ||||
| -rw-r--r-- | src/test/java/sevenUnitsGUI/package-info.java | 23 |
4 files changed, 13 insertions, 34 deletions
diff --git a/src/main/java/sevenUnits/ProgramInfo.java b/src/main/java/sevenUnits/ProgramInfo.java index 876367d..6407d7c 100644 --- a/src/main/java/sevenUnits/ProgramInfo.java +++ b/src/main/java/sevenUnits/ProgramInfo.java @@ -16,6 +16,8 @@ */ package sevenUnits; +import sevenUnits.utils.SemanticVersionNumber; + /** * Information about 7Units * diff --git a/src/main/java/sevenUnits/SemanticVersionNumber.java b/src/main/java/sevenUnits/utils/SemanticVersionNumber.java index 01aeb27..06417c5 100644 --- a/src/main/java/sevenUnits/SemanticVersionNumber.java +++ b/src/main/java/sevenUnits/utils/SemanticVersionNumber.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -package sevenUnits; +package sevenUnits.utils; import java.util.ArrayList; import java.util.Arrays; @@ -241,7 +241,7 @@ public final class SemanticVersionNumber Objects.requireNonNull(o2, "o2 may not be null"); final int naturalComparison = o1.compareTo(o2); if (naturalComparison == 0) - return SemanticVersionNumber.compare(o1.buildMetadata, + return SemanticVersionNumber.compareIdentifiers(o1.buildMetadata, o2.buildMetadata); else return naturalComparison; @@ -295,7 +295,7 @@ public final class SemanticVersionNumber * @see Comparator * @since 2022-02-20 */ - private static final int compare(List<String> a, List<String> b) { + private static final int compareIdentifiers(List<String> a, List<String> b) { // test pre-release size final int aSize = a.size(); final int bSize = b.size(); @@ -533,7 +533,7 @@ public final class SemanticVersionNumber // now we just compare pre-release identifiers // (remember: build metadata is ignored) - return SemanticVersionNumber.compare(this.preReleaseIdentifiers, + return SemanticVersionNumber.compareIdentifiers(this.preReleaseIdentifiers, o.preReleaseIdentifiers); } diff --git a/src/test/java/sevenUnits/SemanticVersionTest.java b/src/test/java/sevenUnits/utils/SemanticVersionTest.java index 9202ef9..877b258 100644 --- a/src/test/java/sevenUnits/SemanticVersionTest.java +++ b/src/test/java/sevenUnits/utils/SemanticVersionTest.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -package sevenUnits; +package sevenUnits.utils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static sevenUnits.SemanticVersionNumber.BUILD_METADATA_COMPARATOR; -import static sevenUnits.SemanticVersionNumber.builder; -import static sevenUnits.SemanticVersionNumber.fromString; -import static sevenUnits.SemanticVersionNumber.isValidVersionString; -import static sevenUnits.SemanticVersionNumber.preRelease; -import static sevenUnits.SemanticVersionNumber.stableVersion; +import static sevenUnits.utils.SemanticVersionNumber.BUILD_METADATA_COMPARATOR; +import static sevenUnits.utils.SemanticVersionNumber.builder; +import static sevenUnits.utils.SemanticVersionNumber.fromString; +import static sevenUnits.utils.SemanticVersionNumber.isValidVersionString; +import static sevenUnits.utils.SemanticVersionNumber.preRelease; +import static sevenUnits.utils.SemanticVersionNumber.stableVersion; import java.util.List; diff --git a/src/test/java/sevenUnitsGUI/package-info.java b/src/test/java/sevenUnitsGUI/package-info.java deleted file mode 100644 index 96bdbd9..0000000 --- a/src/test/java/sevenUnitsGUI/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2022 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ -/** - * Tests for the new 7Units GUI - * - * @author Adrien Hopkins - * @since 2022-01-29 - */ -package sevenUnitsGUI;
\ No newline at end of file |