[vcs-log] optimize imports in vcs-log-impl
authorJulia Beliaeva <Julia.Beliaeva@jetbrains.com>
Thu, 26 May 2016 20:02:22 +0000 (23:02 +0300)
committerJulia Beliaeva <Julia.Beliaeva@jetbrains.com>
Thu, 26 May 2016 21:17:12 +0000 (00:17 +0300)
33 files changed:
platform/vcs-log/impl/src/com/intellij/vcs/log/data/AbstractDataGetter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/ContainingBranchesGetter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/InMemoryHashMap.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogBranchFilterImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFiltererImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogStructureFilterImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiPropertiesImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsUserRegistryImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/PostponableLogRefresher.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/TimedVcsCommitImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogContentProvider.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogTabsWatcher.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogUtil.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToHashOrRefAction.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToHashOrRefPopup.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultilinePopupBuilder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogUserFilterImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRenderer.java
platform/vcs-log/impl/src/com/intellij/vcs/log/util/PersistentUtil.java
platform/vcs-log/impl/src/com/intellij/vcs/log/util/StopWatch.java

index b056bc4fd3d11da1d35b40d81986350cc3eb06ce..91a1a91d9de13248538264fc0d8d4bfc2b5af366 100644 (file)
@@ -7,12 +7,10 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
-import com.intellij.util.ThrowableConsumer;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.util.ui.UIUtil;
@@ -20,7 +18,6 @@ import com.intellij.vcs.log.*;
 import com.intellij.vcs.log.util.SequentialLimitedLifoExecutor;
 import gnu.trove.TIntHashSet;
 import gnu.trove.TIntIntHashMap;
-import gnu.trove.TIntProcedure;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
index b787fa4d077dfb95d47670a7bd9d732922c8d9ed..2c227a7235d642b7dddea2499e098cb099a2cd54 100644 (file)
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Conditions;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.ThrowableConsumer;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.SLRUMap;
 import com.intellij.vcs.log.*;
index 3e3d07f11a1ae038bf0d5d762863db7af3a64728..216d4f0bc41e6fcc95f59e32caf8cbd6474eddb9 100644 (file)
@@ -26,7 +26,6 @@ import com.intellij.vcs.log.graph.impl.facade.PermanentGraphImpl;
 import com.intellij.vcs.log.util.StopWatch;
 import gnu.trove.TIntHashSet;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
index 005fb4decb05ee375a79a38eae86db9ffd91c666..8f18d7f5e9516beaeded7ee7783ab15c2e71e5b8 100644 (file)
@@ -15,9 +15,7 @@
  */
 package com.intellij.vcs.log.data;
 
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogFilterCollection;
 import com.intellij.vcs.log.VcsLogHashMap;
index 66cb42d2775e11b210f34ab34a40277bcb083fbc..75b0abf0de60cafd71db81ee0ec6eebb0d358b4e 100644 (file)
@@ -22,7 +22,6 @@ import com.intellij.vcs.log.CommitId;
 import com.intellij.vcs.log.Hash;
 import com.intellij.vcs.log.VcsLogHashMap;
 import gnu.trove.TObjectHashingStrategy;
-import gnu.trove.TObjectProcedure;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
index 5e30a813436e48b09480dff9c4f2c98eb7226d0b..c516da49d073175f83c06cb5dbdb514e19f28b7c 100644 (file)
@@ -1,6 +1,5 @@
 package com.intellij.vcs.log.data;
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.SmartList;
index 27e20a314a6242e41e7f6ba6ed04a566af32ca94..150de8760210ec77f5d665e073253426818b24af 100644 (file)
@@ -2,7 +2,6 @@ package com.intellij.vcs.log.data;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogBranchFilter;
 import org.jetbrains.annotations.NotNull;
index 4ea9c99fffecfe0bbd51196be7d225f38e9e6cc8..632fae34125d2dc5d64e7e9f3f232b594af78658 100644 (file)
@@ -22,9 +22,7 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Pair;
-import com.intellij.util.Consumer;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcs.log.VcsLogFilterCollection;
index c5bb4126dcd98bf5f6436b74d5106591ecc68ed7..9f7e37203ea45df34010a99c1545527b72050fb6 100644 (file)
@@ -21,7 +21,6 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsCommitMetadata;
 import com.intellij.vcs.log.VcsFullCommitDetails;
