From 62244f0c0348348542d8d28091493be42032f66a Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Fri, 25 Nov 2011 19:12:46 +0300 Subject: [PATCH] Inspection's option panels layout --- .../deadCode/UnusedDeclarationInspection.java | 5 ++ .../DependencyInspection.java | 2 +- .../emptyMethod/EmptyMethodInspection.java | 2 +- .../java15api/Java15APIUsageInspection.java | 5 +- .../UnusedParametersInspection.java | 33 +++++----- .../unusedSymbol/OptionsPanel.form | 21 +++--- .../UnusedSymbolLocalInspection.java | 11 +--- .../FieldCanBeLocalInspection.java | 2 +- .../ui/SingleIntegerFieldOptionsPanel.java | 5 +- .../ui/SingleInspectionProfilePanel.java | 53 ++++++++------- .../src/messages/CodeInsightBundle.properties | 2 +- .../src/messages/InspectionsBundle.properties | 4 +- .../src/messages/XmlBundle.properties | 4 +- .../siyeh/InspectionGadgetsBundle.properties | 14 ++-- ...MethodNotExposedInInterfaceInspection.java | 8 ++- .../classmetrics/ClassCouplingInspection.java | 8 ++- .../ig/classmetrics/FieldCountInspection.java | 14 ++-- .../classmetrics/MethodCountInspection.java | 5 +- .../encapsulation/PublicFieldInspection.java | 13 +--- .../BadExceptionDeclaredInspection.java | 22 ++----- .../ig/migration/IfCanBeSwitchInspection.java | 5 +- .../siyeh/ig/naming/ConventionInspection.java | 40 ++++++----- .../PackageNamingConventionInspection.java | 34 +++++----- .../serialization/SerializableInspection.java | 5 +- ...lOnLocalVariableOrParameterInspection.java | 3 +- ...ComplexArithmeticExpressionInspection.java | 2 +- ...rlyComplexBooleanExpressionInspection.java | 2 +- ...tatementWithTooManyBranchesInspection.java | 2 +- .../naming/ConventionInspection.java | 66 +++++++++---------- .../utils/SingleIntegerFieldOptionsPanel.java | 10 ++- .../codeInspection/i18n/I18nInspection.java | 3 +- .../DuplicatePropertyInspection.form | 25 +++---- .../HtmlUnknownTagInspection.java | 11 ++-- .../RequiredAttributesInspection.java | 9 +-- 34 files changed, 224 insertions(+), 226 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java index 5ff1af1018b8..2a9d2fa8fd14 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java @@ -57,11 +57,13 @@ import com.intellij.psi.util.PsiMethodUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtilBase; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; +import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.SeparatorFactory; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.HashMap; import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.DateFormatUtil; +import com.intellij.util.ui.UIUtil; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -140,6 +142,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool { GridBagConstraints gc = new GridBagConstraints(); gc.weightx = 1; gc.weighty = 0; + gc.insets = new Insets(0, IdeBorderFactory.TITLED_BORDER_INDENT, 2, 0); gc.fill = GridBagConstraints.HORIZONTAL; gc.anchor = GridBagConstraints.NORTHWEST; @@ -203,6 +206,8 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool { final JButton configureAnnotations = EntryPointsManagerImpl.createConfigureAnnotationsBtn(this); gc.fill = GridBagConstraints.NONE; gc.gridy++; + gc.insets.top = 10; + gc.weighty = 1; add(configureAnnotations, gc); } diff --git a/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java b/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java index 1f39105ca015..0f8874d86549 100644 --- a/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java @@ -78,7 +78,7 @@ public class DependencyInspection extends BaseLocalInspectionTool { } }); - JPanel depPanel = new JPanel(new FlowLayout(FlowLayout.CENTER)); + JPanel depPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); depPanel.add(editDependencies); return depPanel; } diff --git a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java index 8b5e73576ed6..7fe23b3934eb 100644 --- a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java @@ -277,7 +277,7 @@ public class EmptyMethodInspection extends GlobalJavaInspectionTool { .createSpecialAnnotationsListControl(EXCLUDE_ANNOS, InspectionsBundle.message("special.annotations.annotations.list")); final JPanel panel = new JPanel(new BorderLayout(2, 2)); - panel.add(listPanel, BorderLayout.NORTH); + panel.add(listPanel, BorderLayout.CENTER); return panel; } diff --git a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java index 242599ad167c..a095a25d006e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java @@ -151,8 +151,7 @@ public class Java15APIUsageInspection extends BaseJavaLocalInspectionTool { @Override public JComponent createOptionsPanel() { - final JPanel panel = new JPanel(new VerticalFlowLayout()); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + final JPanel panel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 5, true, false)); panel.add(new JLabel("Forbid API usages:")); final JRadioButton projectRb = new JRadioButton("Respecting to project language level settings"); @@ -191,7 +190,7 @@ public class Java15APIUsageInspection extends BaseJavaLocalInspectionTool { } }); final JPanel comboPanel = new JPanel(new BorderLayout()); - comboPanel.setBorder(BorderFactory.createEmptyBorder(5, 20, 5, 5)); + comboPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0)); comboPanel.add(llCombo, BorderLayout.WEST); panel.add(comboPanel); diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java index d61aa226a3f5..aed39b1e7802 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java @@ -109,7 +109,8 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool { final PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(project); final AnalysisScope scope = manager.getScope(); manager.iterate(new RefJavaVisitor() { - @Override public void visitElement(RefEntity refEntity) { + @Override + public void visitElement(RefEntity refEntity) { if (refEntity instanceof RefMethod) { RefMethod refMethod = (RefMethod)refEntity; final PsiModifierListOwner element = refMethod.getElement(); @@ -132,15 +133,16 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool { final PsiParameter[] parameters = derived[i].getParameterList().getParameters(); if (parameters.length >= idx) continue; PsiParameter psiParameter = parameters[idx]; - ReferencesSearch.search(psiParameter, helper.getUseScope(psiParameter), false).forEach(new PsiReferenceProcessorAdapter( - new PsiReferenceProcessor() { - public boolean execute(PsiReference element) { - refParameter.parameterReferenced(false); - processor.ignoreElement(refParameter); - found[0] = true; - return false; - } - })); + ReferencesSearch.search(psiParameter, helper.getUseScope(psiParameter), false) + .forEach(new PsiReferenceProcessorAdapter( + new PsiReferenceProcessor() { + public boolean execute(PsiReference element) { + refParameter.parameterReferenced(false); + processor.ignoreElement(refParameter); + found[0] = true; + return false; + } + })); } } } @@ -222,13 +224,9 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool { @Override public JComponent createOptionsPanel() { final JPanel panel = new JPanel(new GridBagLayout()); - final GridBagConstraints gc = - new GridBagConstraints(GridBagConstraints.RELATIVE, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, - new Insets(5, 0, 0, 0), 0, 0); - panel.add(EntryPointsManagerImpl.createConfigureAnnotationsBtn(panel), gc); - gc.weightx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - panel.add(Box.createHorizontalBox(), gc); + panel.add(EntryPointsManagerImpl.createConfigureAnnotationsBtn(panel), + new GridBagConstraints(0, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); return panel; } @@ -305,6 +303,5 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool { csp.run(); } - } } diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form index 5800c27a6bd2..93a930895c82 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form +++ b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form @@ -1,6 +1,6 @@
- + @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -64,12 +64,17 @@ - + + + + + + diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java index 4db4e778770b..5b1af9d0e3e3 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java @@ -53,7 +53,6 @@ public class UnusedSymbolLocalInspection extends BaseJavaLocalInspectionTool imp public boolean REPORT_PARAMETER_FOR_PUBLIC_METHODS = true; - @NotNull public String getGroupDisplayName() { return GroupNames.DECLARATION_REDUNDANCY; @@ -124,13 +123,9 @@ public class UnusedSymbolLocalInspection extends BaseJavaLocalInspectionTool imp myCheckClassesCheckBox.addActionListener(listener); myCheckParametersCheckBox.addActionListener(listener); myReportUnusedParametersInPublics.addActionListener(listener); - final GridBagConstraints gc = - new GridBagConstraints(GridBagConstraints.RELATIVE, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, - new Insets(0, 0, 0, 0), 0, 0); - myAnnos.add(EntryPointsManagerImpl.createConfigureAnnotationsBtn(myPanel), gc); - gc.weightx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; - myAnnos.add(Box.createHorizontalBox(), gc); + myAnnos.add(EntryPointsManagerImpl.createConfigureAnnotationsBtn(myPanel), + new GridBagConstraints(0, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, + new Insets(10, 0, 0, 0), 0, 0)); } public JComponent getPanel() { diff --git a/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java index bdd975abc162..d2966bcdca3f 100644 --- a/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java @@ -99,7 +99,7 @@ public class FieldCanBeLocalInspection extends BaseLocalInspectionTool { .createSpecialAnnotationsListControl(EXCLUDE_ANNOS, InspectionsBundle.message("special.annotations.annotations.list")); final JPanel panel = new JPanel(new BorderLayout(2, 2)); - panel.add(listPanel, BorderLayout.NORTH); + panel.add(listPanel, BorderLayout.CENTER); return panel; } diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java b/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java index 8738a52f7ae9..298930fbaa95 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java @@ -17,6 +17,7 @@ package com.intellij.codeInspection.ui; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.ui.DocumentAdapter; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import javax.swing.JFormattedTextField; @@ -47,8 +48,7 @@ public class SingleIntegerFieldOptionsPanel extends JPanel { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.insets.left = 4; - constraints.insets.top = 4; + constraints.insets.right = UIUtil.DEFAULT_HGAP; constraints.weightx = 0.0; constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.NONE; @@ -57,6 +57,7 @@ public class SingleIntegerFieldOptionsPanel extends JPanel { constraints.gridy = 0; constraints.weightx = 1.0; constraints.weighty = 1.0; + constraints.insets.right = 0; constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.NONE; add(valueField, constraints); diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index d6644670defb..45cb44146e42 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -60,6 +60,7 @@ import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; +import com.intellij.util.config.StorageAccessors; import com.intellij.util.containers.Convertor; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -109,9 +110,14 @@ public class SingleInspectionProfilePanel extends JPanel { private String myInitialProfile; @NonNls private static final String EMPTY_HTML = ""; private boolean myIsInRestore = false; + @NonNls private static final String VERTICAL_DIVIDER_PROPORTION = "VERTICAL_DIVIDER_PROPORTION"; + @NonNls private static final String HORIZONTAL_DIVIDER_PROPORTION = "HORIZONTAL_DIVIDER_PROPORTION"; + private final StorageAccessors myProperties = StorageAccessors.createGlobal("SingleInspectionProfilePanel"); private boolean myShareProfile; private final InspectionProjectProfileManager myProjectProfileManager; + private Splitter myRightSplitter; + private Splitter myMainSplitter; public SingleInspectionProfilePanel(final String inspectionProfileName, final ModifiableModel profile) { this(null, inspectionProfileName, profile); @@ -529,8 +535,8 @@ public class SingleInspectionProfilePanel extends JPanel { scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); TreeUtil.collapseAll(myTree, 1); final Dimension preferredSize = new Dimension(myTree.getPreferredSize().width + 20, scrollPane.getPreferredSize().height); - scrollPane.setPreferredSize(preferredSize); - scrollPane.setMinimumSize(preferredSize); + //scrollPane.setPreferredSize(preferredSize); + //scrollPane.setMinimumSize(preferredSize); myTree.addTreeExpansionListener(new TreeExpansionListener() { @@ -560,6 +566,7 @@ public class SingleInspectionProfilePanel extends JPanel { myTreeExpander = new DefaultTreeExpander(myTree); myProfileFilter = new MyFilterComponent(); + myProfileFilter.setPreferredSize(new Dimension(100, -1)); return scrollPane; } @@ -778,19 +785,19 @@ public class SingleInspectionProfilePanel extends JPanel { final JPanel withSeverity = new JPanel(new GridBagLayout()); withSeverity.add(new JLabel(InspectionsBundle.message("inspection.severity")), - new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0, 0, GridBagConstraints.WEST, - GridBagConstraints.NONE, new Insets(0, 5, 5, 10), 0, 0)); - withSeverity.add(chooser, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0, GridBagConstraints.WEST, - GridBagConstraints.NONE, new Insets(0, 0, 5, 0), 0, 0)); + new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST, + GridBagConstraints.NONE, new Insets(0, IdeBorderFactory.TITLED_BORDER_INDENT, 10, 10), 0, 0)); + withSeverity.add(chooser, new GridBagConstraints(1, 0, 1, 1, 1.0, 0, GridBagConstraints.WEST, + GridBagConstraints.NONE, new Insets(0, 0, 10, 0), 0, 0)); final JComponent comp = descriptor.getState().getAdditionalConfigPanel(); withSeverity.add(comp != null ? comp : new JPanel(), - new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, - GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + new GridBagConstraints(0, 1, 2, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, + GridBagConstraints.BOTH, new Insets(0, IdeBorderFactory.TITLED_BORDER_INDENT, 0, 0), 0, 0)); - myOptionsPanel.add(withSeverity, BorderLayout.NORTH); + myOptionsPanel.add(withSeverity, BorderLayout.CENTER); } - myOptionsPanel.validate(); + myOptionsPanel.revalidate(); GuiUtils.enableChildren(myOptionsPanel, node.isChecked()); } else { @@ -801,8 +808,6 @@ public class SingleInspectionProfilePanel extends JPanel { private void initOptionsAndDescriptionPanel() { myOptionsPanel.removeAll(); - myOptionsPanel.add(SeparatorFactory.createSeparator("Options", null)); - myOptionsPanel.add(new JPanel()); try { myBrowser.read(new StringReader(EMPTY_HTML), null); } @@ -861,6 +866,8 @@ public class SingleInspectionProfilePanel extends JPanel { if (myInspectionProfilePanel == null) { return; } + myProperties.setFloat(VERTICAL_DIVIDER_PROPORTION, myMainSplitter.getProportion()); + myProperties.setFloat(HORIZONTAL_DIVIDER_PROPORTION, myRightSplitter.getProportion()); myAlarm.cancelAllRequests(); myProfileFilter.dispose(); if (mySelectedProfile != null) { @@ -885,13 +892,14 @@ public class SingleInspectionProfilePanel extends JPanel { true, new Insets(13, 0, 0, 0))); descriptionPanel.add(ScrollPaneFactory.createScrollPane(myBrowser), BorderLayout.CENTER); - Splitter rightPanel = new Splitter(true); - rightPanel.setFirstComponent(descriptionPanel); + myRightSplitter = new Splitter(true); + myRightSplitter.setFirstComponent(descriptionPanel); + myRightSplitter.setProportion(myProperties.getFloat(HORIZONTAL_DIVIDER_PROPORTION, 0.5f)); myOptionsPanel = new JPanel(new BorderLayout()); initOptionsAndDescriptionPanel(); - rightPanel.setSecondComponent(myOptionsPanel); - rightPanel.setHonorComponentsMinimumSize(true); + myRightSplitter.setSecondComponent(myOptionsPanel); + myRightSplitter.setHonorComponentsMinimumSize(true); final JPanel treePanel = new JPanel(new BorderLayout()); final JScrollPane tree = initTreeScrollPane(); @@ -903,15 +911,14 @@ public class SingleInspectionProfilePanel extends JPanel { northPanel.add(myProfileFilter, BorderLayout.EAST); treePanel.add(northPanel, BorderLayout.NORTH); - Splitter splitter = new Splitter(false); - splitter.setShowDividerControls(false); - splitter.setFirstComponent(treePanel); - splitter.setSecondComponent(rightPanel); - splitter.setProportion((float)tree.getPreferredSize().width/getPreferredSize().width); - splitter.setHonorComponentsMinimumSize(true); + myMainSplitter = new Splitter(false); + myMainSplitter.setFirstComponent(treePanel); + myMainSplitter.setSecondComponent(myRightSplitter); + myMainSplitter.setHonorComponentsMinimumSize(false); + myMainSplitter.setProportion(myProperties.getFloat(VERTICAL_DIVIDER_PROPORTION, 0.5f)); final JPanel panel = new JPanel(new BorderLayout()); - panel.add(splitter, BorderLayout.CENTER); + panel.add(myMainSplitter, BorderLayout.CENTER); panel.setBorder(IdeBorderFactory.createEmptyBorder(2, 2, 0, 2)); return panel; } diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties index 6d9bef5c3e1a..bd92a2f434ea 100644 --- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties +++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties @@ -130,7 +130,7 @@ quickfix.i18n.concatentation.error=String concatenation not found quickfix.i18n.command.name=I18nize inspection.i18n.display.name=Hard coded strings inspection.i18n.option.ignore.assert=Ignore for assert statement arguments -inspection.i18n.option.ignore.for.exception.constructor.arguments=Ignore for exception constructor arguments +inspection.i18n.option.ignore.for.exception.constructor.arguments=Ignore for exception constructor arguments: inspection.i18n.option.ignore.for.specified.exception.constructor.arguments=Ignore for specified exception constructor arguments inspection.i18n.option.ignore.for.junit.assert.arguments=Ignore for JUnit assert arguments inspection.i18n.option.ignore.qualified.class.names=Ignore literals which have value equal to existing qualified class name diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index 4e056647d356..1e3b70d16400 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -265,9 +265,9 @@ inspection.surround.if.quickfix=Surround with ''if ({0} != null)'' inspection.surround.if.family=Surround with if inspection.dependency.configure.button.text=Configure dependency rules -inspection.javadoc.label.text=Additional Javadoc Tags +inspection.javadoc.label.text=Additional Javadoc Tags: inspection.javadoc.dialog.title=Edit Additional Javadoc Tags -inspection.javadoc.html.not.required.label.text=Additional Not Required Html Attributes +inspection.javadoc.html.not.required.label.text=Additional Not Required Html Attributes: inspection.javadoc.html.not.required.dialog.title=Edit Additional Not Required Html Attributes inspection.required.attributes.display.name=Missing required attribute diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties index dba7e389f9d6..9375b8d85e4c 100644 --- a/platform/platform-resources-en/src/messages/XmlBundle.properties +++ b/platform/platform-resources-en/src/messages/XmlBundle.properties @@ -71,9 +71,9 @@ html.inspections.non.existent.internet.resource.name=Non-existent web resource html.inspections.unknown.tag=Unknown HTML tag html.inspections.unknown.attribute=Unknown HTML tag attribute -html.inspections.unknown.tag.checkbox.title=Custom HTML tags +html.inspections.unknown.tag.checkbox.title=Custom HTML tags: html.inspections.unknown.tag.title=Edit custom tags -html.inspections.unknown.tag.attribute.checkbox.title=Custom HTML tag attributes +html.inspections.unknown.tag.attribute.checkbox.title=Custom HTML tag attributes: html.inspections.unknown.tag.attribute.title=Edit custom attributes duplicate.declaration=Nonunique declaration name {0} dtd.parser.message.name.expected=xml name expected diff --git a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties index e6150f393a6c..549e1543de9f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties +++ b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties @@ -456,7 +456,7 @@ array.length.in.loop.condition.display.name=Array.length in loop condition array.length.in.loop.condition.problem.descriptor=Check of array #ref in loop condition #loc large.array.allocation.no.outofmemoryerror.display.name=Large array allocation with no OutOfMemoryError check large.array.allocation.no.outofmemoryerror.problem.descriptor=Large array allocation which is not checked for out-of-memory condition #loc -large.array.allocation.no.outofmemoryerror.maximum.number.of.elements.option=Maximum number of elements +large.array.allocation.no.outofmemoryerror.maximum.number.of.elements.option=Maximum number of elements: connection.opened.not.safely.closed.display.name=Connection opened but not safely closed field.repeatedly.accessed.in.method.display.name=Field repeatedly accessed in method field.repeatedly.accessed.in.method.problem.descriptor=Field ''{0}'' accessed repeatedly in method #ref(0 #loc @@ -467,7 +467,7 @@ method.call.in.loop.condition.display.name=Method call in loop condition method.call.in.loop.condition.problem.descriptor=Call to method #ref() in loop condition #loc large.initializer.primitive.type.array.display.name=Overly large initializer for array of primitive type large.initializer.primitive.type.array.problem.descriptor=Primitive array initializer with too many elements ({0}) #loc -large.initializer.primitive.type.array.maximum.number.of.elements.option=Maximum number of elements +large.initializer.primitive.type.array.maximum.number.of.elements.option=Maximum number of elements: private.member.access.between.outer.and.inner.classes.display.name=Private member access between outer and inner classes private.member.access.between.outer.and.inner.classes.problem.descriptor=Access to private member of class ''{0}'' #loc private.member.access.between.outer.and.inner.classes.make.local.quickfix=Make ''{0}'' package-local @@ -1519,16 +1519,16 @@ class.unconnected.to.package.display.name=Class independent of its package class.unconnected.to.package.problem.descriptor=Class #ref has no dependencies or dependents in its package #loc package.with.too.many.classes.display.name=Package with too many classes package.with.too.many.classes.problem.descriptor=Package {0} contains too many classes ({1} > {2}) #loc -package.with.too.many.classes.max.option=Maximum number of classes +package.with.too.many.classes.max.option=Maximum number of classes: package.with.too.few.classes.display.name=Package with too few classes package.with.too.few.classes.problem.descriptor=Package {0} contains too few classes ({1} < {2}) #loc -package.with.too.few.classes.min.option=Minimum number of classes +package.with.too.few.classes.min.option=Minimum number of classes: module.with.too.many.classes.display.name=Module with too many classes module.with.too.many.classes.problem.descriptor=Module {0} contains too many classes ({1} > {2}) #loc -module.with.too.many.classes.max.option=Maximum number of classes +module.with.too.many.classes.max.option=Maximum number of classes: module.with.too.few.classes.display.name=Module with too few classes module.with.too.few.classes.problem.descriptor=Module {0} contains too few classes ({1} < {2}) #loc -module.with.too.few.classes.min.option=Minimum number of classes +module.with.too.few.classes.min.option=Minimum number of classes: package.in.multiple.modules.display.name=Package with classes in multiple modules package.in.multiple.modules.problem.descriptor=Package {0} has classes in multiple modules #loc disjoint.package.display.name=Package with disjoint dependency graph @@ -1870,7 +1870,7 @@ try.with.identical.catches.problem.descriptor=Identical 'catch' branches in 'try if.can.be.switch.display.name='if' replaceable with 'switch' if.can.be.switch.problem.descriptor=#ref statement replaceable with 'switch' statement #loc if.can.be.switch.quickfix=Replace with 'switch' -if.can.be.switch.minimum.branch.option=Minimum number of branches +if.can.be.switch.minimum.branch.option=Minimum number of branches: if.can.be.switch.int.option=Suggest switch on numbers if.can.be.switch.enum.option=Suggest switch on enums unnecessarily.qualified.inner.class.access.option=Ignore references for which an import is needed diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java index 167ea25f214f..99224547564d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java @@ -68,14 +68,18 @@ public class PublicMethodNotExposedInInterfaceInspection final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; + constraints.weighty = 1.0; constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.WEST; - constraints.fill = GridBagConstraints.HORIZONTAL; + constraints.anchor = GridBagConstraints.CENTER; + constraints.fill = GridBagConstraints.BOTH; panel.add(annotationsListControl, constraints); final CheckBox checkBox = new CheckBox(InspectionGadgetsBundle.message( "public.method.not.in.interface.option"), this, "onlyWarnIfContainingClassImplementsAnInterface"); constraints.gridy = 1; + constraints.weighty = 0.0; + constraints.anchor = GridBagConstraints.WEST; + constraints.fill = GridBagConstraints.HORIZONTAL; panel.add(checkBox, constraints); return panel; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java index a34787835f73..5d0ffc03454a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java @@ -17,6 +17,7 @@ package com.siyeh.ig.classmetrics; import com.intellij.psi.PsiClass; import com.intellij.util.ui.CheckBox; +import com.intellij.util.ui.UIUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import org.jetbrains.annotations.NotNull; @@ -78,15 +79,17 @@ public class ClassCouplingInspection final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.weightx = 1.0; + constraints.weightx = 0.0; constraints.anchor = GridBagConstraints.WEST; constraints.fill = GridBagConstraints.NONE; + constraints.insets.right = UIUtil.DEFAULT_HGAP; final JPanel panel = new JPanel(new GridBagLayout()); panel.add(label, constraints); constraints.gridx = 1; constraints.gridy = 0; constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.WEST; + constraints.insets.right = 0; + constraints.anchor = GridBagConstraints.NORTHWEST; constraints.fill = GridBagConstraints.NONE; panel.add(valueField, constraints); @@ -106,6 +109,7 @@ public class ClassCouplingInspection constraints.gridx = 0; constraints.gridy = 2; + constraints.weighty = 1; constraints.gridwidth = 2; panel.add(objectCheckBox, constraints); return panel; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java index 46e1225ad525..3ea9dbe41f65 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/FieldCountInspection.java @@ -20,12 +20,14 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiType; import com.intellij.util.ui.CheckBox; +import com.intellij.util.ui.UIUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ClassUtils; import org.jetbrains.annotations.NotNull; import javax.swing.*; +import javax.swing.border.LineBorder; import java.awt.*; public class FieldCountInspection extends ClassMetricInspection { @@ -90,25 +92,29 @@ public class FieldCountInspection extends ClassMetricInspection { constraints.gridx = 0; constraints.gridy = 0; constraints.weightx = 0.0; + constraints.weighty = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; constraints.anchor = GridBagConstraints.WEST; constraints.fill = GridBagConstraints.NONE; final JPanel panel = new JPanel(new GridBagLayout()); panel.add(label, constraints); constraints.gridx = 1; constraints.gridy = 0; - constraints.gridwidth = 3; + constraints.gridwidth = 1; constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.WEST; + constraints.insets.right = 0; + constraints.anchor = GridBagConstraints.NORTHWEST; constraints.fill = GridBagConstraints.NONE; panel.add(valueField, constraints); constraints.gridx = 0; constraints.gridy = 1; - constraints.gridwidth = 4; + constraints.gridwidth = 2; constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.WEST; + constraints.anchor = GridBagConstraints.NORTHWEST; constraints.fill = GridBagConstraints.NONE; panel.add(includeCheckBox, constraints); constraints.gridy = 2; + constraints.weighty = 1; panel.add(considerCheckBox, constraints); return panel; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/MethodCountInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/MethodCountInspection.java index 0b75bbe467d7..705fa0470684 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/MethodCountInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/MethodCountInspection.java @@ -19,6 +19,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.refactoring.psi.PropertyUtils; import com.intellij.util.ui.CheckBox; +import com.intellij.util.ui.UIUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -59,13 +60,11 @@ public class MethodCountInspection extends BaseInspection { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.insets.left = 4; - constraints.insets.right = 4; + constraints.insets.right = UIUtil.DEFAULT_HGAP; constraints.anchor = GridBagConstraints.WEST; panel.add(label, constraints); constraints.gridx = 1; constraints.weightx = 1.0; - constraints.insets.left = 0; constraints.insets.right = 0; panel.add(valueField, constraints); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java index 21be1458ac94..d85659757e76 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/PublicFieldInspection.java @@ -56,20 +56,13 @@ public class PublicFieldInspection extends BaseInspection { @Override @Nullable public JComponent createOptionsPanel() { - final JPanel panel = new JPanel(new GridBagLayout()); + final JPanel panel = new JPanel(new BorderLayout()); final JPanel annotationsListControl = SpecialAnnotationsUtil.createSpecialAnnotationsListControl( ignorableAnnotations, InspectionGadgetsBundle.message("ignore.if.annotated.by")); - final GridBagConstraints constraints = new GridBagConstraints(); - constraints.gridx = 0; - constraints.gridy = 0; - constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.WEST; - constraints.fill = GridBagConstraints.HORIZONTAL; - panel.add(annotationsListControl, constraints); + panel.add(annotationsListControl, BorderLayout.CENTER); final CheckBox checkBox = new CheckBox(InspectionGadgetsBundle.message( "public.field.ignore.enum.type.fields.option"), this, "ignoreEnums"); - constraints.gridy = 1; - panel.add(checkBox, constraints); + panel.add(checkBox, BorderLayout.SOUTH); return panel; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java index 8fbe71fe45c4..2561e3730ae5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -95,7 +95,7 @@ public class BadExceptionDeclaredInspection extends BaseInspection { @Override public JComponent createOptionsPanel() { - final JComponent panel = new JPanel(new GridBagLayout()); + final JComponent panel = new JPanel(new BorderLayout()); final ListTable table = new ListTable(new ListWrappingTableModel(exceptions, @@ -113,23 +113,9 @@ public class BadExceptionDeclaredInspection extends BaseInspection { "bad.exception.declared.ignore.exceptions.declared.in.tests.option"), this, "ignoreTestCases"); - final GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.FIRST_LINE_START; - constraints.gridx = 0; - constraints.gridy = 0; - constraints.insets.left = 4; - constraints.insets.right = 4; - constraints.weightx = 1.0; - constraints.weighty = 1.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - panel.add(toolbar.getComponent(), constraints); - - constraints.gridy = 1; - panel.add(scrollPane, constraints); - - constraints.gridy = 2; - constraints.fill = GridBagConstraints.BOTH; - panel.add(checkBox, constraints); + panel.add(toolbar.getComponent(), BorderLayout.NORTH); + panel.add(scrollPane, BorderLayout.CENTER); + panel.add(checkBox, BorderLayout.SOUTH); return panel; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java index f7c17fbb14f5..743f5b98f49d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java @@ -108,15 +108,16 @@ public class IfCanBeSwitchInspection extends BaseInspection { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.insets.left = 4; - constraints.insets.top = 4; + constraints.insets.bottom = 4; constraints.weightx = 0.0; constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.NONE; + constraints.insets.right = 10; panel.add(label, constraints); constraints.gridx = 1; constraints.gridy = 0; constraints.weightx = 1.0; + constraints.insets.right = 0; panel.add(valueField, constraints); constraints.gridx = 0; constraints.gridy = 1; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConventionInspection.java index aeb187776e55..a9fdd48c77d1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConventionInspection.java @@ -111,13 +111,10 @@ public abstract class ConventionInspection extends BaseInspection { final JLabel patternLabel = new JLabel( InspectionGadgetsBundle.message("convention.pattern.option")); - patternLabel.setHorizontalAlignment(SwingConstants.TRAILING); final JLabel minLengthLabel = new JLabel( InspectionGadgetsBundle.message("convention.min.length.option")); - minLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING); final JLabel maxLengthLabel = new JLabel( InspectionGadgetsBundle.message("convention.max.length.option")); - maxLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING); final NumberFormat numberFormat = NumberFormat.getIntegerInstance(); numberFormat.setParseIntegerOnly(true); @@ -178,50 +175,51 @@ public abstract class ConventionInspection extends BaseInspection { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; + constraints.anchor = GridBagConstraints.BASELINE_LEADING; + constraints.fill = GridBagConstraints.HORIZONTAL; panel.add(patternLabel, constraints); constraints.gridx = 1; constraints.gridy = 0; - constraints.gridwidth = 3; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.anchor = GridBagConstraints.WEST; + constraints.weightx = 1.0; + constraints.insets.right = 0; panel.add(regexField, constraints); constraints.gridx = 0; constraints.gridy = 1; - constraints.gridwidth = 1; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; panel.add(minLengthLabel, constraints); constraints.gridx = 1; constraints.gridy = 1; - constraints.anchor = GridBagConstraints.WEST; + constraints.weightx = 1; + constraints.insets.right = 0; panel.add(minLengthField, constraints); - constraints.gridx = 2; - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.EAST; + constraints.gridx = 0; + constraints.gridy = 2; + constraints.weightx = 0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; panel.add(maxLengthLabel, constraints); - constraints.gridx = 3; - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.WEST; + constraints.gridx = 1; + constraints.gridy = 2; + constraints.weightx = 1; + constraints.insets.right = 0; panel.add(maxLengthField, constraints); final Collection extraOptions = createExtraOptions(); constraints.gridx = 0; - constraints.gridwidth = 4; - constraints.insets.top = 0; - constraints.insets.bottom = 0; + constraints.gridwidth = 2; for (JComponent extraOption : extraOptions) { constraints.gridy++; panel.add(extraOption, constraints); } - constraints.gridx = 0; constraints.gridy++; constraints.weighty = 1.0; panel.add(new BlankFiller(), constraints); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java index 1c108903e3b2..9a4e9c76d669 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java @@ -128,11 +128,8 @@ public class PackageNamingConventionInspection extends BaseGlobalInspection { final JPanel panel = new JPanel(layout); final JLabel patternLabel = new JLabel(InspectionGadgetsBundle.message("convention.pattern.option")); - patternLabel.setHorizontalAlignment(SwingConstants.TRAILING); final JLabel minLengthLabel = new JLabel(InspectionGadgetsBundle.message("convention.min.length.option")); - minLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING); final JLabel maxLengthLabel = new JLabel(InspectionGadgetsBundle.message("convention.max.length.option")); - maxLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING); final NumberFormat numberFormat = NumberFormat.getIntegerInstance(); numberFormat.setParseIntegerOnly(true); @@ -193,36 +190,41 @@ public class PackageNamingConventionInspection extends BaseGlobalInspection { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; + constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.HORIZONTAL; panel.add(patternLabel, constraints); constraints.gridx = 1; constraints.gridy = 0; - constraints.gridwidth = 3; - constraints.anchor = GridBagConstraints.WEST; + constraints.weightx = 1.0; + constraints.insets.right = 0; panel.add(regexField, constraints); constraints.gridx = 0; constraints.gridy = 1; - constraints.gridwidth = 1; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; panel.add(minLengthLabel, constraints); constraints.gridx = 1; constraints.gridy = 1; - constraints.anchor = GridBagConstraints.WEST; + constraints.weightx = 1; + constraints.insets.right = 0; panel.add(minLengthField, constraints); - constraints.gridx = 2; - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.EAST; + constraints.gridx = 0; + constraints.gridy = 2; + constraints.weightx = 0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; panel.add(maxLengthLabel, constraints); - constraints.gridx = 3; - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.WEST; + constraints.gridx = 1; + constraints.gridy = 2; + constraints.weightx = 1; + constraints.weighty = 1; + constraints.insets.right = 0; panel.add(maxLengthField, constraints); return panel; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInspection.java index f0767ffd2af7..f9becd96bf3e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInspection.java @@ -56,21 +56,20 @@ public abstract class SerializableInspection extends BaseInspection { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.insets.left = 4; - constraints.insets.right = 4; constraints.weightx = 1.0; constraints.weighty = 1.0; constraints.fill = GridBagConstraints.BOTH; panel.add(chooserList, constraints); - constraints.fill = GridBagConstraints.HORIZONTAL; + constraints.fill = GridBagConstraints.BOTH; final JComponent[] additionalOptions = createAdditionalOptions(); for (JComponent additionalOption : additionalOptions) { constraints.gridy++; panel.add(additionalOption, constraints); } + constraints.fill = GridBagConstraints.HORIZONTAL; constraints.gridy++; constraints.weighty = 0.0; panel.add(checkBox, constraints); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java index 5555b1a9bbf0..817e7ddce775 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFinalOnLocalVariableOrParameterInspection.java @@ -125,7 +125,7 @@ public class UnnecessaryFinalOnLocalVariableOrParameterInspection } }); final GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.WEST; + constraints.anchor = GridBagConstraints.NORTHWEST; constraints.fill = GridBagConstraints.HORIZONTAL; constraints.weightx = 1.0; panel.add(reportLocalVariablesCheckBox, constraints); @@ -133,6 +133,7 @@ public class UnnecessaryFinalOnLocalVariableOrParameterInspection panel.add(reportParametersCheckBox, constraints); constraints.insets.left = 20; constraints.gridy = 2; + constraints.weighty = 1.0; panel.add(abstractOnlyCheckBox, constraints); return panel; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspection.java index c2616c712909..d8962498337d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexArithmeticExpressionInspection.java @@ -56,7 +56,7 @@ public class GroovyOverlyComplexArithmeticExpressionInspection extends BaseInspe } public JComponent createOptionsPanel() { - return new SingleIntegerFieldOptionsPanel("Maximum number of terms", + return new SingleIntegerFieldOptionsPanel("Maximum number of terms:", this, "m_limit"); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspection.java index e00d30b7c2a3..86ada26fc2dc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyOverlyComplexBooleanExpressionInspection.java @@ -53,7 +53,7 @@ public class GroovyOverlyComplexBooleanExpressionInspection extends BaseInspecti } public JComponent createOptionsPanel() { - return new SingleIntegerFieldOptionsPanel("Maximum number of terms", + return new SingleIntegerFieldOptionsPanel("Maximum number of terms:", this, "m_limit"); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspection.java index 3351fda489c1..3abe924efa63 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithTooManyBranchesInspection.java @@ -49,7 +49,7 @@ public class GroovyIfStatementWithTooManyBranchesInspection extends BaseInspecti } public JComponent createOptionsPanel() { - return new SingleIntegerFieldOptionsPanel("Maximum number of branches", this, "m_limit"); + return new SingleIntegerFieldOptionsPanel("Maximum number of branches:", this, "m_limit"); } protected String buildErrorString(Object... args) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/ConventionInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/ConventionInspection.java index ee0e87ffebb3..13d00560ad09 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/ConventionInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/ConventionInspection.java @@ -48,15 +48,15 @@ public abstract class ConventionInspection extends BaseInspection { /** * public fields for the DefaultJDomExternalizer * - * @noinspection PublicField,WeakerAccess + * @noinspection PublicField, WeakerAccess */ public String m_regex = getDefaultRegex(); /** - * @noinspection PublicField,WeakerAccess + * @noinspection PublicField, WeakerAccess */ public int m_minLength = getDefaultMinLength(); /** - * @noinspection PublicField,WeakerAccess + * @noinspection PublicField, WeakerAccess */ public int m_maxLength = getDefaultMaxLength(); @@ -107,27 +107,21 @@ public abstract class ConventionInspection extends BaseInspection { final GridBagLayout layout = new GridBagLayout(); final JPanel panel = new JPanel(layout); - final JLabel patternLabel = new JLabel( - "Pattern:"); - patternLabel.setHorizontalAlignment(SwingConstants.TRAILING); - final JLabel minLengthLabel = new JLabel( - "Min Length:"); - minLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING); - final JLabel maxLengthLabel = new JLabel( - "Max Length:"); - maxLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING); + final JLabel patternLabel = new JLabel("Pattern:"); + final JLabel minLengthLabel = new JLabel("Min Length:"); + final JLabel maxLengthLabel = new JLabel("Max Length:"); final NumberFormat numberFormat = NumberFormat.getIntegerInstance(); numberFormat.setParseIntegerOnly(true); numberFormat.setMinimumIntegerDigits(1); numberFormat.setMaximumIntegerDigits(2); final InternationalFormatter formatter = - new InternationalFormatter(numberFormat); + new InternationalFormatter(numberFormat); formatter.setAllowsInvalid(false); formatter.setCommitsOnValidEdit(true); final JFormattedTextField minLengthField = - new JFormattedTextField(formatter); + new JFormattedTextField(formatter); final Font panelFont = panel.getFont(); minLengthField.setFont(panelFont); minLengthField.setValue(m_minLength); @@ -135,14 +129,14 @@ public abstract class ConventionInspection extends BaseInspection { UIUtil.fixFormattedField(minLengthField); final JFormattedTextField maxLengthField = - new JFormattedTextField(formatter); + new JFormattedTextField(formatter); maxLengthField.setFont(panelFont); maxLengthField.setValue(m_maxLength); maxLengthField.setColumns(2); UIUtil.fixFormattedField(maxLengthField); final JFormattedTextField regexField = - new JFormattedTextField(new RegExFormatter()); + new JFormattedTextField(new RegExFormatter()); regexField.setFont(panelFont); regexField.setValue(m_regexPattern); regexField.setColumns(REGEX_COLUMN_COUNT); @@ -155,11 +149,12 @@ public abstract class ConventionInspection extends BaseInspection { regexField.commitEdit(); minLengthField.commitEdit(); maxLengthField.commitEdit(); - m_regexPattern = (Pattern) regexField.getValue(); + m_regexPattern = (Pattern)regexField.getValue(); m_regex = m_regexPattern.pattern(); - m_minLength = ((Number) minLengthField.getValue()).intValue(); - m_maxLength = ((Number) maxLengthField.getValue()).intValue(); - } catch (ParseException ignore) { + m_minLength = ((Number)minLengthField.getValue()).intValue(); + m_maxLength = ((Number)maxLengthField.getValue()).intValue(); + } + catch (ParseException ignore) { // No luck this time } } @@ -174,36 +169,41 @@ public abstract class ConventionInspection extends BaseInspection { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; + constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.HORIZONTAL; panel.add(patternLabel, constraints); constraints.gridx = 1; constraints.gridy = 0; - constraints.gridwidth = 3; - constraints.anchor = GridBagConstraints.WEST; + constraints.weightx = 1.0; + constraints.insets.right = 0; panel.add(regexField, constraints); constraints.gridx = 0; constraints.gridy = 1; - constraints.gridwidth = 1; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; panel.add(minLengthLabel, constraints); constraints.gridx = 1; constraints.gridy = 1; - constraints.anchor = GridBagConstraints.WEST; + constraints.weightx = 1; + constraints.insets.right = 0; panel.add(minLengthField, constraints); - constraints.gridx = 2; - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.EAST; + constraints.gridx = 0; + constraints.gridy = 2; + constraints.weightx = 0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; panel.add(maxLengthLabel, constraints); - constraints.gridx = 3; - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.WEST; + constraints.gridx = 1; + constraints.gridy = 2; + constraints.weightx = 1; + constraints.weighty = 1; + constraints.insets.right = 0; panel.add(maxLengthField, constraints); return panel; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/SingleIntegerFieldOptionsPanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/SingleIntegerFieldOptionsPanel.java index b091fdc0db85..f7f46c9818b5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/SingleIntegerFieldOptionsPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/SingleIntegerFieldOptionsPanel.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.codeInspection.utils; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -56,14 +57,17 @@ public class SingleIntegerFieldOptionsPanel extends JPanel { final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; - constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.EAST; + constraints.weightx = 0.0; + constraints.insets.right = UIUtil.DEFAULT_HGAP; + constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.NONE; add(label, constraints); constraints.gridx = 1; constraints.gridy = 0; constraints.weightx = 1.0; - constraints.anchor = GridBagConstraints.WEST; + constraints.weighty = 1.0; + constraints.insets.right = 0; + constraints.anchor = GridBagConstraints.BASELINE_LEADING; constraints.fill = GridBagConstraints.NONE; add(valueField, constraints); } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java index a8761e97924b..49a7a1610579 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java @@ -186,6 +186,7 @@ public class I18nInspection extends BaseLocalInspectionTool { final GridBagConstraints gc = new GridBagConstraints(); gc.fill = GridBagConstraints.HORIZONTAL; + gc.insets.bottom = 2; gc.gridx = GridBagConstraints.REMAINDER; gc.gridy = 0; @@ -202,7 +203,7 @@ public class I18nInspection extends BaseLocalInspectionTool { gc.gridy ++; final Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); panel.add(new FieldPanel(specifiedExceptions, - CodeInsightBundle.message("inspection.i18n.option.ignore.for.specified.exception.constructor.arguments"), + null, CodeInsightBundle.message("inspection.i18n.option.ignore.for.specified.exception.constructor.arguments"), openProjects.length == 0 ? null : new ActionListener() { diff --git a/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.form b/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.form index b61ee157aa7f..7924729785d3 100644 --- a/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.form +++ b/plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.form @@ -1,14 +1,14 @@
- + - + - + @@ -40,15 +40,10 @@ - - - - - - - + + @@ -79,13 +74,13 @@ - - - - - + + + + + diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java index 667d1e523f49..a0f95c766239 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java @@ -43,6 +43,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; +import javax.swing.border.EmptyBorder; import javax.swing.event.DocumentEvent; import javax.swing.text.BadLocationException; import javax.swing.text.Document; @@ -87,10 +88,8 @@ public class HtmlUnknownTagInspection extends HtmlLocalInspectionTool { public JComponent createOptionsPanel() { final JPanel result = new JPanel(new BorderLayout()); - final JPanel internalPanel = new JPanel(); - internalPanel.setLayout(new BoxLayout(internalPanel, BoxLayout.Y_AXIS)); - - result.add(internalPanel, BorderLayout.SOUTH); + final JPanel internalPanel = new JPanel(new BorderLayout()); + result.add(internalPanel, BorderLayout.NORTH); final FieldPanel additionalAttributesPanel = new FieldPanel(null, getPanelTitle(), null, null); additionalAttributesPanel.getTextField().getDocument().addDocumentListener(new DocumentAdapter() { @@ -120,8 +119,8 @@ public class HtmlUnknownTagInspection extends HtmlLocalInspectionTool { } }); - internalPanel.add(checkBox); - internalPanel.add(additionalAttributesPanel); + internalPanel.add(checkBox, BorderLayout.NORTH); + internalPanel.add(additionalAttributesPanel, BorderLayout.CENTER); additionalAttributesPanel.setPreferredSize(new Dimension(150, additionalAttributesPanel.getPreferredSize().height)); additionalAttributesPanel.setEnabled(myCustomValuesEnabled); diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java index e110a89857ee..d4cdffe1d274 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java @@ -62,15 +62,12 @@ public class RequiredAttributesInspection extends XmlSuppressableInspectionTool @Nullable public JComponent createOptionsPanel() { - return createAdditionalNotRequiredHtmlAttributesPanel(); - } - - public FieldPanel createAdditionalNotRequiredHtmlAttributesPanel() { + JPanel panel = new JPanel(new BorderLayout()); FieldPanel additionalAttributesPanel = new FieldPanel(InspectionsBundle.message("inspection.javadoc.html.not.required.label.text"), InspectionsBundle.message("inspection.javadoc.html.not.required.dialog.title"), null, null); - additionalAttributesPanel.setPreferredSize(new Dimension(150, additionalAttributesPanel.getPreferredSize().height)); + panel.add(additionalAttributesPanel, BorderLayout.NORTH); additionalAttributesPanel.getTextField().getDocument().addDocumentListener(new DocumentAdapter() { protected void textChanged(DocumentEvent e) { final Document document = e.getDocument(); @@ -86,7 +83,7 @@ public class RequiredAttributesInspection extends XmlSuppressableInspectionTool } }); additionalAttributesPanel.setText(myAdditionalRequiredHtmlAttributes); - return additionalAttributesPanel; + return panel; } public IntentionAction getIntentionAction(String name, int type) {