diff options
Diffstat (limited to 'platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame')
-rw-r--r-- | platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java | 3 | ||||
-rw-r--r-- | platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java | 17 |
2 files changed, 18 insertions, 2 deletions
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java index d963bb3aedaa..dc876657c428 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java @@ -11,6 +11,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBLoadingPanel; import com.intellij.ui.components.JBTextField; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.AsyncProcessIcon; import com.intellij.util.ui.UIUtil; @@ -146,7 +147,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener { @NotNull private List<VcsRef> sortRefs(@NotNull Hash hash, @NotNull VirtualFile root) { Collection<VcsRef> refs = myDataPack.getRefsModel().refsToCommit(hash); - return myLogDataHolder.getLogProvider(root).getReferenceManager().sort(refs); + return ContainerUtil.sorted(refs, myLogDataHolder.getLogProvider(root).getReferenceManager().getComparator()); } private static class DataPanel extends JEditorPane { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java index 11e9c843fc60..f033f752e1ec 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.vcs.log.ui.frame; import com.intellij.ide.CopyProvider; @@ -175,7 +190,7 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C } @Override - protected void paintComponent(Graphics g) { + protected void paintComponent(@NotNull Graphics g) { if (myRepaintFreezedCounter.get() > 0) { return; } |