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: Refactoring - replaced "SvnChangeProvider.ourDefaultListName" with "LocalChangeList.DEFAULT_NAME"

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2016-03-14 21:26:24 +03:00
parent c3819ff862
commit ad46885e5e
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
-2
View File
@@ -27,7 +27,6 @@ import com.intellij.openapi.util.NotNullFactory;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.actions.VcsContextFactory;
import com.intellij.openapi.vcs.changes.*;
@@ -59,7 +58,6 @@ import java.util.*;
*/
public class SvnChangeProvider implements ChangeProvider {
private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnChangeProvider");
public static final String ourDefaultListName = VcsBundle.message("changes.default.changelist.name");
public static final String PROPERTY_LAYER = "Property";
private static final NotNullFactory<Map<String, File>> NAME_TO_FILE_MAP_FACTORY = new NotNullFactory<Map<String, File>>() {
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangelistListener.java
+6 -9
View File
@@ -23,10 +23,7 @@ import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeList;
import com.intellij.openapi.vcs.changes.ChangeListListener;
import com.intellij.openapi.vcs.changes.ChangesUtil;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -62,14 +59,14 @@ public class SvnChangelistListener implements ChangeListListener {
}
public void changesRemoved(final Collection<Change> changes, final ChangeList fromList) {
if (SvnChangeProvider.ourDefaultListName.equals(fromList.getName())) {
if (LocalChangeList.DEFAULT_NAME.equals(fromList.getName())) {
return;
}
removeFromChangeList(changes);
}
public void changesAdded(Collection<Change> changes, ChangeList toList) {
if (toList == null || SvnChangeProvider.ourDefaultListName.equals(toList.getName())) {
if (toList == null || LocalChangeList.DEFAULT_NAME.equals(toList.getName())) {
return;
}
addToChangeList(toList.getName(), changes);
@@ -91,7 +88,7 @@ public class SvnChangelistListener implements ChangeListListener {
if (Comparing.equal(list.getName(), oldName)) {
return;
}
if (SvnChangeProvider.ourDefaultListName.equals(list.getName())) {
if (LocalChangeList.DEFAULT_NAME.equals(list.getName())) {
changeListRemoved(list);
return;
}
@@ -105,12 +102,12 @@ public class SvnChangelistListener implements ChangeListListener {
if (fromList.getName().equals(toList.getName())) {
return;
}
if (SvnChangeProvider.ourDefaultListName.equals(toList.getName())) {
if (LocalChangeList.DEFAULT_NAME.equals(toList.getName())) {
changeListRemoved(toList);
return;
}
final String[] fromLists = SvnChangeProvider.ourDefaultListName.equals(fromList.getName()) ? null : new String[] {fromList.getName()};
final String[] fromLists = LocalChangeList.DEFAULT_NAME.equals(fromList.getName()) ? null : new String[] {fromList.getName()};
addToChangeList(toList.getName(), changes, fromLists);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+1 -1
View File
@@ -279,7 +279,7 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
public void processLoadedLists(final List<LocalChangeList> lists) {
if (lists.isEmpty()) return;
try {
ChangeListManager.getInstance(myProject).setReadOnly(SvnChangeProvider.ourDefaultListName, true);
ChangeListManager.getInstance(myProject).setReadOnly(LocalChangeList.DEFAULT_NAME, true);
if (!myConfiguration.changeListsSynchronized()) {
processChangeLists(lists);
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeListsTest.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class SvnNativeListsTest extends Svn17TestCase {
public void tearDown() throws Exception {
final List<LocalChangeList> changeListList = myChangeListManager.getChangeLists();
for (LocalChangeList list : changeListList) {
if (SvnChangeProvider.ourDefaultListName.equals(list.getName())) continue;
if (LocalChangeList.DEFAULT_NAME.equals(list.getName())) continue;
final Collection<Change> changes = list.getChanges();
for (Change change : changes) {
clearListForRevision(change.getBeforeRevision());
plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnNativeListsTest.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.vcs.VcsTestUtil;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.TimeoutUtil;
import org.jetbrains.idea.svn.SvnChangeProvider;
import org.jetbrains.idea.svn.SvnChangelistListener;
import org.junit.Test;
@@ -43,7 +42,7 @@ public class SvnNativeListsTest extends Svn16TestCase {
public void tearDown() throws Exception {
final List<LocalChangeList> changeListList = myChangeListManager.getChangeLists();
for (LocalChangeList list : changeListList) {
if (SvnChangeProvider.ourDefaultListName.equals(list.getName())) continue;
if (LocalChangeList.DEFAULT_NAME.equals(list.getName())) continue;
final Collection<Change> changes = list.getChanges();
for (Change change : changes) {
clearListForRevision(change.getBeforeRevision());