index 847e423ebefd2ff0d56e993abc874995ce1274a8..003d77bf1ca1a7a2ecc70ea4b9b7f4dfae6cdf55 100644 (file)
@@ -16,7 +16,6 @@
 package com.intellij.vcs.log.data;
 
 import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogSettings;
 import org.jetbrains.annotations.NotNull;
index 8660754905c99b0ba2a3ce7fe167199da27da530..0e953bc5a9ae044a1b499d207415b61bb2ce90c3 100644 (file)
@@ -19,7 +19,6 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.ThrowableComputable;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Interner;
 import com.intellij.util.io.*;
index a66dd81ac257a01b3f30e2a24e31693e1801323b..2e37a548fc528a3fbce00598836aaa4d5234bbf7 100644 (file)
@@ -17,12 +17,10 @@ package com.intellij.vcs.log.data;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.UIUtil;
index c7189f48ba71f19ddd3f92fc567253c523dbd8eb..66f73beb56e5a563e87eb45b7a278127070f20ba 100644 (file)
@@ -22,8 +22,6 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogRefresher;
-import com.intellij.vcs.log.data.DataPack;
-import com.intellij.vcs.log.data.DataPackChangeListener;
 import com.intellij.vcs.log.data.VcsLogData;
 import com.intellij.vcs.log.data.VcsLogFilterer;
 import org.jetbrains.annotations.NotNull;
index 48f9ef63880c7bff10103c42909b268da24faa43..c52aa29f460bf72b6da5bf9cd3615a04dba4ffd2 100644 (file)
@@ -1,7 +1,6 @@
 package com.intellij.vcs.log.impl;
 
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.Hash;
 import com.intellij.vcs.log.TimedVcsCommit;
index ad98a4bbd79500189dd87291a3169dac0faec4d7..fbb1ac2d3e96d72f35575211418e0fd6a95f5a6f 100644 (file)
@@ -16,7 +16,6 @@
 package com.intellij.vcs.log.impl;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.changes.ui.ChangesViewContentProvider;
 import com.intellij.openapi.wm.ToolWindow;
index dcee69c5f683e17acdd28a713ebb334d81e933e2..ec4783e9778f6eba29c2f4db349003d8813e62c1 100644 (file)
@@ -17,7 +17,6 @@ package com.intellij.vcs.log.impl;
 
 import com.google.common.primitives.Ints;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.ContainerUtil;
index 9cc79a9800211daaaacf55b1e38367b6bf431aec..cc9c52e7e8865c7396f3f496f543fb2d1bca9ab3 100644 (file)
@@ -17,7 +17,6 @@ package com.intellij.vcs.log.impl;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager;
 import com.intellij.openapi.wm.ToolWindow;
index ae3d77321e5a4364b037a58eca929a29643b02e0..8385fccb5977fc8bbc46d1bd83042e801fdc60ce 100644 (file)
@@ -18,7 +18,6 @@ package com.intellij.vcs.log.impl;
 import com.intellij.internal.statistic.UsageTrigger;
 import com.intellij.internal.statistic.beans.ConvertUsagesUtil;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vfs.VfsUtilCore;
index 0d77c5f76ff38f6b5fe144ac6fb183992642f144..ea7bd888a8c3d4b20bc3a10e7e25782dbfa86eb3 100644 (file)
@@ -5,7 +5,6 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.ColorUtil;
 import com.intellij.ui.JBColor;
-import com.intellij.util.NotNullProducer;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
index 76daf0a5094d5d38e0f97bd2f3712eaad389f593..fb07b80839470e53d2410adb72a65a4e491e1481 100644 (file)
@@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.vcs.log.*;
 import com.intellij.vcs.log.impl.VcsGoToRefComparator;
 import com.intellij.vcs.log.impl.VcsLogUtil;
@@ -28,7 +27,6 @@ import com.intellij.vcs.log.ui.VcsLogUiImpl;
 
 import java.util.Collection;
 import java.util.Set;
