diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnPathThroughHistoryCorrection.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnPathThroughHistoryCorrection.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnPathThroughHistoryCorrection.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnPathThroughHistoryCorrection.java index 8ecb8a3b1e90..bf6c08e74759 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnPathThroughHistoryCorrection.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnPathThroughHistoryCorrection.java @@ -17,10 +17,7 @@ package org.jetbrains.idea.svn.history; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.idea.svn.SvnUtil; -import org.tmatesoft.svn.core.ISVNLogEntryHandler; import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.SVNLogEntry; -import org.tmatesoft.svn.core.SVNLogEntryPath; import org.tmatesoft.svn.core.internal.util.SVNPathUtil; import java.util.Map; @@ -33,10 +30,10 @@ import java.util.Map; * * We consider here, that history is traversed "from now to past" */ -public class SvnPathThroughHistoryCorrection implements ISVNLogEntryHandler { +public class SvnPathThroughHistoryCorrection implements LogEntryConsumer { private String myBefore; private String myPath; - private SVNLogEntryPath myDirectlyMentioned; + private LogEntryPath myDirectlyMentioned; private boolean myRoot; public SvnPathThroughHistoryCorrection(String path) { @@ -46,14 +43,14 @@ public class SvnPathThroughHistoryCorrection implements ISVNLogEntryHandler { } @Override - public void handleLogEntry(SVNLogEntry logEntry) throws SVNException { + public void consume(LogEntry logEntry) throws SVNException { if (myRoot) { return; } myBefore = myPath; myDirectlyMentioned = null; - final Map<String,SVNLogEntryPath> paths = logEntry.getChangedPaths(); - final SVNLogEntryPath entryPath = paths.get(myPath); + final Map<String,LogEntryPath> paths = logEntry.getChangedPaths(); + final LogEntryPath entryPath = paths.get(myPath); if (entryPath != null) { myDirectlyMentioned = entryPath; // exact match @@ -62,7 +59,7 @@ public class SvnPathThroughHistoryCorrection implements ISVNLogEntryHandler { return; } } - for (SVNLogEntryPath path : paths.values()) { + for (LogEntryPath path : paths.values()) { // "the origin path *from where* the item, ..." // TODO: this could incorrectly handle case when parent folder was replaced - see IDEA-103042 // TODO: or several parent folder renames occur IDEA-96825 @@ -89,7 +86,7 @@ public class SvnPathThroughHistoryCorrection implements ISVNLogEntryHandler { return myBefore; } - public SVNLogEntryPath getDirectlyMentioned() { + public LogEntryPath getDirectlyMentioned() { return myDirectlyMentioned; } |