diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-02-24 16:44:13 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-02-24 16:44:13 -0500 |
| commit | b7eee33a5b162b4057d04d28f45738e3048bf01d (patch) | |
| tree | 3b99cc019fac82fb5813e4e14a0d710e9cbf3913 /src/main/java | |
| parent | 63740b955b5baf955cac4f720a4c75f576d645f4 (diff) | |
Moved SemanticVersionNumber to sevenUnits.utils
Diffstat (limited to 'src/main/java')
| -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 |
2 files changed, 6 insertions, 4 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); } |