-import java.util.concurrent.Future;
 
 public class GoToHashOrRefAction extends DumbAwareAction {
 
index 00eb5c5ed2725a0a0d7930114e9a0f0a08eaba4a..31397a98a9f76ac8c8377a8da5303b9b65f4f1e4 100644 (file)
@@ -17,7 +17,6 @@ package com.intellij.vcs.log.ui.actions;
 
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.completion.InsertHandler;
-import com.intellij.codeInsight.completion.InsertionContext;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.application.ApplicationManager;
@@ -47,7 +46,6 @@ import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Map;
 import java.util.concurrent.CancellationException;
index aff99b76b8ea9f9cf229b979ac85b5084e60012e..b705bfde965d4b7bd9f2175c72077a679ca474af 100644 (file)
@@ -22,11 +22,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogBranchFilter;
 import com.intellij.vcs.log.VcsLogDataPack;
-import com.intellij.vcs.log.VcsRef;
 import com.intellij.vcs.log.data.VcsLogBranchFilterImpl;
 import com.intellij.vcs.log.data.VcsLogUiProperties;
 import com.intellij.vcs.log.ui.VcsLogUiImpl;
index c3d23da89cf4a0c95d2daf41a92fc94c8b47a64e..97d6f3d21dc85460901f48de6086b28bbeb3e4e1 100644 (file)
@@ -18,7 +18,6 @@ package com.intellij.vcs.log.ui.filter;
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.*;
index e3e0dfff1130f89dc277ea58c2ee47fac5a49b8c..7303224f48750b7dbff51f7f44dd5dd278d7f3e7 100644 (file)
@@ -29,7 +29,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.EditorTextField;
 import com.intellij.ui.SoftWrapsEditorCustomization;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.textCompletion.DefaultTextCompletionValueDescriptor;
 import com.intellij.util.textCompletion.TextFieldWithCompletion;
index 65f3791d8ad463772e78b6e3d3f4408834f77ebe..8af88d520cfd7f438f07696b87a857caa5d21c9d 100644 (file)
@@ -25,7 +25,6 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.SizedIcon;
 import com.intellij.ui.popup.KeepingPopupOpenAction;
-import com.intellij.util.Function;
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
index 55bd61e8e1721d0b4007c8a2d8674b56e9db51f7..e892bc0effc606d68ef7341368b105e7147cb160 100644 (file)
@@ -18,11 +18,8 @@ package com.intellij.vcs.log.ui.filter;
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.util.Couple;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogUserFilter;
-import com.intellij.vcs.log.VcsUser;
 import com.intellij.vcs.log.data.VcsLogData;
 import com.intellij.vcs.log.data.VcsLogUiProperties;
 import com.intellij.vcs.log.util.VcsUserUtil;
index e13fbc42f0397e65b5dc58172dfe2714287e3e28..e8e855a759c47c33700493ee5ef1660d2f9d39d5 100644 (file)
@@ -47,8 +47,6 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.BadLocationException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
index 48b4b4fc63e3a132c31d386bd90cc8b51260522f..04fdf2409811aa7e9a1799989e8bd33c728c2732 100644 (file)
@@ -1,9 +1,7 @@
 package com.intellij.vcs.log.ui.filter;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.vcs.log.VcsCommitMetadata;
index afe38258fc377772daa7ff9bad53bc3d4b4d48f5..3e83725d8268acffc340bdbc4da8155848e864ae 100644 (file)
@@ -15,7 +15,6 @@
  */
 package com.intellij.vcs.log.ui.filter;
 
-import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diff.impl.patch.formove.FilePathComparator;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
index de3c8a77146bfa2d5b65d506260d81a58e226bd0..06bf13cfea91899967c8443ad53a91cc05709f9c 100644 (file)
@@ -18,7 +18,6 @@ import com.intellij.ui.*;
 import com.intellij.ui.components.JBLoadingPanel;
 import com.intellij.ui.components.panels.Wrapper;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.table.ComponentsListFocusTraversalPolicy;
index 1fc33700a29535c4ad05bd4b9d3db626d8490e22..658c3c35e5c633ceb9af3a5a74171d9995abbcc7 100644 (file)
@@ -1,7 +1,6 @@
 package com.intellij.vcs.log.ui.render;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkRenderer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.ColoredTableCellRenderer;
index 132c022f3838fc0e260c1d2ec6529ed4b02bfd46..d3022a810ee7728049d4bcd5d08b6bc01401e1b0 100644 (file)
@@ -27,7 +27,6 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
index fdbe22bc1398d6cf01001d33cd61982aeb65c34c..57c6d657005b9b7fbce56a31934e3fabffc046d2 100644 (file)
@@ -18,7 +18,6 @@ package com.intellij.vcs.log.util;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;