diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java index 8d6609299bfc..711e1d1bc4eb 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java @@ -194,8 +194,8 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel { } } }; - setFixedColumnWidth(ClasspathTableModel.EXPORT_COLUMN); - setFixedColumnWidth(ClasspathTableModel.SCOPE_COLUMN); // leave space for combobox border + setFixedColumnWidth(ClasspathTableModel.EXPORT_COLUMN, ClasspathTableModel.EXPORT_COLUMN_NAME); + setFixedColumnWidth(ClasspathTableModel.SCOPE_COLUMN, DependencyScope.COMPILE.toString() + " "); // leave space for combobox border myEntryTable.registerKeyboardAction( new ActionListener() { @@ -320,10 +320,14 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel { return getItemAt(myEntryTable.getSelectedRow()); } - private void setFixedColumnWidth(final int columnIndex) { + private void setFixedColumnWidth(final int columnIndex, String sampleText) { final TableColumn column = myEntryTable.getTableHeader().getColumnModel().getColumn(columnIndex); + final FontMetrics fontMetrics = myEntryTable.getFontMetrics(myEntryTable.getFont()); + final int width = fontMetrics.stringWidth(" " + sampleText + " ") + 4; + column.setPreferredWidth(width); + column.setMaxWidth(width); + column.setResizable(false); - column.setMaxWidth(column.getPreferredWidth()); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathTableModel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathTableModel.java index b0ab1c5e9654..40cafb7161cb 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathTableModel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathTableModel.java @@ -38,7 +38,7 @@ import java.util.List; * @author nik */ class ClasspathTableModel extends ListTableModel> implements ItemRemovable { - private static final String EXPORT_COLUMN_NAME = ProjectBundle.message("modules.order.export.export.column"); + static final String EXPORT_COLUMN_NAME = ProjectBundle.message("modules.order.export.export.column"); private static final ColumnInfo, Boolean> EXPORT_COLUMN_INFO = new ColumnInfo, Boolean>(EXPORT_COLUMN_NAME) { @Nullable @Override