summaryrefslogtreecommitdiff
path: root/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java')
-rw-r--r--plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java
index 493721e3a8d1..fe10696768c1 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/InfoStorage.java
@@ -15,9 +15,6 @@
*/
package org.jetbrains.idea.svn.branchConfig;
-import com.intellij.util.PairConsumer;
-import org.jetbrains.annotations.Nullable;
-
public class InfoStorage<T> {
public T myT;
public InfoReliability myInfoReliability;
@@ -27,14 +24,15 @@ public class InfoStorage<T> {
myInfoReliability = infoReliability;
}
- public void accept(final InfoStorage<T> infoStorage, @Nullable final PairConsumer<T, T> callbackOnUpdate) {
- if (infoStorage.myInfoReliability.shouldOverride(myInfoReliability)) {
- if (callbackOnUpdate != null) {
- callbackOnUpdate.consume(myT, infoStorage.myT);
- }
+ public boolean accept(final InfoStorage<T> infoStorage) {
+ boolean override = infoStorage.myInfoReliability.shouldOverride(myInfoReliability);
+
+ if (override) {
myT = infoStorage.myT;
myInfoReliability = infoStorage.myInfoReliability;
}
+
+ return override;
}
public T getValue() {