diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java index f871ee09855a..a075251e7675 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java @@ -125,7 +125,7 @@ public class FirstInBranch implements Runnable { } } - private static class MyLogEntryHandler implements ISVNLogEntryHandler { + private static class MyLogEntryHandler implements LogEntryConsumer { @NotNull private final SvnPathThroughHistoryCorrection myTrunkCorrector; @NotNull private final SvnPathThroughHistoryCorrection myBranchCorrector; @@ -137,17 +137,18 @@ public class FirstInBranch implements Runnable { myBranchCorrector = new SvnPathThroughHistoryCorrection(branchUrl); } - public void handleLogEntry(SVNLogEntry logEntry) throws SVNException { + @Override + public void consume(LogEntry logEntry) throws SVNException { final Map map = logEntry.getChangedPaths(); checkEntries(logEntry, map); - myTrunkCorrector.handleLogEntry(logEntry); - myBranchCorrector.handleLogEntry(logEntry); + myTrunkCorrector.consume(logEntry); + myBranchCorrector.consume(logEntry); checkEntries(logEntry, map); } - private void checkEntries(SVNLogEntry logEntry, Map map) throws SVNCancelException { + private void checkEntries(LogEntry logEntry, Map map) throws SVNCancelException { for (Object o : map.values()) { - final SVNLogEntryPath path = (SVNLogEntryPath) o; + final LogEntryPath path = (LogEntryPath) o; final String localPath = path.getPath(); final String copyPath = path.getCopyPath(); @@ -159,7 +160,7 @@ public class FirstInBranch implements Runnable { } } - private boolean checkForCopyCase(SVNLogEntry logEntry, SVNLogEntryPath path, String localPath, String copyPath, + private boolean checkForCopyCase(LogEntry logEntry, LogEntryPath path, String localPath, String copyPath, final String trunkUrl, final String branchUrl) { if (equalOrParent(localPath, branchUrl) && equalOrParent(copyPath, trunkUrl)) { myCopyDataConsumer.consume(new CopyData(path.getCopyRevision(), logEntry.getRevision(), true)); |