From 8063082fa48ebee75491c7de8e0890c8a7db3dc9 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Wed, 22 Apr 2020 23:28:08 +0300 Subject: [PATCH] deprecate JBDefaultTreeCellRenderer GitOrigin-RevId: fb07a6ff34004eea0d59d8462dc9ce83a517f309 --- .../ui/JBDefaultTreeCellRenderer.java | 20 +++++-------------- .../intellij/ui/components/JBTreeTable.java | 4 ++-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java b/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java index 98557cb61f7f..f8c47608e1e6 100644 --- a/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java +++ b/platform/platform-api/src/com/intellij/ui/JBDefaultTreeCellRenderer.java @@ -1,23 +1,10 @@ -/* - * Copyright 2000-2012 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. - */ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui; import com.intellij.util.ReflectionUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.WideSelectionTreeUI; +import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.NotNull; import javax.swing.JTree; @@ -26,7 +13,10 @@ import java.awt.Color; /** * Extend this class instead of DefaultTreeCellRenderer + * @deprecated use {@link com.intellij.ui.render.LabelBasedRenderer.Tree} instead */ +@Deprecated +@ScheduledForRemoval(inVersion = "2022.2") public class JBDefaultTreeCellRenderer extends DefaultTreeCellRenderer { private final boolean myWideSelection; diff --git a/platform/platform-impl/src/com/intellij/ui/components/JBTreeTable.java b/platform/platform-impl/src/com/intellij/ui/components/JBTreeTable.java index 96d9e5e03d25..fd876abd353d 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/JBTreeTable.java +++ b/platform/platform-impl/src/com/intellij/ui/components/JBTreeTable.java @@ -4,7 +4,6 @@ package com.intellij.ui.components; import com.intellij.openapi.ui.Divider; import com.intellij.openapi.ui.OnePixelDivider; import com.intellij.openapi.util.SystemInfo; -import com.intellij.ui.JBDefaultTreeCellRenderer; import com.intellij.ui.OnePixelSplitter; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SideBorder; @@ -30,6 +29,7 @@ import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; +import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.awt.*; @@ -162,7 +162,7 @@ public class JBTreeTable extends JComponent implements TreePathBackgroundSupplie myTable.setRowHeight(treeRowHeight); }); - myTree.setCellRenderer(new JBDefaultTreeCellRenderer(true) { + myTree.setCellRenderer(new TreeCellRenderer() { @Override public Component getTreeCellRendererComponent(JTree tree, Object value,