X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneModificationDetector.java;h=810241a9c34de54cfeff5f75eb55b55b266328b1;hp=5c1c02121f38c13d59c86515c9d3bfdaedf66291;hb=4b42574c9ec4490100ac3e87b9c2f3aac965a202;hpb=0cefad523bfa6d57bad7b20b0491394edebb28fa diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java index 5c1c021..810241a 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java @@ -27,8 +27,8 @@ class SoneModificationDetector { private final LockableFingerprintProvider lockableFingerprintProvider; private final AtomicInteger insertionDelay; private Optional lastModificationTime; - private String originalFingerprint; - private String lastFingerprint; + private String lastInsertFingerprint; + private String lastCheckFingerprint; SoneModificationDetector(LockableFingerprintProvider lockableFingerprintProvider, AtomicInteger insertionDelay) { this(systemTicker(), lockableFingerprintProvider, insertionDelay); @@ -39,36 +39,36 @@ class SoneModificationDetector { this.ticker = ticker; this.lockableFingerprintProvider = lockableFingerprintProvider; this.insertionDelay = insertionDelay; - lastFingerprint = originalFingerprint; + lastCheckFingerprint = lastInsertFingerprint; } public boolean isEligibleForInsert() { if (lockableFingerprintProvider.isLocked()) { lastModificationTime = absent(); - lastFingerprint = ""; + lastCheckFingerprint = ""; return false; } String fingerprint = lockableFingerprintProvider.getFingerprint(); - if (originalFingerprint.equals(fingerprint)) { + if (fingerprint.equals(lastInsertFingerprint)) { lastModificationTime = absent(); - lastFingerprint = fingerprint; + lastCheckFingerprint = fingerprint; return false; } - if (!lastFingerprint.equals(fingerprint)) { + if (!Objects.equal(lastCheckFingerprint, fingerprint)) { lastModificationTime = of(ticker.read()); - lastFingerprint = fingerprint; + lastCheckFingerprint = fingerprint; return false; } return insertionDelayHasPassed(); } - public String getOriginalFingerprint() { - return originalFingerprint; + public String getLastInsertFingerprint() { + return lastInsertFingerprint; } public void setFingerprint(String fingerprint) { - originalFingerprint = fingerprint; - lastFingerprint = originalFingerprint; + lastInsertFingerprint = fingerprint; + lastCheckFingerprint = lastInsertFingerprint; lastModificationTime = absent(); } @@ -77,7 +77,7 @@ class SoneModificationDetector { } public boolean isModified() { - return !Objects.equal(lockableFingerprintProvider.getFingerprint(), originalFingerprint); + return !Objects.equal(lockableFingerprintProvider.getFingerprint(), lastInsertFingerprint); } /**