vcs: remove deprecated registry options

This commit is contained in:
Aleksey Pivovarov
2016-04-18 14:08:43 +03:00
parent 6597584aec
commit d17adbea09
2 changed files with 2 additions and 6 deletions
@@ -253,7 +253,6 @@ compiler.document.save.trigger.delay.description=Delay in milliseconds before tr
compiler.build.data.unused.threshold=30
compiler.build.data.unused.threshold.description=If project is not opened for the specified number of days, its build data will be cleared to save disk space
vcs.show.colored.annotations=true
vcs.annotations.preload=false
vcs.showConsole=true
vcs.log.bek.sort.disabled=false
@@ -280,7 +279,6 @@ structureView.coalesceTime=500
keymap.show.alias.actions=false
frameworks.download.libraries.server.url=http://pluginsrepo-test:8080
caches.indexerThreadsCount=-1
vcs.show.history.numbers=true
navBar.updateMergeTime=100
navBar.userActivityMergeTime=100
@@ -26,7 +26,6 @@ import com.intellij.openapi.localVcs.UpToDateLineNumberProvider;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.annotate.AnnotationGutterActionProvider;
@@ -121,9 +120,8 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware {
presentation.addAction(new CopyRevisionNumberFromAnnotateAction(fileAnnotation));
presentation.addAction(Separator.getInstance());
final Couple<Map<VcsRevisionNumber, Color>> bgColorMap =
Registry.is("vcs.show.colored.annotations") ? computeBgColors(fileAnnotation, editor) : null;
final Map<VcsRevisionNumber, Integer> historyIds = Registry.is("vcs.show.history.numbers") ? computeLineNumbers(fileAnnotation) : null;
final Couple<Map<VcsRevisionNumber, Color>> bgColorMap = computeBgColors(fileAnnotation, editor);
final Map<VcsRevisionNumber, Integer> historyIds = computeLineNumbers(fileAnnotation);
if (switcher != null) {
switcher.switchTo(switcher.getDefaultSource());