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: Refactored "SvnChangelistListener" - code simplified, @NotNull

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2016-03-14 21:26:24 +03:00
parent ad46885e5e
commit e68cdd0c12
5 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangelistListener.java
+17 -28
View File
@@ -16,7 +16,6 @@
package org.jetbrains.idea.svn;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.vcs.AbstractVcs;
@@ -24,9 +23,11 @@ import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.util.ThrowableConsumer;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn.change.ChangeListClient;
import org.jetbrains.idea.svn.commandLine.SvnBindException;
import org.jetbrains.idea.svn.status.Status;
import org.tmatesoft.svn.core.SVNErrorCode;
@@ -38,17 +39,15 @@ import java.util.List;
public class SvnChangelistListener implements ChangeListListener {
private final static Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnChangelistListener");
private final Project myProject;
private final SvnVcs myVcs;
@NotNull private final SvnVcs myVcs;
@NotNull private final Condition<FilePath> myUnderSvnCondition;
public SvnChangelistListener(@NotNull final Project project, @NotNull final SvnVcs vcs) {
myProject = project;
public SvnChangelistListener(@NotNull SvnVcs vcs) {
myVcs = vcs;
myUnderSvnCondition = new Condition<FilePath>() {
@Override
public boolean value(@NotNull FilePath path) {
final AbstractVcs vcs = ProjectLevelVcsManager.getInstance(myProject).getVcsFor(path);
final AbstractVcs vcs = ProjectLevelVcsManager.getInstance(myVcs.getProject()).getVcsFor(path);
return vcs != null && SvnVcs.VCS_NAME.equals(vcs.getName());
}
};
@@ -121,7 +120,7 @@ public class SvnChangelistListener implements ChangeListListener {
}
@Nullable
public static String getCurrentMapping(final SvnVcs vcs, final File file) {
public static String getCurrentMapping(@NotNull SvnVcs vcs, @NotNull File file) {
try {
final Status status = vcs.getFactory(file).createStatusClient().doStatus(file, false);
return status == null ? null : status.getChangelistName();
@@ -136,31 +135,21 @@ public class SvnChangelistListener implements ChangeListListener {
return null;
}
public static void putUnderList(@NotNull final Project project, @NotNull final String list, @NotNull final File after)
throws VcsException {
final SvnVcs vcs = SvnVcs.getInstance(project);
try {
vcs.getFactory(after).createChangeListClient().add(list, after, null);
}
catch(SvnBindException e) {
LOG.info(e);
if (!e.contains(SVNErrorCode.WC_NOT_DIRECTORY) && !e.contains(SVNErrorCode.WC_NOT_FILE)) {
throw e;
}
}
catch (VcsException e) {
LOG.info(e);
throw e;
}
public static void putUnderList(@NotNull SvnVcs vcs, @NotNull String list, @NotNull File after) throws VcsException {
doChangeListOperation(vcs, after, client -> client.add(list, after, null));
}
public static void removeFromList(@NotNull final Project project, @NotNull final File after) throws VcsException {
final SvnVcs vcs = SvnVcs.getInstance(project);
public static void removeFromList(@NotNull SvnVcs vcs, @NotNull File after) throws VcsException {
doChangeListOperation(vcs, after, client -> client.remove(after));
}
private static void doChangeListOperation(@NotNull SvnVcs vcs,
@NotNull File file,
@NotNull ThrowableConsumer<ChangeListClient, VcsException> operation) throws VcsException {
try {
vcs.getFactory(after).createChangeListClient().remove(after);
operation.consume(vcs.getFactory(file).createChangeListClient());
}
catch(SvnBindException e) {
catch (SvnBindException e) {
LOG.info(e);
if (!e.contains(SVNErrorCode.WC_NOT_DIRECTORY) && !e.contains(SVNErrorCode.WC_NOT_FILE)) {
throw e;
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
+1 -1
View File
@@ -298,7 +298,7 @@ public class SvnFileSystemListener extends CommandAdapter implements LocalFileOp
}
if (! isUndo && list != null) {
SvnChangelistListener.putUnderList(vcs.getProject(), list, dst);
SvnChangelistListener.putUnderList(vcs, list, dst);
}
}
catch(VcsException e) {
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
myEntriesFileListener = new SvnEntriesFileListener(project);
upgradeIfNeeded(bus);
myChangeListListener = new SvnChangelistListener(myProject, this);
myChangeListListener = new SvnChangelistListener(this);
myVcsListener = new VcsListener() {
@Override
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeListsTest.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class SvnNativeListsTest extends Svn17TestCase {
private void clearListForRevision(final ContentRevision revision) throws VcsException {
if (revision == null) return;
SvnChangelistListener.removeFromList(myProject, revision.getFile().getIOFile());
SvnChangelistListener.removeFromList(SvnVcs.getInstance(myProject), revision.getFile().getIOFile());
}
@Test
plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnNativeListsTest.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.TimeoutUtil;
import org.jetbrains.idea.svn.SvnChangelistListener;
import org.jetbrains.idea.svn.SvnVcs;
import org.junit.Test;
import java.util.Collection;
@@ -55,7 +56,7 @@ public class SvnNativeListsTest extends Svn16TestCase {
private void clearListForRevision(final ContentRevision revision) throws VcsException {
if (revision == null) return;
SvnChangelistListener.removeFromList(myProject, revision.getFile().getIOFile());
SvnChangelistListener.removeFromList(SvnVcs.getInstance(myProject), revision.getFile().getIOFile());
}
@Test