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

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-07-30 17:56:28 +03:00
parent 5b6b79c92b
commit 62c3169657
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class GitBinaryHandler extends GitHandler {
@NotNull private final Semaphore mySteamSemaphore = new Semaphore(0); // The semaphore that waits for stream processing
@NotNull private final AtomicReference<VcsException> myException = new AtomicReference<>();
public GitBinaryHandler(final Project project, final VirtualFile vcsRoot, final GitCommand command) {
public GitBinaryHandler(@NotNull Project project, @NotNull VirtualFile vcsRoot, @NotNull GitCommand command) {
super(project, vcsRoot, command, Collections.emptyList());
}
plugins/git4idea/src/git4idea/commands/GitHandler.java
+4 -8
View File
@@ -135,7 +135,7 @@ public abstract class GitHandler {
}
@NotNull
static List<String> getConfigParameters(@Nullable Project project, @NotNull List<String> requestedConfigParameters) {
private static List<String> getConfigParameters(@Nullable Project project, @NotNull List<String> requestedConfigParameters) {
if (project == null || !GitVersionSpecialty.CAN_OVERRIDE_GIT_CONFIG_FOR_COMMAND.existsIn(project)) {
return Collections.emptyList();
}
@@ -185,7 +185,7 @@ public abstract class GitHandler {
*
* @param listener a listener
*/
protected void addListener(ProcessEventListener listener) {
protected void addListener(@NotNull ProcessEventListener listener) {
myListeners.addListener(listener);
}
@@ -205,7 +205,6 @@ public abstract class GitHandler {
*
* @param parameters a parameters to add
*/
@SuppressWarnings({"WeakerAccess"})
public void addParameters(@NonNls @NotNull String... parameters) {
addParameters(Arrays.asList(parameters));
}
@@ -254,7 +253,6 @@ public abstract class GitHandler {
* @param filePaths a parameters to add
* @throws IllegalArgumentException if some path is not under root.
*/
@SuppressWarnings({"WeakerAccess"})
public void addRelativePaths(@NotNull final Collection<FilePath> filePaths) {
checkNotStarted();
for (FilePath path : filePaths) {
@@ -273,7 +271,6 @@ public abstract class GitHandler {
* @param files a parameters to add
* @throws IllegalArgumentException if some path is not under root.
*/
@SuppressWarnings({"WeakerAccess"})
public void addRelativeFiles(@NotNull final Collection<VirtualFile> files) {
checkNotStarted();
for (VirtualFile file : files) {
@@ -341,7 +338,6 @@ public abstract class GitHandler {
*
* @param charset a character set
*/
@SuppressWarnings({"SameParameterValue"})
public void setCharset(@NotNull Charset charset) {
myCommandLine.setCharset(charset);
}
@@ -535,13 +531,13 @@ public abstract class GitHandler {
@Deprecated
private Integer myExitCode; // exit code or null if exit code is not yet available
@Deprecated
private final List<String> myLastOutput = Collections.synchronizedList(new ArrayList<String>());
private final List<String> myLastOutput = Collections.synchronizedList(new ArrayList<>());
@Deprecated
private final int LAST_OUTPUT_SIZE = 5;
@Deprecated
private boolean myProgressParameterAllowed = false;
@Deprecated
private final List<VcsException> myErrors = Collections.synchronizedList(new ArrayList<VcsException>());
private final List<VcsException> myErrors = Collections.synchronizedList(new ArrayList<>());
/**
* Adds "--progress" parameter. Usable for long operations, such as clone or fetch.