From 5aff1593d4a71a99146446f92f42124de2979480 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sun, 31 Jul 2016 18:50:56 +0300 Subject: [PATCH] [file-history] rearrange fields --- .../openapi/vcs/history/FileHistoryPanelImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index 6e4932f7a6e0..7607f9634dd8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -97,15 +97,14 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.ui.FileHistoryDialog"); private static final String COMMIT_MESSAGE_TITLE = VcsBundle.message("label.selected.revision.commit.message"); private static final String VCS_HISTORY_ACTIONS_GROUP = "VcsHistoryActionsGroup"; + @NotNull private final Project myProject; - @NotNull private final DetailsPanel myDetails; @NotNull private final AbstractVcs myVcs; private final VcsHistoryProvider myProvider; + @NotNull private final FileHistoryRefresherI myRefresherI; + @NotNull private final DiffFromHistoryHandler myDiffHandler; @NotNull private final FilePath myFilePath; @Nullable private final VcsRevisionNumber myStartingRevision; - @NotNull private final FileHistoryRefresherI myRefresherI; - @NotNull private final DualView myDualView; - @NotNull private final DiffFromHistoryHandler myDiffHandler; @NotNull private final Alarm myUpdateAlarm; @NotNull private final AsynchConsumer myHistoryPanelRefresh; @NotNull private final Map myRevisionsOrder = ContainerUtil.newHashMap(); @@ -114,6 +113,8 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme // descending return Comparing.compare(myRevisionsOrder.get(o2.getRevisionNumber()), myRevisionsOrder.get(o1.getRevisionNumber())); }; + @NotNull private final DetailsPanel myDetails; + @NotNull private final DualView myDualView; private JComponent myAdditionalDetails; private Consumer myListener; private VcsHistorySession myHistorySession;