MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

svn: Refactoring - removed unnecessary "BaseMergeTask.end()" calls

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2016-11-09 23:53:59 +03:00
parent 09f0cc6988
commit fe61b7a57b
4 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java
+2 -7
View File
@@ -119,14 +119,9 @@ public abstract class BaseMergeTask extends TaskDescriptor {
@CalledInAny
protected void end(@NotNull VcsException e) {
end(myMergeContext.getTitle(), e);
}
@CalledInAny
protected void end(@NotNull String message, @NotNull VcsException e) {
LOG.info(message, e);
LOG.info(e);
end();
getApplication().invokeLater(() -> myInteraction.showErrors(message, singletonList(e)));
getApplication().invokeLater(() -> myInteraction.showErrors(myMergeContext.getTitle(), singletonList(e)));
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LookForBranchOriginTask.java
+7 -13
View File
@@ -35,24 +35,18 @@ public class LookForBranchOriginTask extends BaseMergeTask {
}
@Override
public void run() {
public void run() throws VcsException {
SVNURL repoUrl = myMergeContext.getWcInfo().getRootInfo().getRepositoryUrlUrl();
String sourceUrl = myFromSource ? myMergeContext.getSourceUrl() : myMergeContext.getWcInfo().getRootUrl();
String targetUrl = myFromSource ? myMergeContext.getWcInfo().getRootUrl() : myMergeContext.getSourceUrl();
SvnBranchPointsCalculator.WrapperInvertor copyPoint =
myMergeContext.getVcs().getSvnBranchPointsCalculator().calculateCopyPoint(repoUrl, sourceUrl, targetUrl);
try {
SvnBranchPointsCalculator.WrapperInvertor copyPoint =
myMergeContext.getVcs().getSvnBranchPointsCalculator().calculateCopyPoint(repoUrl, sourceUrl, targetUrl);
if (copyPoint != null) {
myCallback.consume(copyPoint);
}
else {
end("Merge start wasn't found", true);
}
if (copyPoint != null) {
myCallback.consume(copyPoint);
}
catch (VcsException e) {
end("Merge start wasn't found", e);
else {
end("Merge start wasn't found", true);
}
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeAllWithBranchCopyPointTask.java
+1 -4
View File
@@ -42,10 +42,7 @@ public class MergeAllWithBranchCopyPointTask extends BaseMergeTask {
public void run() {
boolean reintegrate = myCopyPoint != null && myCopyPoint.isInvertedSense();
if (reintegrate && !myInteraction.shouldReintegrate(myCopyPoint.inverted().getTarget())) {
end();
}
else {
if (!reintegrate || myInteraction.shouldReintegrate(myCopyPoint.inverted().getTarget())) {
MergerFactory mergerFactory = createBranchMergerFactory(reintegrate);
String title = "Merging all from " + myMergeContext.getBranchName() + (reintegrate ? " (reintegrate)" : "");
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java
+4 -4
View File
@@ -48,15 +48,15 @@ public class ShowRevisionSelector extends BaseMergeTask {
myInteraction.selectMergeItems(myChangeLists, myMergeChecker, myAllStatusesCalculated, myAllListsLoaded);
switch (result.getResultCode()) {
case cancel:
end();
break;
case all:
mergeAll(true);
break;
default:
case select:
case showLatest:
merge(result.getSelectedLists());
break;
case cancel:
break;
}
}
}