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

vcs: unify code for default and custom CommitExecutors

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-11-30 15:38:35 +03:00
committed by Aleksey Pivovarov
parent 8b4d37af4c
commit 19456307fc
1 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+56 -56
View File
@@ -716,66 +716,71 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
((CommitSessionContextAware)session).setContext(myCommitContext);
}
final JComponent configurationUI = SessionDialog.createConfigurationUI(session, getIncludedChanges(), getCommitMessage());
if (configurationUI != null) {
DialogWrapper sessionDialog = new SessionDialog(commitExecutor.getActionText(),
getProject(),
session,
getIncludedChanges(),
getCommitMessage(), configurationUI);
if (!sessionDialog.showAndGet()) {
session.executionCanceled();
return;
}
}
final DefaultListCleaner defaultListCleaner = new DefaultListCleaner();
runBeforeCommitHandlers(new Runnable() {
ensureDataIsActual(new Runnable() {
@Override
public void run() {
boolean success = false;
try {
final boolean completed = ProgressManager.getInstance().runProcessWithProgressSynchronously(
new Runnable() {
@Override
public void run() {
session.execute(getIncludedChanges(), getCommitMessage());
}
}, commitExecutor.getActionText(), true, getProject());
if (completed) {
for (CheckinHandler handler : myHandlers) {
handler.checkinSuccessful();
}
success = true;
defaultListCleaner.clean();
close(OK_EXIT_CODE);
}
else {
final JComponent configurationUI = SessionDialog.createConfigurationUI(session, getIncludedChanges(), getCommitMessage());
if (configurationUI != null) {
DialogWrapper sessionDialog = new SessionDialog(commitExecutor.getActionText(),
getProject(),
session,
getIncludedChanges(),
getCommitMessage(), configurationUI);
if (!sessionDialog.showAndGet()) {
session.executionCanceled();
return;
}
}
catch (Throwable e) {
Messages.showErrorDialog(VcsBundle.message("error.executing.commit", commitExecutor.getActionText(), e.getLocalizedMessage()),
commitExecutor.getActionText());
for (CheckinHandler handler : myHandlers) {
handler.checkinFailed(Collections.singletonList(new VcsException(e)));
}
}
finally {
if (myResultHandler != null) {
if (success) {
myResultHandler.onSuccess(getCommitMessage());
final DefaultListCleaner defaultListCleaner = new DefaultListCleaner();
runBeforeCommitHandlers(new Runnable() {
@Override
public void run() {
boolean success = false;
try {
final boolean completed = ProgressManager.getInstance().runProcessWithProgressSynchronously(
new Runnable() {
@Override
public void run() {
session.execute(getIncludedChanges(), getCommitMessage());
}
}, commitExecutor.getActionText(), true, getProject());
if (completed) {
for (CheckinHandler handler : myHandlers) {
handler.checkinSuccessful();
}
success = true;
defaultListCleaner.clean();
close(OK_EXIT_CODE);
}
else {
session.executionCanceled();
}
}
else {
myResultHandler.onFailure();
catch (Throwable e) {
Messages.showErrorDialog(VcsBundle.message("error.executing.commit", commitExecutor.getActionText(), e.getLocalizedMessage()),
commitExecutor.getActionText());
for (CheckinHandler handler : myHandlers) {
handler.checkinFailed(Collections.singletonList(new VcsException(e)));
}
}
finally {
if (myResultHandler != null) {
if (success) {
myResultHandler.onSuccess(getCommitMessage());
}
else {
myResultHandler.onFailure();
}
}
}
}
}
}, commitExecutor);
}
}, commitExecutor);
});
}
@Nullable
@@ -1198,12 +1203,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
@Override
public void actionPerformed(ActionEvent e) {
ensureDataIsActual(new Runnable() {
@Override
public void run() {
execute(myCommitExecutor);
}
});
execute(myCommitExecutor);
}
public void updateEnabled(boolean hasDiffs) {