From d02b9b6ce600bf988b4f41edb2c212ca723003e8 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 4 Mar 2016 14:59:35 +0300 Subject: [PATCH] Mark CHeckinProjectPanel#getCommitMessage() as @NotNull & check usages --- .../dvcs/DvcsCommitAdditionalComponent.java | 2 +- .../openapi/vcs/CheckinProjectPanel.java | 2 + .../changes/ui/CommitChangeListDialog.java | 1 + .../openapi/vcs/ui/CommitMessage.java | 4 +- .../idea/svn/dialogs/ShareDialog.java | 1 + .../tasks/impl/TaskCheckinHandlerFactory.java | 42 ++++++++----------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java b/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java index 3e69dc3fbdb3..f94b0f60ba1b 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java @@ -50,7 +50,7 @@ public abstract class DvcsCommitAdditionalComponent implements RefreshableOnComp protected final JPanel myPanel; protected final JCheckBox myAmend; - @Nullable private final String myPreviousMessage; + @NotNull private final String myPreviousMessage; @Nullable private String myAmendedMessage; @NotNull protected final CheckinProjectPanel myCheckinPanel; @Nullable private Map myMessagesForRoots; diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/CheckinProjectPanel.java b/platform/vcs-api/src/com/intellij/openapi/vcs/CheckinProjectPanel.java index 9254e8025b62..ab8f300a7d98 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/CheckinProjectPanel.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/CheckinProjectPanel.java @@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.ui.Refreshable; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.io.File; @@ -91,6 +92,7 @@ public interface CheckinProjectPanel extends Refreshable, CommitMessageI { * @return the description text. * @since 5.1 */ + @NotNull String getCommitMessage(); String getCommitActionName(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 16236e5f15a4..48c94be61899 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -1218,6 +1218,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj myCommitMessageArea.setText(currentDescription); } + @NotNull @Override public String getCommitMessage() { return myCommitMessageArea.getComment(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java index 283470cdd368..c7b1da06aa35 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java @@ -30,6 +30,7 @@ import com.intellij.openapi.vcs.*; import com.intellij.ui.*; import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -152,6 +153,7 @@ public class CommitMessage extends AbstractDataProviderPanel implements Disposab } } + @NotNull public String getComment() { final String s = myEditorField.getDocument().getCharsSequence().toString(); int end = s.length(); @@ -164,8 +166,8 @@ public class CommitMessage extends AbstractDataProviderPanel implements Disposab public void requestFocusInMessage() { myEditorField.requestFocus(); myEditorField.selectAll(); - } + } @Override public boolean isCheckSpelling() { return myCheckSpelling; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java index 95b137115407..9279a7bcaa5a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java @@ -175,6 +175,7 @@ public class ShareDialog extends RepositoryBrowserDialog { return myCreateStandard.isSelected(); } + @NotNull public String getCommitText() { return myCommitMessage.getComment(); } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java index d7e78c068e40..943632e6091e 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java @@ -31,10 +31,6 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.Date; -/** - * @author Dmitry Avdeev - * Date: 12/29/11 - */ public class TaskCheckinHandlerFactory extends CheckinHandlerFactory { @NotNull @@ -44,27 +40,25 @@ public class TaskCheckinHandlerFactory extends CheckinHandlerFactory { @Override public void checkinSuccessful() { final String message = panel.getCommitMessage(); - if (message != null) { - final Project project = panel.getProject(); - final TaskManagerImpl manager = (TaskManagerImpl)TaskManager.getManager(project); - if (manager.getState().saveContextOnCommit) { - Task task = findTaskInRepositories(message, manager); - if (task == null) { - task = manager.createLocalTask(message); - } - final LocalTask localTask = manager.addTask(task); - localTask.setUpdated(new Date()); - - //noinspection SSBasedInspection - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - if (!project.isDisposed()) { - WorkingContextManager.getInstance(project).saveContext(localTask); - } - } - }); + final Project project = panel.getProject(); + final TaskManagerImpl manager = (TaskManagerImpl)TaskManager.getManager(project); + if (manager.getState().saveContextOnCommit) { + Task task = findTaskInRepositories(message, manager); + if (task == null) { + task = manager.createLocalTask(message); } + final LocalTask localTask = manager.addTask(task); + localTask.setUpdated(new Date()); + + //noinspection SSBasedInspection + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (!project.isDisposed()) { + WorkingContextManager.getInstance(project).saveContext(localTask); + } + } + }); } } };