Fast-forward master to working and delete working #1

Merged
AMNatty merged 29 commits from working into master 2022-04-06 09:04:32 +00:00
1 changed files with 15 additions and 15 deletions
Showing only changes of commit badec75f10 - Show all commits

View File

@ -186,31 +186,31 @@ public final class PlutoVersion implements IVersion<PlutoVersion>
if (this == o) if (this == o)
return true; return true;
if (o == null || getClass() != o.getClass()) if (o == null || this.getClass() != o.getClass())
return false; return false;
PlutoVersion that = (PlutoVersion) o; PlutoVersion that = (PlutoVersion) o;
if (prerelease) if (this.prerelease)
return year == that.year && return this.year == that.year &&
major == that.major && this.major == that.major &&
minor == that.minor && this.minor == that.minor &&
patch == that.patch && this.patch == that.patch &&
prereleaseNumber == that.prereleaseNumber && this.prereleaseNumber == that.prereleaseNumber &&
Objects.equals(prereleaseName, that.prereleaseName); Objects.equals(this.prereleaseName, that.prereleaseName);
else else
return year == that.year && return this.year == that.year &&
major == that.major && this.major == that.major &&
minor == that.minor && this.minor == that.minor &&
patch == that.patch; this.patch == that.patch;
} }
@Override @Override
public int hashCode() public int hashCode()
{ {
if (prerelease) if (this.prerelease)
return Objects.hash(year, major, minor, patch); return Objects.hash(this.year, this.major, this.minor, this.patch);
else else
return Objects.hash(year, major, minor, patch, prereleaseName, prereleaseNumber); return Objects.hash(this.year, this.major, this.minor, this.patch, this.prereleaseName, this.prereleaseNumber);
} }
} }