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

[git] cleanup: formatting, notnull

Browse Source
This commit is contained in:
Kirill Likhodedov
2015-09-18 16:07:05 +03:00
parent 009fb707f9
commit 7d443bfb62
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
+13 -6
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vcs.merge.MergeDialogCustomizer;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import git4idea.GitPlatformFacade;
import git4idea.commands.Git;
import git4idea.commands.GitCommandResult;
@@ -40,22 +41,28 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.event.HyperlinkEvent;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
public class GitStashChangesSaver extends GitChangesSaver {
private static final Logger LOG = Logger.getInstance(GitStashChangesSaver.class);
private final Set<VirtualFile> myStashedRoots = new HashSet<VirtualFile>(); // save stashed roots to unstash only them
@NotNull private final GitRepositoryManager myRepositoryManager;
public GitStashChangesSaver(@NotNull Project project, @NotNull GitPlatformFacade platformFacade, @NotNull Git git,
@NotNull ProgressIndicator progressIndicator, @NotNull String stashMessage) {
@NotNull private final GitRepositoryManager myRepositoryManager;
@NotNull private final Set<VirtualFile> myStashedRoots = ContainerUtil.newHashSet(); // save stashed roots to unstash only them
public GitStashChangesSaver(@NotNull Project project,
@NotNull GitPlatformFacade platformFacade,
@NotNull Git git,
@NotNull ProgressIndicator progressIndicator,
@NotNull String stashMessage) {
super(project, platformFacade, git, progressIndicator, stashMessage);
myRepositoryManager = platformFacade.getRepositoryManager(project);
}
@Override
protected void save(Collection<VirtualFile> rootsToSave) throws VcsException {
protected void save(@NotNull Collection<VirtualFile> rootsToSave) throws VcsException {
LOG.info("saving " + rootsToSave);
for (VirtualFile root : rootsToSave) {
plugins/git4idea/src/git4idea/stash/GitStashUtils.java
-6
View File
@@ -15,7 +15,6 @@
*/
package git4idea.stash;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vfs.VirtualFile;
@@ -30,13 +29,8 @@ import org.jetbrains.annotations.NotNull;
import java.nio.charset.Charset;
/**
* The class contains utilities for creating and removing stashes.
*/
public class GitStashUtils {
private static final Logger LOG = Logger.getInstance(GitStashUtils.class);
private GitStashUtils() {
}