From ff1f8427402ebe078483327290084d02e763adc1 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 16 Feb 2016 20:04:01 +0300 Subject: [PATCH] [vcs-log] minor: rename UI -> ui, myUI -> myUi --- .../vcs/log/ui/frame/BranchesPanel.java | 10 +++++----- .../vcs/log/ui/frame/VcsLogGraphTable.java | 20 +++++++++---------- .../vcs/log/ui/tables/GraphTableModel.java | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java index de0f93728497..0c62639d7d86 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java @@ -35,20 +35,20 @@ public class BranchesPanel extends JPanel { private static final int TOP = 2; private static final int BOTTOM = 3; @NotNull private final VcsLogDataHolder myDataHolder; - @NotNull private final VcsLogUiImpl myUI; + @NotNull private final VcsLogUiImpl myUi; @NotNull private final VcsRefPainter myReferencePainter; @NotNull private LinkedHashMap> myRefGroups; @Nullable private Collection myRoots = null; - public BranchesPanel(@NotNull VcsLogDataHolder dataHolder, @NotNull VcsLogUiImpl UI, @NotNull RefsModel initialRefsModel) { + public BranchesPanel(@NotNull VcsLogDataHolder dataHolder, @NotNull VcsLogUiImpl ui, @NotNull RefsModel initialRefsModel) { super(new FlowLayout(FlowLayout.LEADING, BIG_ROOTS_GAP - 2 * SMALL_ROOTS_GAP, 0)); setBorder(new EmptyBorder(TOP, SMALL_ROOTS_GAP, BOTTOM, SMALL_ROOTS_GAP)); myDataHolder = dataHolder; - myUI = UI; + myUi = ui; myRefGroups = getRefsToDisplayOnPanel(initialRefsModel); - myReferencePainter = new VcsRefPainter(myUI.getColorManager(), true); + myReferencePainter = new VcsRefPainter(myUi.getColorManager(), true); recreateComponents(); } @@ -129,7 +129,7 @@ public class BranchesPanel extends JPanel { myGroups = groups; for (RefGroup group : myGroups) { - add(new ReferenceGroupComponent(group, myReferencePainter, myUI, root)); + add(new ReferenceGroupComponent(group, myReferencePainter, myUi, root)); } } } 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 ff1335f7b534..4d3f9c58d8b7 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 @@ -83,7 +83,7 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi private static final int MAX_ROWS_TO_CALC_WIDTH = 1000; private static final int MAX_ROWS_TO_CALC_OFFSET = 100; - @NotNull private final VcsLogUiImpl myUI; + @NotNull private final VcsLogUiImpl myUi; private final VcsLogDataHolder myLogDataHolder; private final MyDummyTableCellEditor myDummyEditor = new MyDummyTableCellEditor(); @NotNull private final TableCellRenderer myDummyRenderer = new DefaultTableCellRenderer(); @@ -104,13 +104,13 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi } }; - public VcsLogGraphTable(@NotNull VcsLogUiImpl UI, @NotNull final VcsLogDataHolder logDataHolder, @NotNull VisiblePack initialDataPack) { + public VcsLogGraphTable(@NotNull VcsLogUiImpl ui, @NotNull final VcsLogDataHolder logDataHolder, @NotNull VisiblePack initialDataPack) { super(); - myUI = UI; + myUi = ui; myLogDataHolder = logDataHolder; myGraphCommitCellRenderer = new GraphCommitCellRender(logDataHolder, myGraphCellPainter, this); - setDefaultRenderer(VirtualFile.class, new RootCellRenderer(myUI)); + setDefaultRenderer(VirtualFile.class, new RootCellRenderer(myUi)); setDefaultRenderer(GraphCommitCell.class, myGraphCommitCellRenderer); setDefaultRenderer(String.class, new StringCellRenderer()); @@ -125,7 +125,7 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi PopupHandler.installPopupHandler(this, VcsLogActionPlaces.POPUP_ACTION_GROUP, VcsLogActionPlaces.VCS_LOG_TABLE_PLACE); ScrollingUtil.installActions(this, false); - GraphTableModel model = new GraphTableModel(initialDataPack, myLogDataHolder, myUI); + GraphTableModel model = new GraphTableModel(initialDataPack, myLogDataHolder, myUi); setModel(model); initColumnSize(); } @@ -193,10 +193,10 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi private void setRootColumnSize(TableColumn column) { int rootWidth; - if (!myUI.isMultipleRoots()) { + if (!myUi.isMultipleRoots()) { rootWidth = 0; } - else if (!myUI.isShowRootNames()) { + else if (!myUi.isShowRootNames()) { rootWidth = ROOT_INDICATOR_WIDTH; } else { @@ -231,7 +231,7 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi return "" + ((VirtualFile)at).getPresentableUrl() + "
Click to " + - (myUI.isShowRootNames() ? "collapse" : "expand") + + (myUi.isShowRootNames() ? "collapse" : "expand") + ""; } } @@ -363,7 +363,7 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi private boolean expandOrCollapseRoots(@NotNull MouseEvent e) { TableColumn column = getRootColumnOrNull(e); if (column != null) { - myUI.setShowRootNames(!myUI.isShowRootNames()); + myUi.setShowRootNames(!myUi.isShowRootNames()); return true; } return false; @@ -400,7 +400,7 @@ public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvi } } - myUI.repaintUI(); // in case of repaintUI doing something more than just repainting this table in some distant future + myUi.repaintUI(); // in case of repaintUI doing something more than just repainting this table in some distant future if (answer == null) { return; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java index f0177df4a6d0..8631ba5e0515 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java @@ -45,9 +45,9 @@ public class GraphTableModel extends AbstractTableModel { private boolean myMoreRequested; - public GraphTableModel(@NotNull VisiblePack dataPack, @NotNull VcsLogDataHolder dataHolder, @NotNull VcsLogUiImpl UI) { + public GraphTableModel(@NotNull VisiblePack dataPack, @NotNull VcsLogDataHolder dataHolder, @NotNull VcsLogUiImpl ui) { myLogDataHolder = dataHolder; - myUi = UI; + myUi = ui; myDataPack = dataPack; myDataHolder = dataHolder; }