diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceTracker.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceTracker.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceTracker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceTracker.java index 53f151876ec9..023d8489d795 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceTracker.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceTracker.java @@ -18,24 +18,23 @@ package org.jetbrains.idea.svn.history; import com.intellij.openapi.util.Pair; import com.intellij.util.ThrowableConsumer; import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.SVNLogEntry; public class SvnMergeSourceTracker { private int myMergeLevel; // -1 - not merge source; 0 - direct merge source - private ThrowableConsumer<Pair<SVNLogEntry, Integer>, SVNException> myConsumer; + private ThrowableConsumer<Pair<LogEntry, Integer>, SVNException> myConsumer; - public SvnMergeSourceTracker(final ThrowableConsumer<Pair<SVNLogEntry, Integer>, SVNException> consumer) { + public SvnMergeSourceTracker(final ThrowableConsumer<Pair<LogEntry, Integer>, SVNException> consumer) { myConsumer = consumer; myMergeLevel = -1; } - public void consume(final SVNLogEntry logEntry) throws SVNException { + public void consume(final LogEntry logEntry) throws SVNException { if (logEntry.getRevision() < 0) { -- myMergeLevel; return; } - myConsumer.consume(new Pair<SVNLogEntry, Integer>(logEntry, myMergeLevel)); + myConsumer.consume(new Pair<LogEntry, Integer>(logEntry, myMergeLevel)); if (logEntry.hasChildren()) { ++ myMergeLevel; } |