From c56082dcaf86abca0d1ae742c5cf11a77c4a47b8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 27 Jun 2011 15:42:36 +0400 Subject: [PATCH] Don't use deprecated component --- .../src/com/intellij/ui/dualView/DualView.java | 3 +-- .../intellij/ui/treeStructure/treetable/TreeTable.java | 7 +++---- .../ui/treeStructure/treetable/TreeTableModelAdapter.java | 8 +++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java index 5b595b992c67..5b0792738df1 100644 --- a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java +++ b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java @@ -34,7 +34,6 @@ import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.config.Storage; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; -import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -122,7 +121,7 @@ public class DualView extends JPanel { addWidthListenersTo(myFlatView); } - private void addWidthListenersTo(Table treeView) { + private void addWidthListenersTo(JTable treeView) { TableColumnModel columnModel = treeView.getColumnModel(); int columnCount = columnModel.getColumnCount(); for (int i = 0; i < columnCount; i++) { diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java index 61cc87a15cf9..acbc708c571e 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -15,7 +15,7 @@ */ package com.intellij.ui.treeStructure.treetable; -import com.intellij.util.ui.Table; +import com.intellij.ui.table.JBTable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -42,7 +42,7 @@ import java.util.Set; * @author Philip Milne * @author Scott Violet */ -public class TreeTable extends Table { +public class TreeTable extends JBTable { /** A subclass of JTree. */ private TreeTableTree myTree; private TreeTableModel myTableModel; @@ -52,7 +52,6 @@ public class TreeTable extends Table { super(); setModel(treeTableModel); - } @SuppressWarnings({"MethodOverloadsMethodOfSuperclass"}) diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableModelAdapter.java b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableModelAdapter.java index ad841a36a558..32897d722dad 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableModelAdapter.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableModelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -15,8 +15,6 @@ */ package com.intellij.ui.treeStructure.treetable; -import com.intellij.util.ui.Table; - import javax.swing.*; import javax.swing.event.TreeExpansionEvent; import javax.swing.event.TreeExpansionListener; @@ -39,9 +37,9 @@ import javax.swing.tree.TreePath; public class TreeTableModelAdapter extends AbstractTableModel { private final JTree tree; private final TreeTableModel treeTableModel; - private final Table table; + private final JTable table; - public TreeTableModelAdapter(TreeTableModel treeTableModel, JTree tree, Table table) { + public TreeTableModelAdapter(TreeTableModel treeTableModel, JTree tree, JTable table) { this.tree = tree; this.treeTableModel = treeTableModel; this.table = table;