From 0378ad39c417c114e8a935f9ba38515173214cb4 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Wed, 29 Feb 2012 15:33:45 +0400 Subject: [PATCH] Borders. Deprecated methods to undeprecated. --- .../actions/GenerateAntBuildDialog.java | 2 +- .../AnnotationProcessorsConfigurable.java | 4 ++-- .../DebuggerDataViewsConfigurable.java | 4 ++-- .../breakpoints/EditClassFiltersDialog.java | 4 ++-- .../EditInstanceFiltersDialog.java | 2 +- .../ExceptionBreakpointPropertiesPanel.java | 2 +- .../FieldBreakpointPropertiesPanel.java | 2 +- .../MethodBreakpointPropertiesPanel.java | 2 +- .../importProject/ProjectLayoutPanel.java | 4 ++-- .../FrameworkSupportOptionsComponent.java | 2 +- .../ui/configuration/BuildElementsEditor.java | 4 ++-- .../roots/ui/configuration/OutputEditor.java | 4 ++-- .../SelectImportedProjectsStep.java | 2 +- .../options/CodeStyleImportsPanel.java | 8 ++++---- .../javaDoc/JavaDocLocalInspection.java | 4 ++-- .../actions/CyclicDependenciesAction.java | 2 +- .../findUsages/FindClassUsagesDialog.java | 2 +- .../findUsages/FindMethodUsagesDialog.java | 2 +- .../findUsages/FindPackageUsagesDialog.java | 2 +- .../findUsages/FindThrowUsagesDialog.java | 2 +- .../AnonymousToInnerDialog.java | 2 +- .../EncapsulateFieldsDialog.java | 8 ++++---- .../IntroduceFieldDialogPanel.java | 2 +- .../refactoring/ui/JavaVisibilityPanel.java | 2 +- .../codeInsight/NullableNotNullDialog.java | 2 +- .../options/colors/FontOptions.java | 2 +- .../codeEditor/printing/PrintDialog.java | 10 +++++----- .../impl/LiveTemplateSettingsEditor.java | 2 +- .../findUsages/AbstractFindUsagesDialog.java | 2 +- .../com/intellij/find/impl/FindDialog.java | 14 ++++++------- .../ide/todo/configurable/FilterDialog.java | 2 +- .../openapi/util/registry/RegistryUi.java | 2 +- .../ui/SingleInspectionProfilePanel.java | 4 ++-- .../changeSignature/CallerChooserBase.java | 4 ++-- .../refactoring/ui/DocCommentPanel.java | 2 +- .../com/intellij/tools/ToolEditorDialog.java | 6 +++--- .../ui/tabs/FileColorsConfigurablePanel.java | 4 ++-- .../com/intellij/ui/AddDeleteListPanel.java | 2 +- .../com/intellij/ui/AddEditRemovePanel.java | 3 ++- .../src/com/intellij/ui/GuiUtils.java | 2 +- .../src/com/intellij/ui/IdeBorderFactory.java | 20 +++++++++---------- .../src/com/intellij/ui/OptionGroup.java | 2 +- .../src/com/intellij/ui/PanelWithButtons.java | 2 +- .../intellij/ide/BrowserSettingsPanel.java | 2 +- .../custom/impl/CustomFileTypeEditor.java | 5 +++-- .../impl/ui/KeyboardShortcutDialog.java | 7 +++---- .../keymap/impl/ui/MouseShortcutDialog.java | 8 ++++---- .../ui/switcher/QuickAccessConfigurable.java | 4 ++-- .../versionBrowser/DateFilterComponent.java | 4 ++-- .../StandardVersionFilterComponent.java | 2 +- .../CompareWithSelectedRevisionAction.java | 8 ++++---- .../CompositeCommittedChangesProvider.java | 2 +- .../changes/ui/CommitChangeListDialog.java | 6 +++--- .../src/com/siyeh/ig/ui/UiUtils.java | 2 +- .../ant/validation/AntHectorConfigurable.java | 2 +- .../cvsSupport2/ui/experts/WizardStep.java | 4 ++-- .../build/PluginModuleBuildConfEditor.java | 2 +- .../generate/tostring/view/ConfigUI.java | 8 ++++---- .../intentions/dynamic/ui/DynamicDialog.java | 2 +- .../groovy/doc/GroovyDocGenerationPanel.java | 2 +- .../extract/ParameterTablePanel.java | 2 +- .../method/GroovyExtractMethodDialog.java | 2 +- .../parameter/GrIntroduceParameterDialog.java | 4 ++-- .../ui/HgRepositorySelectorComponent.java | 2 +- .../execution/MavenRunnerConfigurable.java | 2 +- .../editor/ResourceBundleEditor.java | 2 +- .../AddClientPropertyDialog.java | 2 +- .../FormLayoutColumnProperties.java | 2 +- .../associations/impl/AssociationsEditor.java | 6 ++---- .../plugins/xpathView/ui/ConfigUI.java | 4 ++-- .../xpathView/ui/EditContextDialog.java | 4 ++-- .../ide/browsers/WebBrowsersPanel.java | 2 +- 72 files changed, 131 insertions(+), 134 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java index 37275cf225c5..1cd1c3928851 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java @@ -176,7 +176,7 @@ public class GenerateAntBuildDialog extends DialogWrapper { myChunksPanel.setLayout(new BorderLayout()); myChunksPanel.setBorder( IdeBorderFactory.createTitledBorder(CompilerBundle.message("generate.ant.build.dialog.cyclic.modules.table.title"), - false, true, true)); + true)); JLabel textLabel = new JLabel(CompilerBundle.message("generate.ant.build.dialog.cyclic.modules.table.description")); textLabel.setUI(new MultiLineLabelUI()); textLabel.setBorder(IdeBorderFactory.createEmptyBorder(4, 4, 6, 4)); diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index e6c4f49b6748..b022493d0109 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -122,7 +122,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable, final JPanel processorTablePanel = new JPanel(new BorderLayout()); myProcessorsModel = new ProcessorTableModel(); - processorTablePanel.setBorder(IdeBorderFactory.createTitledBorder("Annotation Processors", false, false, true)); + processorTablePanel.setBorder(IdeBorderFactory.createTitledBorder("Annotation Processors", false)); myProcessorTable = new JBTable(myProcessorsModel); myProcessorTable.getEmptyText().setText("No processors configured"); myProcessorPanel = ToolbarDecorator.createDecorator(myProcessorTable) @@ -147,7 +147,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable, processorTablePanel.add(myProcessorPanel, BorderLayout.CENTER); myModulesTable = new ProcessedModulesTable(myProject); - myModulesTable.setBorder(IdeBorderFactory.createTitledBorder("Processed Modules", false, false, true)); + myModulesTable.setBorder(IdeBorderFactory.createTitledBorder("Processed Modules", false)); final JLabel noteMessage = new JLabel("Source files generated by annotation processors will be stored under the project output directory. " + "To override this behaviour for certain modules you may specify the directory name in the table below. " + "If specified, the directory will be created under corresponding module's content root."); diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java index 6d5a9bd4b73a..367975ff2d35 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java @@ -147,7 +147,7 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable { tooltipLabel.setLabelFor(myValueTooltipDelayField); final JPanel showPanel = new JPanel(new GridBagLayout()); - showPanel.setBorder(IdeBorderFactory.createTitledBorder("Show", false, true, true)); + showPanel.setBorder(IdeBorderFactory.createTitledBorder("Show", true)); showPanel.add(myCbShowDeclaredType, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); showPanel.add(myCbShowObjectId, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 0, 0), 0, 0)); @@ -162,7 +162,7 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable { final JComponent arraysComponent = myArrayRendererConfigurable.createComponent(); arraysPanel.add(arraysComponent, BorderLayout.CENTER); arraysPanel.add(myCbHideNullArrayElements, BorderLayout.SOUTH); - arraysPanel.setBorder(IdeBorderFactory.createTitledBorder("Arrays", false, true, true)); + arraysPanel.setBorder(IdeBorderFactory.createTitledBorder("Arrays", true)); panel.add(arraysPanel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 3, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); panel.add(myCbEnableAutoExpressions, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 10), 0, 0)); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditClassFiltersDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditClassFiltersDialog.java index d399efb1fcd2..0f0de4a62455 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditClassFiltersDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditClassFiltersDialog.java @@ -57,13 +57,13 @@ public class EditClassFiltersDialog extends DialogWrapper { myClassFilterEditor = new ClassFilterEditor(myProject, myChooserFilter, "reference.viewBreakpoints.classFilters.newPattern"); myClassFilterEditor.setPreferredSize(new Dimension(400, 200)); myClassFilterEditor.setBorder(IdeBorderFactory.createTitledBorder( - DebuggerBundle.message("class.filters.dialog.inclusion.filters.group"), false, false, true)); + DebuggerBundle.message("class.filters.dialog.inclusion.filters.group"), false)); mainPanel.add(myClassFilterEditor); myClassExclusionFilterEditor = new ClassFilterEditor(myProject, myChooserFilter, "reference.viewBreakpoints.classFilters.newPattern"); myClassExclusionFilterEditor.setPreferredSize(new Dimension(400, 200)); myClassExclusionFilterEditor.setBorder(IdeBorderFactory.createTitledBorder( - DebuggerBundle.message("class.filters.dialog.exclusion.filters.group"), false, false, true)); + DebuggerBundle.message("class.filters.dialog.exclusion.filters.group"), false)); mainPanel.add(myClassExclusionFilterEditor); contentPanel.add(mainPanel, BorderLayout.CENTER); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditInstanceFiltersDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditInstanceFiltersDialog.java index e57bd88fb708..dbc211120bed 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditInstanceFiltersDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/EditInstanceFiltersDialog.java @@ -50,7 +50,7 @@ public class EditInstanceFiltersDialog extends DialogWrapper{ myInstanceFilterEditor = new InstanceFilterEditor(myProject); myInstanceFilterEditor.setPreferredSize(new Dimension(400, 200)); myInstanceFilterEditor.setBorder(IdeBorderFactory.createTitledBorder( - DebuggerBundle.message("instance.filters.dialog.instance.filters.group"), false, false, true)); + DebuggerBundle.message("instance.filters.dialog.instance.filters.group"), false)); mainPanel.add(myInstanceFilterEditor); contentPanel.add(mainPanel, BorderLayout.CENTER); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java index 5c81a58007af..28bd47b78e41 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java @@ -64,7 +64,7 @@ public class ExceptionBreakpointPropertiesPanel extends BreakpointPropertiesPane _panel0.add(Box.createHorizontalStrut(3), BorderLayout.EAST); _panel.add(_panel0, BorderLayout.NORTH); _panel.setBorder(IdeBorderFactory.createTitledBorder( - DebuggerBundle.message("label.exception.breakpoint.properties.panel.group.notifications"), false, true, true)); + DebuggerBundle.message("label.exception.breakpoint.properties.panel.group.notifications"), true)); ActionListener listener = new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java index 5df3835fd549..c440e83e069d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java @@ -59,7 +59,7 @@ public class FieldBreakpointPropertiesPanel extends BreakpointPropertiesPanel { _panel0.add(Box.createHorizontalStrut(3), BorderLayout.WEST); _panel0.add(Box.createHorizontalStrut(3), BorderLayout.EAST); _panel.add(_panel0, BorderLayout.NORTH); - _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events"), false, true, true)); + _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events"), true)); ActionListener listener = new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java index 17a6fd2cd9e6..ff6daf8b12b6 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java @@ -58,7 +58,7 @@ public class MethodBreakpointPropertiesPanel extends BreakpointPropertiesPanel { _panel0.add(Box.createHorizontalStrut(3), BorderLayout.WEST); _panel0.add(Box.createHorizontalStrut(3), BorderLayout.EAST); _panel.add(_panel0, BorderLayout.NORTH); - _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events"), false, true, true)); + _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events"), true)); ActionListener listener = new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java index f1d7449494a7..56a9084705f5 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java @@ -87,13 +87,13 @@ abstract class ProjectLayoutPanel extends JPanel { final JPanel entriesPanel = new JPanel(new BorderLayout()); entriesPanel.add(myEntriesChooser, BorderLayout.CENTER); - entriesPanel.setBorder(IdeBorderFactory.createTitledBorder(StringUtil.capitalize(StringUtil.pluralize(getElementTypeName())), false, false, true)); + entriesPanel.setBorder(IdeBorderFactory.createTitledBorder(StringUtil.capitalize(StringUtil.pluralize(getElementTypeName())), false)); splitter.setFirstComponent(entriesPanel); final JScrollPane depsPane = ScrollPaneFactory.createScrollPane(myDependenciesList); final JPanel depsPanel = new JPanel(new BorderLayout()); depsPanel.add(depsPane, BorderLayout.CENTER); - depsPanel.setBorder(IdeBorderFactory.createTitledBorder(getDependenciesTitle(), false, false, true)); + depsPanel.setBorder(IdeBorderFactory.createTitledBorder(getDependenciesTitle(), false)); splitter.setSecondComponent(depsPanel); JPanel groupPanel = new JPanel(new BorderLayout()); diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java index fbcd5d3daf74..48119b1835d9 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java @@ -52,7 +52,7 @@ public class FrameworkSupportOptionsComponent { myMainPanel = new JPanel(layout); if (title != null) { - myMainPanel.setBorder(IdeBorderFactory.createTitledBorder(title, false, true, true)); + myMainPanel.setBorder(IdeBorderFactory.createTitledBorder(title, true)); } final JComponent component = myConfigurable.createComponent(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java index 6ad50401694e..3d8c45224ebf 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java @@ -135,8 +135,8 @@ public class BuildElementsEditor extends ModuleElementsEditor { enableCompilerSettings(!outputPathInherited); final JPanel panel = new JPanel(new BorderLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorder(ProjectBundle.message("project.roots.output.compiler.title"), false, - true, true)); + panel.setBorder(IdeBorderFactory.createTitledBorder(ProjectBundle.message("project.roots.output.compiler.title"), + true)); panel.add(outputPathsPanel, BorderLayout.NORTH); return panel; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java index 1f6c7e98882a..4872f9d1996f 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java @@ -51,11 +51,11 @@ public class OutputEditor extends ModuleElementsEditor { new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0); panel.add(myCompilerOutputEditor.createComponentImpl(), gc); final JPanel javadocPanel = (JPanel)myJavadocEditor.createComponentImpl(); - javadocPanel.setBorder(IdeBorderFactory.createTitledBorder(myJavadocEditor.getDisplayName(), false, false, true)); + javadocPanel.setBorder(IdeBorderFactory.createTitledBorder(myJavadocEditor.getDisplayName(), false)); gc.weighty = 1; panel.add(javadocPanel, gc); final JPanel annotationsPanel = (JPanel)myAnnotationsEditor.createComponentImpl(); - annotationsPanel.setBorder(IdeBorderFactory.createTitledBorder(myAnnotationsEditor.getDisplayName(), false, false, true)); + annotationsPanel.setBorder(IdeBorderFactory.createTitledBorder(myAnnotationsEditor.getDisplayName(), false)); panel.add(annotationsPanel, gc); return panel; } diff --git a/java/idea-ui/src/com/intellij/projectImport/SelectImportedProjectsStep.java b/java/idea-ui/src/com/intellij/projectImport/SelectImportedProjectsStep.java index 9157b42a1afd..bc10db18f06a 100644 --- a/java/idea-ui/src/com/intellij/projectImport/SelectImportedProjectsStep.java +++ b/java/idea-ui/src/com/intellij/projectImport/SelectImportedProjectsStep.java @@ -77,7 +77,7 @@ public abstract class SelectImportedProjectsStep extends ProjectImportWizardS fileChooser.addElement(element, getContext().isMarked(element)); } fileChooser.setBorder(IdeBorderFactory.createTitledBorder( - IdeBundle.message("project.import.select.title", getContext().getName()), false, false, true)); + IdeBundle.message("project.import.select.title", getContext().getName()), false)); openModuleSettingsCheckBox.setSelected(getBuilder().isOpenProjectSettingsAfter()); } diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java index 5d8b0adbcf65..6ae6506d5d6f 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java @@ -90,12 +90,12 @@ public class CodeStyleImportsPanel extends JPanel { "<% page import=\"com.company.Far\"%>"); final JPanel labelPanel = new JPanel(new BorderLayout()); labelPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(20, 10, 0, 0), IdeBorderFactory.createTitledBorder( - ApplicationBundle.message("title.preview"), false, false, true))); + ApplicationBundle.message("title.preview"), false))); JPanel resultPanel = new JPanel(new BorderLayout()); resultPanel.add(btnPanel, BorderLayout.NORTH); resultPanel.add(labelPanel, BorderLayout.CENTER); - resultPanel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.jsp.imports.layout"), true, true, true)); + resultPanel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.jsp.imports.layout"), true)); ActionListener actionListener = new ActionListener() { @@ -142,7 +142,7 @@ public class CodeStyleImportsPanel extends JPanel { private JPanel createPackagesPanel() { JPanel panel = new JPanel(new BorderLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.packages.to.use.import.with"), true, false, true)); + panel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.packages.to.use.import.with"), false)); panel.add(createPackagesTable(), BorderLayout.CENTER); panel.add(createPackagesButtonsPanel(), BorderLayout.EAST); @@ -151,7 +151,7 @@ public class CodeStyleImportsPanel extends JPanel { private JPanel createImportLayoutPanel() { JPanel panel = new JPanel(new BorderLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.import.layout"), true, false, true)); + panel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.import.layout"), false)); myCbLayoutStaticImportsSeparately = new JCheckBox("Layout static imports separately"); myCbLayoutStaticImportsSeparately.addItemListener(new ItemListener(){ diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java index 56690ab49f54..ee8959c4efab 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java @@ -122,7 +122,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool { private JPanel createTagsPanel(String[] tags, Options options) { JPanel panel = new JPanel(new GridBagLayout()); panel.setBorder(BorderFactory.createCompoundBorder(IdeBorderFactory.createTitledBorder( - InspectionsBundle.message("inspection.javadoc.required.tags.option.title"), false, true, true), + InspectionsBundle.message("inspection.javadoc.required.tags.option.title"), true), BorderFactory.createEmptyBorder(0, 3, 3, 3))); GridBagConstraints gc = new GridBagConstraints(); @@ -170,7 +170,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool { private JPanel createScopePanel(final String[] modifiers, final Options options) { JPanel panel = new JPanel(new BorderLayout()); panel.setBorder(BorderFactory.createCompoundBorder(IdeBorderFactory.createTitledBorder( - InspectionsBundle.message("inspection.scope.for.title"), false, true, true), + InspectionsBundle.message("inspection.scope.for.title"), true), BorderFactory.createEmptyBorder(0, 3, 3, 3))); final Hashtable sliderLabels = new Hashtable(); diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java index 7737eb217a81..cd222246348c 100644 --- a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java +++ b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java @@ -182,7 +182,7 @@ public class CyclicDependenciesAction extends AnAction{ protected JComponent createCenterPanel() { myScopePanel.setBorder(IdeBorderFactory.createTitledBorder( - AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoun), false, true, true)); + AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoun), true)); myProjectButton.setText(AnalysisScopeBundle.message("cyclic.dependencies.scope.dialog.project.button", myAnalysisVerb)); ButtonGroup group = new ButtonGroup(); group.add(myProjectButton); diff --git a/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java index aa5479c8508b..a195d51e1996 100644 --- a/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java +++ b/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java @@ -75,7 +75,7 @@ public class FindClassUsagesDialog extends JavaFindUsagesDialog extends DialogWrap myCalleeEditor = createEditor(); final JComponent callerComponent = myCallerEditor.getComponent(); callerComponent.setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("caller.chooser.caller.method"), - false, false, true)); + false)); splitter.setFirstComponent(callerComponent); final JComponent calleeComponent = myCalleeEditor.getComponent(); calleeComponent.setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("caller.chooser.callee.method"), - false, false, true)); + false)); splitter.setSecondComponent(calleeComponent); splitter.setBorder(IdeBorderFactory.createRoundedBorder()); return splitter; diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java b/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java index a26adbe5b51d..81610b467317 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java @@ -41,7 +41,7 @@ public class DocCommentPanel extends JPanel { public DocCommentPanel(String title) { setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - myBorder = IdeBorderFactory.createTitledBorder(title, false, true, true, + myBorder = IdeBorderFactory.createTitledBorder(title, true, new Insets(IdeBorderFactory.TITLED_BORDER_TOP_INSET, UIUtil.DEFAULT_HGAP, IdeBorderFactory.TITLED_BORDER_BOTTOM_INSET, diff --git a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java index 05213b718c8f..ce991c7eb246 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java @@ -180,7 +180,7 @@ public class ToolEditorDialog extends DialogWrapper { private JPanel createCommandPane() { JPanel pane = new JPanel(new GridBagLayout()); - pane.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.tool.group"), false, true, true)); + pane.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.tool.group"), true)); GridBagConstraints constr; // program @@ -428,7 +428,7 @@ public class ToolEditorDialog extends DialogWrapper { private JPanel getShowInPanel() { JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0)); - panel.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.menu.group"), false, true, true)); + panel.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.menu.group"), true)); panel.add(myShowInMainMenuCheckbox); panel.add(myShowInEditorCheckbox); panel.add(myShowInProjectTreeCheckbox); @@ -438,7 +438,7 @@ public class ToolEditorDialog extends DialogWrapper { private JPanel getOptionsPanel() { JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0)); - panel.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.options.group"), false, true, true)); + panel.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.options.group"), true)); panel.add(mySynchronizedAfterRunCheckbox); panel.add(myUseConsoleCheckbox); panel.add(myOutputFiltersButton); diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java index 6f7b28942bfa..b4a870aaa84a 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java @@ -100,7 +100,7 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable { }) .createPanel(); final JPanel localPanel = new JPanel(new BorderLayout()); - localPanel.setBorder(IdeBorderFactory.createTitledBorder("Local colors", false, false, true)); + localPanel.setBorder(IdeBorderFactory.createTitledBorder("Local colors", false)); localPanel.add(panel, BorderLayout.CENTER); mainPanel.add(localPanel); @@ -120,7 +120,7 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable { }; final JPanel sharedPanel = new JPanel(new BorderLayout()); - sharedPanel.setBorder(IdeBorderFactory.createTitledBorder("Shared colors", false, false, true)); + sharedPanel.setBorder(IdeBorderFactory.createTitledBorder("Shared colors", false)); final JPanel shared = ToolbarDecorator.createDecorator(mySharedTable) .addExtraAction(new AnActionButton("Unshare", UNSHARE) { @Override diff --git a/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java b/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java index 1cc9a731ab20..c82465e1bfa8 100644 --- a/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java +++ b/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java @@ -75,7 +75,7 @@ public abstract class AddDeleteListPanel extends PanelWithButtons implements setLayout(new BorderLayout()); add(decorator.createPanel(), BorderLayout.CENTER); if (myTitle != null) { - setBorder(IdeBorderFactory.createTitledBorder(myTitle, false, false, true)); + setBorder(IdeBorderFactory.createTitledBorder(myTitle, false)); } } diff --git a/platform/platform-api/src/com/intellij/ui/AddEditRemovePanel.java b/platform/platform-api/src/com/intellij/ui/AddEditRemovePanel.java index 73644932a468..d47da3590cea 100644 --- a/platform/platform-api/src/com/intellij/ui/AddEditRemovePanel.java +++ b/platform/platform-api/src/com/intellij/ui/AddEditRemovePanel.java @@ -18,6 +18,7 @@ package com.intellij.ui; import com.intellij.ui.table.JBTable; import com.intellij.util.ui.ComponentWithEmptyText; import com.intellij.util.ui.StatusText; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -90,7 +91,7 @@ public abstract class AddEditRemovePanel extends PanelWithButtons implements add(panel, BorderLayout.CENTER); final String label = getLabelText(); if (label != null) { - add(SeparatorFactory.createSeparator(label, myTable), BorderLayout.NORTH); + UIUtil.addBorder(panel, IdeBorderFactory.createTitledBorder(label, false)); } } diff --git a/platform/platform-api/src/com/intellij/ui/GuiUtils.java b/platform/platform-api/src/com/intellij/ui/GuiUtils.java index 52729878f6f3..6abc627f752f 100644 --- a/platform/platform-api/src/com/intellij/ui/GuiUtils.java +++ b/platform/platform-api/src/com/intellij/ui/GuiUtils.java @@ -126,7 +126,7 @@ public class GuiUtils { public static JPanel makeTitledPanel(JComponent aComponent, String aTitle) { JPanel result = makePaddedPanel(aComponent, false, true, false, true); - return wrapWithBorder(result, IdeBorderFactory.createTitledBorder(aTitle, false, true, true)); + return wrapWithBorder(result, IdeBorderFactory.createTitledBorder(aTitle, true)); } diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java index 0abde2c394dc..0cd38d327e79 100644 --- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java +++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java @@ -65,14 +65,12 @@ public class IdeBorderFactory { @Deprecated public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont) { - Insets insets = new Insets(TITLED_BORDER_TOP_INSET, TITLED_BORDER_LEFT_INSET, TITLED_BORDER_BOTTOM_INSET, TITLED_BORDER_RIGHT_INSET); - return createTitledBorder(title, hasBoldFont, hasIndent, hasSmallFont, insets); + return createTitledBorder(title, hasIndent); } @Deprecated public static IdeaTitledBorder createTitledBorder(String title, boolean hasBoldFont, boolean hasIndent, boolean hasSmallFont, Insets insets) { - int indent = hasIndent ? TITLED_BORDER_INDENT : 0; - return new IdeaTitledBorder(title, indent, insets); + return createTitledBorder(title, hasIndent, insets); } public static IdeaTitledBorder createTitledBorder(String title, boolean hasIndent) { @@ -135,7 +133,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, true, true, true); + return IdeBorderFactory.createTitledBorder(title, true); } } @@ -150,7 +148,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, true, false, true); + return IdeBorderFactory.createTitledBorder(title, false); } } @@ -165,7 +163,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, false, true, false); + return IdeBorderFactory.createTitledBorder(title, true); } } @@ -180,7 +178,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, false, false, false); + return IdeBorderFactory.createTitledBorder(title, false); } } @@ -195,7 +193,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, true, true, false); + return IdeBorderFactory.createTitledBorder(title, true); } } @@ -210,7 +208,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, true, false, false); + return IdeBorderFactory.createTitledBorder(title, false); } } @@ -224,7 +222,7 @@ public class IdeBorderFactory { int titlePosition, Font titleFont, Color titleColor) { - return IdeBorderFactory.createTitledBorder(title, false, new Insets(5,0,0,0)); + return IdeBorderFactory.createTitledBorder(title, false, new Insets(TITLED_BORDER_TOP_INSET,0,0,0)); } } diff --git a/platform/platform-api/src/com/intellij/ui/OptionGroup.java b/platform/platform-api/src/com/intellij/ui/OptionGroup.java index 527b0ecc7458..2d90ebb51ba2 100644 --- a/platform/platform-api/src/com/intellij/ui/OptionGroup.java +++ b/platform/platform-api/src/com/intellij/ui/OptionGroup.java @@ -106,7 +106,7 @@ public class OptionGroup implements PanelWithAnchor { new Insets(0, 0, 0, 0), 0, 0)); if (myTitle != null) { - IdeaTitledBorder titledBorder = IdeBorderFactory.createTitledBorder(myTitle, boldTitle, true, true); + IdeaTitledBorder titledBorder = IdeBorderFactory.createTitledBorder(myTitle, true); panel.setBorder(titledBorder); titledBorder.acceptMinimumSize(panel); } diff --git a/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java b/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java index def47a4cd30a..8451bdb32a0b 100644 --- a/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java +++ b/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java @@ -31,7 +31,7 @@ public abstract class PanelWithButtons extends JPanel { String labelText = getLabelText(); if (labelText != null) { - setBorder(IdeBorderFactory.createTitledBorder(labelText, false, false, true)); + setBorder(IdeBorderFactory.createTitledBorder(labelText, false)); } add( diff --git a/platform/platform-impl/src/com/intellij/ide/BrowserSettingsPanel.java b/platform/platform-impl/src/com/intellij/ide/BrowserSettingsPanel.java index a7f9b60f6e58..f457d06003c1 100644 --- a/platform/platform-impl/src/com/intellij/ide/BrowserSettingsPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/BrowserSettingsPanel.java @@ -50,7 +50,7 @@ public class BrowserSettingsPanel extends JPanel { // generic system browser final JPanel genericPanel = new JPanel(); - genericPanel.setBorder(IdeBorderFactory.createTitledBorder("Default Web Browser", true, true, true)); + genericPanel.setBorder(IdeBorderFactory.createTitledBorder("Default Web Browser", true)); genericPanel.setLayout(new BoxLayout(genericPanel, BoxLayout.Y_AXIS)); final JPanel innerPanel1 = new JPanel(new BorderLayout()); diff --git a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java index 6dd5efeeba2c..8133da041e5f 100644 --- a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java +++ b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java @@ -160,7 +160,7 @@ public class CustomFileTypeEditor extends SettingsEditor { fileTypePanel.add(info, BorderLayout.NORTH); JPanel highlighterPanel = new JPanel(); - highlighterPanel.setBorder(IdeBorderFactory.createTitledBorder(IdeBundle.message("group.customfiletype.syntax.highlighting"), false, false, true)); + highlighterPanel.setBorder(IdeBorderFactory.createTitledBorder(IdeBundle.message("group.customfiletype.syntax.highlighting"), false)); highlighterPanel.setLayout(new BorderLayout()); JPanel commentsAndNumbersPanel = new JPanel(); commentsAndNumbersPanel.setLayout(new GridBagLayout()); @@ -195,7 +195,8 @@ public class CustomFileTypeEditor extends SettingsEditor { highlighterPanel.add(_panel1, BorderLayout.NORTH); TabbedPaneWrapper tabbedPaneWrapper = new TabbedPaneWrapper(this); - tabbedPaneWrapper.getComponent().setBorder(IdeBorderFactory.createTitledBorder(IdeBundle.message("listbox.customfiletype.keywords"), false, false, true)); + tabbedPaneWrapper.getComponent().setBorder(IdeBorderFactory.createTitledBorder(IdeBundle.message("listbox.customfiletype.keywords"), + false)); tabbedPaneWrapper.addTab(" 1 ", createKeywordsPanel(0)); tabbedPaneWrapper.addTab(" 2 ", createKeywordsPanel(1)); tabbedPaneWrapper.addTab(" 3 ", createKeywordsPanel(2)); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java index 7d443388aa26..6c29c5f795d7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java @@ -29,7 +29,6 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.SeparatorFactory; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; @@ -99,7 +98,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { // Shortcut preview JPanel previewPanel = new JPanel(new BorderLayout()); - previewPanel.setBorder(IdeBorderFactory.createTitledBorder(KeyMapBundle.message("shortcut.preview.ide.border.factory.title"), false, true, true)); + previewPanel.setBorder(IdeBorderFactory.createTitledBorder(KeyMapBundle.message("shortcut.preview.ide.border.factory.title"), true)); previewPanel.add(myKeystrokePreview); panel.add( previewPanel, @@ -110,7 +109,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { JPanel conflictsPanel = new JPanel(new BorderLayout()); conflictsPanel.setBorder(IdeBorderFactory.createTitledBorder(KeyMapBundle.message("conflicts.ide.border.factory.title"), - false, true, true)); + true)); myConflictInfoArea.setEditable(false); myConflictInfoArea.setBackground(panel.getBackground()); myConflictInfoArea.setLineWrap(true); @@ -246,7 +245,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { public StrokePanel(String borderText) { setLayout(new BorderLayout()); - setBorder(IdeBorderFactory.createTitledBorder(borderText, false, false, true)); + setBorder(IdeBorderFactory.createTitledBorder(borderText, false)); myShortcutTextField = new ShortcutTextField(){ protected void updateCurrentKeyStrokeInfo() { diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java index ed6af986372e..7c7a4c74cf2a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java @@ -126,7 +126,7 @@ class MouseShortcutDialog extends DialogWrapper{ JPanel clickCountPanel=new JPanel(new GridBagLayout()); clickCountPanel.setBorder(IdeBorderFactory.createTitledBorder( - KeyMapBundle.message("mouse.shortcut.dialog.click.count.border"), false, true, true)); + KeyMapBundle.message("mouse.shortcut.dialog.click.count.border"), true)); panel.add( clickCountPanel, new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0) @@ -156,7 +156,7 @@ class MouseShortcutDialog extends DialogWrapper{ new GridBagConstraints(0,1,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,0,4,0),0,0) ); clickPadPanel.setBorder(IdeBorderFactory.createTitledBorder( - KeyMapBundle.message("mouse.shortcut.dialog.click.pad.border"), false, true, true)); + KeyMapBundle.message("mouse.shortcut.dialog.click.pad.border"), true)); myClickPad.setPreferredSize(new Dimension(260,60)); clickPadPanel.add(myClickPad,BorderLayout.CENTER); @@ -164,7 +164,7 @@ class MouseShortcutDialog extends DialogWrapper{ JPanel previewPanel=new JPanel(new GridBagLayout()); previewPanel.setBorder(IdeBorderFactory.createTitledBorder( - KeyMapBundle.message("mouse.shortcut.dialog.shortcut.preview.border"), false, true, true)); + KeyMapBundle.message("mouse.shortcut.dialog.shortcut.preview.border"), true)); panel.add( previewPanel, new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,0,4,0),0,0) @@ -178,7 +178,7 @@ class MouseShortcutDialog extends DialogWrapper{ JPanel conflictsPanel=new JPanel(new GridBagLayout()); conflictsPanel.setBorder(IdeBorderFactory.createTitledBorder( - KeyMapBundle.message("mouse.shortcut.dialog.conflicts.border"), false, true, true)); + KeyMapBundle.message("mouse.shortcut.dialog.conflicts.border"), true)); panel.add( conflictsPanel, new GridBagConstraints(0,3,1,1,1,1,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,0,0,0),0,0) diff --git a/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java b/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java index 182004a35ac5..10b71134414a 100644 --- a/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java @@ -121,7 +121,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu kbConfig.add(modifiers); kbConfig.add(hold); - kbConfig.setBorder(IdeBorderFactory.createTitledBorder("Keyboard Configuration", false, true, true)); + kbConfig.setBorder(IdeBorderFactory.createTitledBorder("Keyboard Configuration", true)); box.add(kbConfig); @@ -178,7 +178,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu hasConflicts |= printConflict(c, KeyEvent.VK_ENTER, QuickAccessSettings.SWITCH_APPLY); if (hasConflicts) { - myConflicts.setBorder(IdeBorderFactory.createTitledBorder("Conflicts", false, true, true)); + myConflicts.setBorder(IdeBorderFactory.createTitledBorder("Conflicts", true)); c.gridx = 0; c.gridy++; c.gridwidth = 2; diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java index f023cfa31c77..47533c6f7dfc 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java @@ -39,8 +39,8 @@ public class DateFilterComponent { private JPanel myRootPanel; public DateFilterComponent() { - myDatePanel.setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("border.changes.filter.date.filter"), false, - true, true)); + myDatePanel.setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("border.changes.filter.date.filter"), + true)); myDateAfter.setDateFormat(DateFormatUtil.getDateTimeFormat().getDelegate()); myDateBefore.setDateFormat(DateFormatUtil.getDateTimeFormat().getDelegate()); ActionListener listener = new ActionListener() { diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java index 1934041feb66..4bd1c0877aec 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java @@ -51,7 +51,7 @@ public abstract class StandardVersionFilterComponent