MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

form's refactor

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2011-07-28 16:27:39 +04:00
parent 7f98170bdc
commit eec33d746f
52 changed files with 399 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form
+2 -2
View File
@@ -9,7 +9,7 @@
<border type="none"/>
<children>
<grid id="d786c" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="15" left="10" bottom="3" right="7"/>
<margin top="15" left="5" bottom="3" right="7"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
@@ -36,7 +36,7 @@
<xy id="12adb" binding="myContentPanel" layout-manager="XYLayout" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="1" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form
+2 -2
View File
@@ -3,7 +3,7 @@
<grid id="8cf0d" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="18" y="29" width="514" height="479"/>
<xy x="18" y="29" width="514" height="528"/>
</constraints>
<properties/>
<border type="none"/>
@@ -159,7 +159,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithoutIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/ApplicationBundle" title-key="title.order.of.members"/>
<children/>
java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java
+2 -2
View File
@@ -141,7 +141,7 @@ public class CodeStyleImportsPanel extends JPanel {
private JPanel createPackagesPanel() {
JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(ApplicationBundle.message("title.packages.to.use.import.with")));
panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithoutIndent(ApplicationBundle.message("title.packages.to.use.import.with")));
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.createTitledBorderBoldWithIndent(ApplicationBundle.message("title.import.layout")));
panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithoutIndent(ApplicationBundle.message("title.import.layout")));
myCbLayoutStaticImportsSeparately = new JCheckBox("Layout static imports separately");
myCbLayoutStaticImportsSeparately.addItemListener(new ItemListener(){
java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties
+1 -1
View File
@@ -191,7 +191,7 @@ the.selected.class.has.no.members.to.extract=The selected class has no members t
references.to.extract=References to extract
extracting.from.class=Extracting from class:
extracted.class.command.name=Extracted class {0}
method.to.extract.parameters.from.label=Method to extract parameters from:
method.to.extract.parameters.from.label=Method to extract parameters from
name.for.new.parameter.label=Name for new parameter:
method.selected.has.no.parameters=Method selected has no parameters.
introduced.parameter.class.command.name=Introduced parameter class {0} for {1}.{2}()
java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java
+2 -2
View File
@@ -92,8 +92,6 @@ class CopyClassDialog extends DialogWrapper{
JPanel panel = new JPanel(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
panel.setBorder(IdeBorderFactory.createRoundedBorder());
gbConstraints.insets = new Insets(4,8,4,8);
gbConstraints.weightx = 1;
gbConstraints.gridwidth = 2;
@@ -149,6 +147,8 @@ class CopyClassDialog extends DialogWrapper{
gbConstraints.fill = GridBagConstraints.NONE;
panel.add(myCbMoveToAnotherSourceFolder, gbConstraints);
panel.setPreferredSize(new Dimension(400, 120));
return panel;
}
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
+10 -9
View File
@@ -319,7 +319,7 @@ public String getAccessorsVisibility() {
leftBox.add(Box.createVerticalStrut(10));
leftBox.add(myCbUseAccessorsWhenAccessible);
JPanel leftPanel = new JPanel(new BorderLayout());
leftPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
leftPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
RefactoringBundle.message("encapsulate.fields.encapsulate.border.title")));
leftPanel.add(leftBox, BorderLayout.CENTER);
leftPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST);
@@ -343,7 +343,7 @@ public String getAccessorsVisibility() {
fieldsBox.add(myRbFieldProtected);
fieldsBox.add(myRbFieldAsIs);
JPanel fieldsVisibilityPanel = new JPanel(new BorderLayout());
fieldsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
fieldsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
RefactoringBundle.message("encapsulate.fields..encapsulated.fields.visibility.border.title")));
fieldsVisibilityPanel.add(fieldsBox, BorderLayout.CENTER);
fieldsVisibilityPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST);
@@ -354,7 +354,7 @@ public String getAccessorsVisibility() {
methodsBox.add(myRbAccessorPackageLocal);
methodsBox.add(myRbAccessorPrivate);
JPanel methodsVisibilityPanel = new JPanel(new BorderLayout());
methodsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
methodsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
RefactoringBundle.message("encapsulate.fields.accessors.visibility.border.title")));
methodsVisibilityPanel.add(methodsBox, BorderLayout.CENTER);
methodsVisibilityPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST);
@@ -395,11 +395,12 @@ public String getAccessorsVisibility() {
JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable);
// JLabel label = new JLabel("Fields to Encapsulate");
// CompTitledBorder titledBorder = new CompTitledBorder(label);
Border titledBorder = IdeBorderFactory.createTitledBorderBoldWithIndent(
RefactoringBundle.message("encapsulate.fields.fields.to.encapsulate.border.title"));
Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5);
Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder);
scrollPane.setBorder(border);
JPanel panel = new JPanel(new BorderLayout());
Border border = IdeBorderFactory.createTitledBorderSimpleWithoutIndent(
RefactoringBundle.message("encapsulate.fields.fields.to.encapsulate.border.title"));
panel.setBorder(border);
panel.add(scrollPane);
// make ESC and ENTER work when focus is in the table
myTable.registerKeyboardAction(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -450,7 +451,7 @@ public String getAccessorsVisibility() {
}
}
);
return scrollPane;
return panel;
}
public JComponent getPreferredFocusedComponent() {
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java
+1 -1
View File
@@ -188,7 +188,7 @@ public class ExtractMethodDialog extends AbstractExtractDialog {
final JPanel main = new JPanel(new BorderLayout());
final JPanel namePanel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 2, true, false));
final JLabel nameLabel = new JLabel();
nameLabel.setText(RefactoringBundle.message("name.prompt"));
nameLabel.setText(RefactoringBundle.message("changeSignature.name.prompt"));
namePanel.add(nameLabel);
namePanel.setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 0));
namePanel.add(myNameField);
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
+20 -44
View File
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.refactoring.extractMethodObject.ExtractMethodObjectDialog">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridBagLayout">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="35" y="92" width="509" height="321"/>
<xy x="35" y="92" width="544" height="389"/>
</constraints>
<properties/>
<border type="none"/>
@@ -10,22 +11,15 @@
<component id="8bb5" class="javax.swing.JRadioButton" binding="myCreateInnerClassRb">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="Create &amp;inner class"/>
</properties>
</component>
<hspacer id="305ec">
<grid id="9a27a" binding="myInnerClassPanel" layout-manager="GridLayoutManager" row-count="4" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
</hspacer>
<grid id="9a27a" binding="myInnerClassPanel" layout-manager="GridBagLayout">
<constraints>
<grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="5" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -33,7 +27,6 @@
<component id="b7087" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="5413c"/>
@@ -43,15 +36,13 @@
</component>
<component id="5413c" class="com.intellij.ui.EditorTextField" binding="myInnerClassName">
<constraints>
<grid row="0" column="1" row-span="1" col-span="5" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
<grid row="0" column="1" row-span="1" col-span="4" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="e9869" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="Visibility:"/>
@@ -59,8 +50,7 @@
</component>
<component id="af37c" class="javax.swing.JRadioButton" binding="myPrivateRadioButton">
<constraints>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="pri&amp;vate"/>
@@ -68,8 +58,7 @@
</component>
<component id="7d713" class="javax.swing.JRadioButton" binding="myProtectedRadioButton">
<constraints>
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="pr&amp;otected"/>
@@ -77,8 +66,7 @@
</component>
<component id="60e4f" class="javax.swing.JRadioButton" binding="myPackageLocalRadioButton">
<constraints>
<grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="pac&amp;kage local"/>
@@ -86,8 +74,7 @@
</component>
<component id="c4bba" class="javax.swing.JRadioButton" binding="myPublicRadioButton">
<constraints>
<grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="pu&amp;blic"/>
@@ -95,8 +82,7 @@
</component>
<component id="5494d" class="javax.swing.JCheckBox" binding="myCbMakeVarargs">
<constraints>
<grid row="2" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Make &amp;varargs"/>
@@ -104,8 +90,7 @@
</component>
<component id="a05bf" class="javax.swing.JCheckBox" binding="myCbMakeStatic">
<constraints>
<grid row="3" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="0" bottom="0" right="11" weightx="0.0" weighty="0.0"/>
<grid row="3" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Make &amp;static"/>
@@ -115,17 +100,16 @@
</grid>
<component id="2ffe3" class="javax.swing.JRadioButton" binding="myCreateAnonymousClassWrapperRb">
<constraints>
<grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="10" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Create &amp;anonymous class"/>
</properties>
</component>
<grid id="36cb" binding="myAnonymousClassPanel" layout-manager="GridBagLayout">
<grid id="36cb" binding="myAnonymousClassPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="3" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -133,7 +117,6 @@
<component id="d58f1" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="9dd26"/>
@@ -143,15 +126,13 @@
</component>
<component id="9dd26" class="com.intellij.ui.EditorTextField" binding="myMethodName">
<constraints>
<grid row="0" column="1" row-span="1" col-span="5" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="8f184" class="javax.swing.JCheckBox" binding="myCbMakeVarargsAnonymous">
<constraints>
<grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Make &amp;varargs"/>
@@ -161,8 +142,7 @@
</grid>
<scrollpane id="54db0" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="9" column="0" row-span="1" col-span="3" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="5" left="5" bottom="0" right="0" weightx="0.0" weighty="0.5"/>
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<minimumSize width="19" height="40"/>
@@ -180,7 +160,6 @@
<grid id="70155" binding="myParametersTableContainer" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.5"/>
</constraints>
<properties/>
<border type="none"/>
@@ -189,7 +168,6 @@
<component id="bec51" class="com.intellij.ui.TitledSeparator">
<constraints>
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="10" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="Signature preview"/>
@@ -198,7 +176,6 @@
<component id="9c206" class="javax.swing.JCheckBox" binding="myFoldCb" default-binding="true">
<constraints>
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="messages/RefactoringBundle" key="declare.folded.parameters"/>
@@ -207,7 +184,6 @@
<component id="6d7aa" class="com.intellij.ui.TitledSeparator">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="10" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="Parameters"/>
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
+1 -1
View File
@@ -231,7 +231,7 @@ public class InheritanceToDelegationDialog extends RefactoringDialog {
gbc.weighty = 1.0;
gbc.gridwidth = 1;
gbc.insets = new Insets(4, 8, 4, 4);
gbc.insets = new Insets(4, 0, 4, 4);
myMemberSelectionPanel = new MemberSelectionPanel(RefactoringBundle.message("delegate.members"), Collections.<MemberInfo>emptyList(), null);
panel.add(myMemberSelectionPanel, gbc);
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form
+49 -58
View File
@@ -1,44 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.refactoring.introduceparameterobject.IntroduceParameterObjectDialog">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridBagLayout">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
<xy x="20" y="20" width="420" height="416"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value=""/>
</clientProperties>
<border type="none"/>
<children>
<component id="d7646" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="com/intellij/refactoring/RefactorJBundle" key="method.to.extract.parameters.from.label"/>
</properties>
</component>
<hspacer id="f65e0">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
</hspacer>
<component id="85290" class="javax.swing.JTextField" binding="sourceMethodTextField">
<constraints>
<grid row="1" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<grid id="79318" layout-manager="GridBagLayout">
<constraints>
<grid row="6" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="10" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title="Parameter Class"/>
<children>
@@ -51,10 +30,11 @@
<text value="&amp;Create new class"/>
</properties>
</component>
<grid id="57543" binding="myCreateNewClassPanel" layout-manager="GridBagLayout">
<grid id="57543" binding="myCreateNewClassPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="1.0" weighty="0.0"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties/>
<border type="none"/>
@@ -62,7 +42,6 @@
<component id="24ffa" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="7b1e0"/>
@@ -74,14 +53,12 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="5e191" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Package name"/>
@@ -90,16 +67,16 @@
<component id="90bcb" class="com.intellij.ui.ReferenceEditorComboWithBrowseButton" binding="packageTextField" custom-create="true">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
</children>
</grid>
<grid id="37fbd" binding="myUseExistingPanel" layout-manager="GridBagLayout">
<grid id="37fbd" binding="myUseExistingPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="5" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="1.0" weighty="0.0"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
<border type="none"/>
@@ -107,7 +84,6 @@
<component id="1c851" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Name"/>
@@ -116,14 +92,12 @@
<component id="e03f" class="com.intellij.ui.ReferenceEditorComboWithBrowseButton" binding="existingClassField" custom-create="true">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="286f3" class="javax.swing.JCheckBox" binding="myGenerateAccessorsCheckBox" default-binding="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Generate accessors"/>
@@ -132,7 +106,6 @@
<component id="97fed" class="javax.swing.JCheckBox" binding="myEscalateVisibilityCheckBox" default-binding="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Escalate visibility"/>
@@ -149,10 +122,11 @@
<text value="Create &amp;inner class"/>
</properties>
</component>
<grid id="9a2f8" binding="myInnerClassPanel" layout-manager="GridBagLayout">
<grid id="9a2f8" binding="myInnerClassPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="3" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties/>
<border type="none"/>
@@ -160,7 +134,6 @@
<component id="4acb4" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="29549"/>
@@ -172,7 +145,6 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
@@ -189,27 +161,46 @@
</component>
</children>
</grid>
<grid id="783a4" binding="myParamsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="ab9f8" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="7" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="10" left="0" bottom="0" right="0" weightx="0.0" weighty="1.0"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="com/intellij/refactoring/RefactorJBundle" title-key="method.to.extract.parameters.from.label"/>
<children>
<component id="85290" class="javax.swing.JTextField" binding="sourceMethodTextField">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="400" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="f0f3" class="javax.swing.JCheckBox" binding="keepMethodAsDelegate">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Keep method as &amp;delegate"/>
</properties>
</component>
</children>
</grid>
<grid id="783a4" binding="myParamsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title="Parameters to Extract"/>
<children/>
</grid>
<component id="f0f3" class="javax.swing.JCheckBox" binding="keepMethodAsDelegate">
<constraints>
<grid row="2" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="Keep method as &amp;delegate"/>
</properties>
</component>
</children>
</grid>
</form>
java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java
-1
View File
@@ -126,7 +126,6 @@ public class MakeParameterizedStaticDialog extends AbstractMakeStaticDialog {
GridBagConstraints gbConstraints = new GridBagConstraints();
JPanel panel = new JPanel(new GridBagLayout());
panel.setBorder(IdeBorderFactory.createRoundedBorder());
gbConstraints.insets = new Insets(4, 8, 4, 8);
gbConstraints.weighty = 0;
java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java
-1
View File
@@ -75,7 +75,6 @@ public class SimpleMakeStaticDialog extends AbstractMakeStaticDialog {
GridBagConstraints gbConstraints = new GridBagConstraints();
JPanel panel = new JPanel(new GridBagLayout());
panel.setBorder(IdeBorderFactory.createRoundedBorder());
gbConstraints.insets = new Insets(4, 8, 4, 8);
gbConstraints.weighty = 1;
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+1 -4
View File
@@ -32,7 +32,6 @@ import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier;
import com.intellij.refactoring.util.classMembers.MemberInfo;
import com.intellij.refactoring.util.classMembers.MemberInfoStorage;
import com.intellij.refactoring.util.classMembers.UsesAndInterfacesDependencyMemberInfoModel;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.usageView.UsageViewUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -111,12 +110,10 @@ public class PullUpDialog extends RefactoringDialog {
protected JComponent createNorthPanel() {
JPanel panel = new JPanel();
panel.setBorder(IdeBorderFactory.createRoundedBorder());
panel.setLayout(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
gbConstraints.insets = new Insets(4, 8, 4, 8);
gbConstraints.insets = new Insets(4, 5, 4, 8);
gbConstraints.weighty = 1;
gbConstraints.weightx = 1;
gbConstraints.gridy = 0;
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class PushDownDialog extends RefactoringDialog {
JPanel panel = new JPanel(new GridBagLayout());
gbConstraints.insets = new Insets(4, 8, 4, 8);
gbConstraints.insets = new Insets(4, 5, 10, 8);
gbConstraints.weighty = 1;
gbConstraints.weightx = 1;
gbConstraints.gridy = 0;
java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class EditMigrationDialog extends DialogWrapper{
gbConstraints.weightx = 0;
gbConstraints.weighty = 1;
gbConstraints.gridwidth = GridBagConstraints.RELATIVE;
gbConstraints.anchor = GridBagConstraints.EAST;
gbConstraints.anchor = GridBagConstraints.NORTHEAST;
JLabel descriptionPromptLabel = new JLabel(RefactoringBundle.message("migration.map.description.label"));
panel.add(descriptionPromptLabel, gbConstraints);
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form
+2 -2
View File
@@ -2,10 +2,10 @@
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog">
<grid id="1a398" binding="myMainPanel" layout-manager="GridBagLayout">
<constraints>
<xy x="10" y="10" width="371" height="185"/>
<xy x="10" y="10" width="472" height="185"/>
</constraints>
<properties/>
<border type="line">
<border type="none">
<color color="-8355712"/>
</border>
<children>
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
-1
View File
@@ -141,7 +141,6 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends DialogWrapper {
@Nullable
protected JComponent createCenterPanel() {
myRootPanel.setBorder(IdeBorderFactory.createRoundedBorder());
return myRootPanel;
}
java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java
+8 -6
View File
@@ -25,6 +25,7 @@ import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.move.MoveInstanceMembersUtil;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.TitledSeparatorWithMnemonic;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
@@ -60,8 +61,8 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase {
protected JComponent createCenterPanel() {
JPanel mainPanel = new JPanel(new GridBagLayout());
final JLabel jLabel = new JLabel();
mainPanel.add(jLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0));
final TitledSeparatorWithMnemonic separator = new TitledSeparatorWithMnemonic();
mainPanel.add(separator, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,0,0,0), 0,0));
myList = createTargetVariableChooser();
myList.addListSelectionListener(new ListSelectionListener() {
@@ -70,7 +71,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase {
}
});
jLabel.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter"));
separator.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter"));
final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList);
mainPanel.add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0,0,0,0), 0,0));
@@ -83,7 +84,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase {
mainPanel.add(parametersPanel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,0,0,0), 0,0));
}
jLabel.setLabelFor(myList);
separator.setLabelFor(myList);
validateTextFields(myList.getSelectedIndex());
return mainPanel;
}
@@ -109,10 +110,10 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase {
myThisClassesMap = MoveInstanceMembersUtil.getThisClassesToMembers(myMethod);
myOldClassParameterNameFields = new HashMap<PsiClass, EditorTextField>();
if (myThisClassesMap.size() == 0) return null;
JPanel panel = new JPanel(new VerticalFlowLayout());
JPanel panel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0, true, true));
for (PsiClass aClass : myThisClassesMap.keySet()) {
final String text = RefactoringBundle.message("move.method.this.parameter.label", aClass.getName());
panel.add(new JLabel(text));
panel.add(new TitledSeparatorWithMnemonic(text, null));
String suggestedName = MoveInstanceMethodHandler.suggestParameterNameForThisClass(aClass);
final EditorTextField field = new EditorTextField(suggestedName, getProject(), StdFileTypes.JAVA);
@@ -120,6 +121,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase {
myOldClassParameterNameFields.put(aClass, field);
panel.add(field);
}
panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
return panel;
}
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java
+2 -4
View File
@@ -195,10 +195,8 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO
table.getSelectionModel().addSelectionInterval(0, 0);
}
JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table);
Border titledBorder = IdeBorderFactory.createTitledBorderBoldWithIndent(
RefactoringBundle.message("move.members.members.to.be.moved.border.title"));
Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5);
Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder);
Border border = IdeBorderFactory.createTitledBorderSimpleWithoutIndent(
RefactoringBundle.message("move.members.members.to.be.moved.border.title"));
scrollPane.setBorder(border);
scrollPane.setBackground(UIUtil.getPanelBackground());
panel.add(scrollPane, BorderLayout.CENTER);
java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java
-1
View File
@@ -80,7 +80,6 @@ public class TurnRefsToSuperDialog extends RefactoringDialog {
protected JComponent createNorthPanel() {
JPanel panel = new JPanel();
panel.setBorder(IdeBorderFactory.createRoundedBorder());
panel.setLayout(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java
-2
View File
@@ -86,8 +86,6 @@ public class TypeCookDialog extends RefactoringDialog {
JPanel optionsPanel = new JPanel(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
optionsPanel.setBorder(IdeBorderFactory.createRoundedBorder());
if (myCbDropCasts.isEnabled()) {
myCbDropCasts.setSelected(JavaRefactoringSettings.getInstance().TYPE_COOK_DROP_CASTS);
}
java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java
+3 -3
View File
@@ -26,12 +26,14 @@ package com.intellij.refactoring.ui;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.refactoring.util.classMembers.MemberInfo;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.TableUtil;
import com.intellij.ui.TitledBorderWithMnemonic;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -47,9 +49,7 @@ public class MemberSelectionPanel extends JPanel {
*/
public MemberSelectionPanel(String title, List<MemberInfo> memberInfo, String abstractColumnHeader) {
super();
TitledBorderWithMnemonic titledBorder = new TitledBorderWithMnemonic(appendTitledBorderMnemonic(title));
Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5);
Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder);
Border border = IdeBorderFactory.createTitledBorderSimpleWithoutIndent(title);
setBorder(border);
setLayout(new BorderLayout());
java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueForm.form
+21 -42
View File
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.refactoring.wrapreturnvalue.WrapReturnValueDialog">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridBagLayout">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
<xy x="20" y="20" width="404" height="321"/>
</constraints>
<properties/>
<border type="none"/>
@@ -10,37 +11,23 @@
<component id="d5d5b" class="javax.swing.JRadioButton" binding="createNewClassButton">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="15" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Create new class"/>
</properties>
</component>
<hspacer id="51711">
<constraints>
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
</hspacer>
<vspacer id="a9180">
<constraints>
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
</vspacer>
<component id="ca685" class="javax.swing.JRadioButton" binding="useExistingClassButton">
<constraints>
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="15" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Use existing class"/>
</properties>
</component>
<grid id="1eeb1" binding="myNewClassPanel" layout-manager="GridBagLayout">
<grid id="1eeb1" binding="myNewClassPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="1.0" weighty="0.0"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -48,7 +35,6 @@
<component id="448ca" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="6b071"/>
@@ -60,14 +46,12 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="b3fd9" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="5" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text value="&amp;Package name"/>
@@ -76,16 +60,15 @@
<component id="e72f1" class="com.intellij.refactoring.ui.PackageNameReferenceEditorCombo" binding="packageTextField" custom-create="true">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="5" left="0" bottom="0" right="0" weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
</children>
</grid>
<grid id="ab530" binding="myExistingClassPanel" layout-manager="GridBagLayout">
<grid id="ab530" binding="myExistingClassPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="7" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="1.0" weighty="0.0"/>
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -93,7 +76,6 @@
<component id="b1384" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="4d2b9"/>
@@ -103,21 +85,18 @@
<component id="17eb8" class="com.intellij.ui.ReferenceEditorComboWithBrowseButton" binding="existingClassField" custom-create="true">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="4d2b9" class="javax.swing.JComboBox" binding="myFieldsCombo">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="5" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="cc9af" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="5" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="4d2b9"/>
@@ -128,17 +107,15 @@
</grid>
<component id="1f02" class="javax.swing.JTextField" binding="sourceMethodTextField">
<constraints>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="400" height="-1"/>
</grid>
<gridbag top="0" left="5" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="a8a80" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="5" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="com/intellij/refactoring/RefactorJBundle" key="method.to.wrap.returns.from.label"/>
@@ -146,17 +123,16 @@
</component>
<component id="809b1" class="javax.swing.JRadioButton" binding="myCreateInnerClassButton" default-binding="true">
<constraints>
<grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="15" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Create &amp;inner class"/>
</properties>
</component>
<grid id="69b5" binding="myCreateInnerPanel" layout-manager="GridBagLayout">
<grid id="69b5" binding="myCreateInnerPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="20" bottom="0" right="0"/>
<constraints>
<grid row="5" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -164,7 +140,6 @@
<component id="b32c5" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<labelFor value="3bee"/>
@@ -176,12 +151,16 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
</children>
</grid>
<vspacer id="dc661">
<constraints>
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>
platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.form
+7 -12
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.application.options.editor.CodeFoldingConfigurable">
<grid id="27dc6" binding="myRootPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myRootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="4" left="4" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
@@ -24,23 +24,18 @@
</hspacer>
<vspacer id="ca665">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="d9211" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ApplicationBundle" key="label.collapse.by.default"/>
</properties>
</component>
<grid id="60632" binding="myFoldingPanel" layout-manager="GridBagLayout">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="1" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/ApplicationBundle" title-key="label.collapse.by.default"/>
<children/>
</grid>
</children>
platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class CodeFoldingConfigurable extends CompositeConfigurable<CodeFoldingOp
for (CodeFoldingOptionsProvider provider : getConfigurables()) {
myFoldingPanel
.add(provider.createComponent(), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0, 0, GridBagConstraints.NORTHWEST,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
GridBagConstraints.NONE, new Insets(5, 0, 7, 0), 0, 0));
}
return myRootPanel;
}
platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class EditorAppearanceConfigurable extends CompositeConfigurable<UnnamedC
public JComponent createComponent() {
for (UnnamedConfigurable provider : getConfigurables()) {
myAddonPanel.add(provider.createComponent(), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0, 0, GridBagConstraints.NORTHWEST,
GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0));
GridBagConstraints.NONE, new Insets(5,0,7,0), 0,0));
}
return myRootPanel;
}
platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
+11 -21
View File
@@ -2,12 +2,12 @@
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.application.options.editor.EditorOptionsPanel">
<tabbedpane id="97a1e">
<constraints>
<xy x="22" y="49" width="764" height="650"/>
<xy x="22" y="49" width="750" height="634"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="b689b" binding="myBehaviourPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="b689b" binding="myBehaviourPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title-resource-bundle="messages/ApplicationBundle" title-key="tab.editor.settings.behavior"/>
@@ -18,7 +18,7 @@
<grid id="efa8e" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="2" col-span="2" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -26,7 +26,7 @@
<grid id="8dc1a" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -169,9 +169,7 @@
<grid id="54c3d" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="215" height="26"/>
</grid>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -208,9 +206,7 @@
<grid id="dcf48" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="334" height="106"/>
</grid>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -248,9 +244,7 @@
<grid id="7fdc1" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="334" height="75"/>
</grid>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -323,9 +317,7 @@
<grid id="7f3f5" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="10" bottom="0" right="0"/>
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="334" height="80"/>
</grid>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -374,7 +366,7 @@
<grid id="358be" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -402,9 +394,7 @@
</grid>
<component id="c0a29" class="javax.swing.JCheckBox" binding="myCbRenameLocalVariablesInplace">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="248" height="22"/>
</grid>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ApplicationBundle" key="checkbox.rename.local.variables.inplace"/>
@@ -413,7 +403,7 @@
<grid id="5df80" binding="myHighlightSettingsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="3" column="1" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="3" column="1" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form
+3 -3
View File
@@ -22,7 +22,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/CodeInsightBundle" title-key="powered.by"/>
<children/>
@@ -40,7 +40,7 @@
<alignmentY value="0.2"/>
</properties>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/CodeInsightBundle" title-key="dialog.intention.settings.description.panel.title"/>
<children>
@@ -69,7 +69,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/CodeInsightBundle" title-key="dialog.intention.settings.description.usage.example.title"/>
<children>
platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditTemplateDialog.java
+3 -3
View File
@@ -125,7 +125,7 @@ public class EditTemplateDialog extends DialogWrapper {
gbConstraints.gridx = 0;
JPanel panel1 = new JPanel();
panel1.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
panel1.setBorder(IdeBorderFactory.createTitledBorderSimpleWithoutIndent(
CodeInsightBundle.message("dialog.edit.template.template.text.title")));
panel1.setPreferredSize(new Dimension(500, 160));
panel1.setMinimumSize(new Dimension(500, 160));
@@ -231,7 +231,7 @@ public class EditTemplateDialog extends DialogWrapper {
private JPanel createTemplateOptionsPanel() {
JPanel panel = new JPanel();
panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(CodeInsightBundle.message("dialog.edit.template.options.title")));
panel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(CodeInsightBundle.message("dialog.edit.template.options.title")));
panel.setLayout(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
gbConstraints.fill = GridBagConstraints.BOTH;
@@ -282,7 +282,7 @@ public class EditTemplateDialog extends DialogWrapper {
};
JPanel panel = new JPanel();
panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(CodeInsightBundle.message("dialog.edit.template.context.title")));
panel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(CodeInsightBundle.message("dialog.edit.template.context.title")));
panel.setLayout(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
gbConstraints.fill = GridBagConstraints.BOTH;
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form
+4 -1
View File
@@ -11,9 +11,12 @@
<grid id="e903" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/InspectionsBundle" title-key="inspection.action.profile.label"/>
<children>
<component id="aba18" class="com.intellij.ui.ComboboxWithBrowseButton" binding="myBrowseProfilesCombo">
platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
+6 -6
View File
@@ -401,7 +401,7 @@ class FindDialog extends DialogWrapper {
private JComponent createFilterPanel() {
JPanel filterPanel = new JPanel();
filterPanel.setLayout(new BorderLayout());
filterPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.filter.file.name.group")));
filterPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.filter.file.name.group")));
myFileFilter = new ComboBox(100);
initCombobox(myFileFilter);
@@ -577,7 +577,7 @@ class FindDialog extends DialogWrapper {
private JPanel createFindOptionsPanel() {
JPanel findOptionsPanel = new JPanel();
findOptionsPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.options.group")));
findOptionsPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.options.group")));
findOptionsPanel.setLayout(new BoxLayout(findOptionsPanel, BoxLayout.Y_AXIS));
myCbCaseSensitive = createCheckbox(FindBundle.message("find.options.case.sensitive"));
@@ -697,7 +697,7 @@ class FindDialog extends DialogWrapper {
private JPanel createDirectionPanel() {
JPanel directionPanel = new JPanel();
directionPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.direction.group")));
directionPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.direction.group")));
directionPanel.setLayout(new BoxLayout(directionPanel, BoxLayout.Y_AXIS));
myRbForward = new JRadioButton(FindBundle.message("find.direction.forward.radio"), true);
@@ -714,7 +714,7 @@ class FindDialog extends DialogWrapper {
private JComponent createGlobalScopePanel() {
JPanel scopePanel = new JPanel();
scopePanel.setLayout(new GridBagLayout());
scopePanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.scope.group")));
scopePanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.scope.group")));
GridBagConstraints gbConstraints = new GridBagConstraints();
gbConstraints.fill = GridBagConstraints.HORIZONTAL;
gbConstraints.gridx = 0;
@@ -881,7 +881,7 @@ class FindDialog extends DialogWrapper {
private JPanel createScopePanel() {
JPanel scopePanel = new JPanel();
scopePanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.scope.group")));
scopePanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.scope.group")));
scopePanel.setLayout(new BoxLayout(scopePanel, BoxLayout.Y_AXIS));
myRbGlobal = new JRadioButton(FindBundle.message("find.scope.global.radio"), true);
@@ -905,7 +905,7 @@ class FindDialog extends DialogWrapper {
private JPanel createOriginPanel() {
JPanel originPanel = new JPanel();
originPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.origin.group")));
originPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.origin.group")));
originPanel.setLayout(new BoxLayout(originPanel, BoxLayout.Y_AXIS));
myRbFromCursor = new JRadioButton(FindBundle.message("find.origin.from.cursor.radio"), true);
platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java
+1 -1
View File
@@ -127,7 +127,7 @@ class FilterDialog extends DialogWrapper {
new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 0), 0, 0));
JPanel patternsPanel = new JPanel(new GridBagLayout());
Border border = IdeBorderFactory.createTitledBorderBoldWithIndent(IdeBundle.message("group.todo.filter.patterns"));
Border border = IdeBorderFactory.createTitledBorderSimpleWithIndent(IdeBundle.message("group.todo.filter.patterns"));
patternsPanel.setBorder(border);
myTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable);
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form
+1 -1
View File
@@ -27,7 +27,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/IdeBundle" title-key="editbox.ignore.files.and.folders"/>
<children>
platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form
+5 -14
View File
@@ -26,9 +26,6 @@
<columns value="10"/>
<horizontalAlignment value="2"/>
</properties>
<clientProperties>
<caretAspectRatio class="java.lang.Float" value="0.04"/>
</clientProperties>
</component>
<component id="e8f16" class="javax.swing.JLabel">
<constraints>
@@ -46,10 +43,10 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="1" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/RefactoringBundle" title-key="refactoring.extract.method.dialog.parameters"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
</clientProperties>
<children>
<component id="d4ee9" class="com.intellij.refactoring.extractMethod.AbstractParameterTablePanel" binding="myParametersPanel" custom-create="true">
<constraints>
@@ -59,7 +56,7 @@
</component>
</children>
</grid>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="b0a7b">
<scrollpane id="b0a7b" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="1" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
@@ -75,9 +72,6 @@
<rows value="0"/>
<text value="def foo()"/>
</properties>
<clientProperties>
<caretAspectRatio class="java.lang.Float" value="0.04"/>
</clientProperties>
</component>
</children>
</scrollpane>
@@ -89,7 +83,7 @@
<text resource-bundle="messages/RefactoringBundle" key="refactoring.extract.method.dialog.signature.preview"/>
</properties>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="ca3f5">
<scrollpane id="ca3f5" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="1" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
@@ -101,9 +95,6 @@
<properties>
<editable value="false"/>
</properties>
<clientProperties>
<caretAspectRatio class="java.lang.Float" value="0.04"/>
</clientProperties>
</component>
</children>
</scrollpane>
platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class DocCommentPanel extends JPanel {
public DocCommentPanel(String title) {
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
myBorder = IdeBorderFactory.createTitledBorderBoldWithIndent(title);
myBorder = IdeBorderFactory.createTitledBorderSimpleWithIndent(title);
this.setBorder(myBorder);
myRbJavaDocAsIs = new JRadioButton();
platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeOptionsPanel.form
+1 -1
View File
@@ -15,7 +15,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title="Remembering passwords"/>
<children>
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form
+5 -5
View File
@@ -39,7 +39,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/IdeBundle" title-key="group.vendor"/>
<children>
@@ -119,7 +119,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/IdeBundle" title-key="editbox.plugin.description"/>
<children>
@@ -152,7 +152,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/IdeBundle" title-key="editbox.plugin.change.notes"/>
<children>
@@ -199,7 +199,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/IdeBundle" title-key="label.plugin.home.page"/>
<children>
@@ -222,7 +222,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/IdeBundle" title-key="plugin.version.label"/>
<children>
platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.internal.statistic.configurable.StatisticsConfigurationComponent">
<grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>
<xy x="20" y="20" width="511" height="117"/>
<xy x="20" y="20" width="648" height="125"/>
</constraints>
<properties/>
<border type="none"/>
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java
+5 -5
View File
@@ -76,20 +76,20 @@ public class KeyboardShortcutDialog extends DialogWrapper {
myFirstStrokePanel = new StrokePanel(KeyMapBundle.message("first.stroke.panel.title"));
panel.add(
myFirstStrokePanel,
new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,5,0),0,0)
new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0)
);
// Second stroke panel
panel.add(
myEnableSecondKeystroke,
new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE,new Insets(0,0,5,0),0,0)
new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE,new Insets(0,0,0,0),0,0)
);
mySecondStrokePanel = new StrokePanel(KeyMapBundle.message("second.stroke.panel.title"));
panel.add(
mySecondStrokePanel,
new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,5,0),0,0)
new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,20,0,0),0,0)
);
// Shortcut preview
@@ -104,7 +104,7 @@ public class KeyboardShortcutDialog extends DialogWrapper {
previewPanel.add(myKeystrokePreview);
panel.add(
previewPanel,
new GridBagConstraints(0,3,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,5,0),0,0)
new GridBagConstraints(0,3,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0)
);
// Conflicts
@@ -248,7 +248,7 @@ public class KeyboardShortcutDialog extends DialogWrapper {
setLayout(new BorderLayout());
setBorder(
BorderFactory.createCompoundBorder(
IdeBorderFactory.createTitledBorderBoldWithIndent(borderText),
IdeBorderFactory.createTitledBorderSimpleWithIndent(borderText),
BorderFactory.createEmptyBorder(5,5,5,5)
)
);
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
+5 -5
View File
@@ -227,15 +227,15 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable {
private JPanel createShortcutsPanel() {
JPanel panel = new JPanel(new GridBagLayout());
JLabel currentKeysLabel = new JLabel(KeyMapBundle.message("shortcuts.keymap.label"));
panel.add(currentKeysLabel, new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE, new Insets(0, 0, 0, 8), 0, 0));
myShortcutsList = new JBList(new DefaultListModel());
myShortcutsList.getEmptyText().setText(KeyMapBundle.message("shortcuts.keymap.no.shortcuts"));
myShortcutsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
myShortcutsList.setCellRenderer(new ShortcutListRenderer());
currentKeysLabel.setLabelFor(myShortcutsList);
JComponent separator = SeparatorFactory.createSeparator(KeyMapBundle.message("shortcuts.keymap.label"), myShortcutsList);
panel.add(separator, new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 8), 0, 0));
JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myShortcutsList);
scrollPane.setPreferredSize(new Dimension(160, 200));
panel.add(scrollPane, new GridBagConstraints(1,1,1,1,1,1,GridBagConstraints.WEST,GridBagConstraints.BOTH, new Insets(0, 0, 0, 2), 0, 0));
@@ -465,7 +465,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable {
return new Dimension(300, -1);
}
};
panel.add(new JLabel(KeyMapBundle.message("action.description.ide.border.factory.title")), BorderLayout.NORTH);
panel.add(SeparatorFactory.createSeparator(KeyMapBundle.message("action.description.ide.border.factory.title"), null), BorderLayout.NORTH);
myDescription = new JEditorPane(UIUtil.HTML_MIME, "<html><body></body></html>");
myDescription.setEditable(false);
panel.add(ScrollPaneFactory.createScrollPane(myDescription), BorderLayout.CENTER);
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java
+5 -5
View File
@@ -124,11 +124,11 @@ class MouseShortcutDialog extends DialogWrapper{
// Single/Double click
JPanel clickCountPanel=new JPanel(new GridBagLayout());
clickCountPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
clickCountPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
KeyMapBundle.message("mouse.shortcut.dialog.click.count.border")));
panel.add(
clickCountPanel,
new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,4,0),0,0)
new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0)
);
clickCountPanel.add(
myRbSingleClick,
@@ -154,7 +154,7 @@ class MouseShortcutDialog extends DialogWrapper{
clickPadPanel,
new GridBagConstraints(0,1,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,0,4,0),0,0)
);
clickPadPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
clickPadPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
KeyMapBundle.message("mouse.shortcut.dialog.click.pad.border")));
myClickPad.setPreferredSize(new Dimension(260,60));
clickPadPanel.add(myClickPad,BorderLayout.CENTER);
@@ -162,7 +162,7 @@ class MouseShortcutDialog extends DialogWrapper{
// Shortcut preview
JPanel previewPanel=new JPanel(new GridBagLayout());
previewPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
previewPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
KeyMapBundle.message("mouse.shortcut.dialog.shortcut.preview.border")));
panel.add(
previewPanel,
@@ -176,7 +176,7 @@ class MouseShortcutDialog extends DialogWrapper{
// Conflicts panel
JPanel conflictsPanel=new JPanel(new GridBagLayout());
conflictsPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
conflictsPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(
KeyMapBundle.message("mouse.shortcut.dialog.conflicts.border")));
panel.add(
conflictsPanel,
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
+3 -3
View File
@@ -140,10 +140,10 @@
<grid row="3" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/IdeBundle" title-key="update.plugin.hosts.title"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
</clientProperties>
<children>
<scrollpane id="af53b" class="com.intellij.ui.components.JBScrollPane">
<constraints>
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+1 -1
View File
@@ -343,7 +343,7 @@ checkbox.collapse.method.bodies=Method bodies
checkbox.collapse.javadoc.comments=Documentation comments
checkbox.collapse.title.imports=Imports
checkbox.collapse.file.header=File header
label.collapse.by.default=Collapse by default:
label.collapse.by.default=Collapse by default
checkbox.show.code.folding.outline=Show code folding outline
group.tab.appearance=Tab Appearance
editbox.tab.limit=Tab limit:
platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+1 -1
View File
@@ -418,7 +418,7 @@ intention.intercept.ejb.method.or.class.class.text=Add interceptor for EJB class
intention.intercept.ejb.method.or.class.method.text=Add interceptor for business method ''{0}''
intention.edit.interceptor.binding.family=Interceptor Bindings
intention.edit.interceptor.binding.text=Edit Interceptor ''{0}'' bindings
powered.by=Powered by:
powered.by=Powered by
powered.by.plugin=''{0}'' plugin.
error.cannot.convert.default.message=Invalid value: ''{0}''
error.cannot.resolve.default.message=Cannot resolve symbol ''{0}''
platform/platform-resources-en/src/messages/IdeBundle.properties
+6 -6
View File
@@ -518,9 +518,9 @@ progress.connecting.to.plugin.manager=Connecting to {0}
label.plugin.vendor.email=E-mail:
label.plugin.vendor.name=Name:
label.plugin.vendor.home.page=Home page:
editbox.plugin.description=Description:
editbox.plugin.change.notes=Change notes:
label.plugin.home.page=Plugin home page:
editbox.plugin.description=Description
editbox.plugin.change.notes=Change notes
label.plugin.home.page=Plugin home page
action.move.module.to.this.group=To this group
action.move.module.outside.any.group=Outside any group
message.move.modules.to.group=Move {0} to the group {1}
@@ -595,12 +595,12 @@ title.edit.todo.pattern=Edit Pattern
title.todo=TODO
title.add.todo.pattern=Add Pattern
button.edit=&Edit...
label.todo.filters=Filters:
label.todo.filters=Filters
button.add.d=A&dd...
title.add.todo.filter=Add Filter
button.edit.t=Edi&t...
button.remove.m=Re&move
label.todo.patterns=Patterns:
label.todo.patterns=Patterns
text.todo.no.patterns=No patterns configured
text.todo.no.filters=No filters configured
node.todo.group={0} ({1} {1,choice,1#item|2#items} in {2} {2,choice,1#file|2#files})
@@ -933,7 +933,7 @@ scope.banner.text=Scope ''{0}''
prompt.please.select.module.jdk=Please select {0} to be set for this module
scopes.save.dialog.title.shared=Save as shared scope
scopes.save.dialog.title.local=Save as local scope
plugin.version.label=Version:
plugin.version.label=Version
plugin.size.label=Size:
plugin.status.available=Available
detach.library.from.module=Detach library ''{0}'' from module ''{1}''?\nNo file on disk will be hurt.
platform/platform-resources-en/src/messages/KeyMapBundle.properties
+2 -2
View File
@@ -31,14 +31,14 @@ first.stroke.panel.title=First Stroke
second.stroke.panel.title=Second Stroke
shortcut.preview.ide.border.factory.title=Shortcut Preview
conflicts.ide.border.factory.title=Conflicts
action.description.ide.border.factory.title=Action Description:
action.description.ide.border.factory.title=Action Description
keymaps.border.factory.title=Keymaps
quick.lists.ide.border.factory.title=Quick lists
no.conflict.info.message=No conflicts
assigned.to.info.message=Assigned to {0}
keymap.display.name=Keymap
based.on.keymap.label=Based on keymap: {0}
shortcuts.keymap.label=Shortc&uts:
shortcuts.keymap.label=Shortc&uts
shortcuts.keymap.no.shortcuts=No shortcuts
add.keymap.label=A&dd
remove.keymap.label=Remo&ve
platform/platform-resources-en/src/messages/RefactoringBundle.properties
+1 -2
View File
@@ -46,7 +46,6 @@ changeSignature.propagate.parameters.title=Propa&gate Parameters...
changeSignature.propagate.exceptions.title=Propagate E&xceptions...
changeSignature.parameter.caller.chooser=Select Methods To Propagate New Parameters
changeSignature.exception.caller.chooser=Select Methods To Propagate New Exceptions
name.prompt=&Name:
changeSignature.return.type.prompt=Return &type
changeSignature.name.prompt=&Name
signature.preview.border.title=Signature Preview
@@ -71,7 +70,7 @@ visibility.private=Pri&vate
visibility.package.local=Pac&kage local
visibility.border.title=Visibility
visibility.combo.title=&Visibility
moveInstanceMethod.select.an.instance.parameter=Select an &instance parameter:
moveInstanceMethod.select.an.instance.parameter=Select an &instance parameter
destination.package=&Destination package:
choose.destination.package=Choose Destination Package
interface.name.prompt=&Interface name:
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueLinkConfigurationDialog.form
+48 -38
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.vcs.configurable.IssueLinkConfigurationDialog">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
@@ -8,48 +8,14 @@
<properties/>
<border type="none"/>
<children>
<component id="e6d94" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="c0b2d"/>
<text value="Issue ID (regular expression):"/>
</properties>
</component>
<vspacer id="ab691">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="c5953" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="aa9b9"/>
<text value="Issue link (replacement expression):"/>
</properties>
</component>
<component id="c0b2d" class="javax.swing.JTextField" binding="myIssueIDTextField">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="aa9b9" class="javax.swing.JTextField" binding="myIssueLinkTextField">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="1e94" class="javax.swing.JLabel" binding="myErrorLabel">
<constraints>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<foreground awt-color="red"/>
@@ -59,7 +25,7 @@
<grid id="f439d" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -105,6 +71,50 @@
</component>
</children>
</grid>
<grid id="d4df3" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="5" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="e6d94" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="c0b2d"/>
<text value="Issue ID (regular expression):"/>
</properties>
</component>
<component id="c5953" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="aa9b9"/>
<text value="Issue link (replacement expression):"/>
</properties>
</component>
<component id="c0b2d" class="javax.swing.JTextField" binding="myIssueIDTextField">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="aa9b9" class="javax.swing.JTextField" binding="myIssueLinkTextField">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
</children>
</grid>
</children>
</grid>
</form>
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form
+108 -123
View File
@@ -3,7 +3,7 @@
<grid id="7e224" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="7" y="16" width="868" height="558"/>
<xy x="7" y="16" width="324" height="385"/>
</constraints>
<properties/>
<border type="none"/>
@@ -11,173 +11,158 @@
<grid id="e714c" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="42f34" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="d038a" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="background.operations.title">
<font/>
</border>
<children>
<grid id="d038a" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<component id="5b88e" class="javax.swing.JCheckBox" binding="myCbUpdateInBackground">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.update.from.vcs.in.background"/>
</properties>
</component>
<component id="1b39b" class="javax.swing.JCheckBox" binding="myCbCommitInBackground">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.commit.in.bacground"/>
</properties>
</component>
<component id="45c51" class="javax.swing.JCheckBox" binding="myCbEditInBackground">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.edit.in.background"/>
</properties>
</component>
<component id="a39f0" class="javax.swing.JCheckBox" binding="myCbAddRemoveInBackground">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.add.remove.in.background"/>
</properties>
</component>
<component id="8c7af" class="javax.swing.JCheckBox" binding="myCbCheckoutInBackground">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Perform checkout from VCS in background"/>
</properties>
</component>
<component id="cc6d4" class="javax.swing.JCheckBox" binding="myPerformRevertInBackgroundCheckBox" default-binding="true">
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.rollback.in.background.option"/>
</properties>
</component>
</children>
</grid>
<grid id="d20ff" binding="myBackgroundProcesses" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="options.background.processes.title"/>
<children>
<component id="de949" class="javax.swing.JCheckBox" binding="myEnableBackgroundProcesses">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="options.background.processes.enable"/>
</properties>
</component>
<grid id="edb40" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="background.operations.title">
<font/>
</border>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="cache.settings.dialog.title"/>
<children>
<component id="5b88e" class="javax.swing.JCheckBox" binding="myCbUpdateInBackground">
<component id="f7b04" class="javax.swing.JComponent" binding="myCachePanel" custom-create="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.update.from.vcs.in.background"/>
</properties>
</component>
<component id="1b39b" class="javax.swing.JCheckBox" binding="myCbCommitInBackground">
<hspacer id="8e704">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.commit.in.bacground"/>
</properties>
</component>
<component id="45c51" class="javax.swing.JCheckBox" binding="myCbEditInBackground">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.edit.in.background"/>
</properties>
</component>
<component id="a39f0" class="javax.swing.JCheckBox" binding="myCbAddRemoveInBackground">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.add.remove.in.background"/>
</properties>
</component>
<component id="8c7af" class="javax.swing.JCheckBox" binding="myCbCheckoutInBackground">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Perform checkout from VCS in background"/>
</properties>
</component>
<component id="cc6d4" class="javax.swing.JCheckBox" binding="myPerformRevertInBackgroundCheckBox" default-binding="true">
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="perform.rollback.in.background.option"/>
</properties>
</component>
</hspacer>
</children>
</grid>
<grid id="d20ff" binding="myBackgroundProcesses" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="9c106" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="options.background.processes.title"/>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="options.check.changed.on.server.title"/>
<children>
<component id="de949" class="javax.swing.JCheckBox" binding="myEnableBackgroundProcesses">
<component id="9e0bc" class="javax.swing.JCheckBox" binding="myTrackChangedOnServer">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="options.background.processes.enable"/>
<text resource-bundle="messages/VcsBundle" key="vcs.config.track.changed.on.server"/>
</properties>
</component>
<grid id="edb40" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<hspacer id="899ad">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<component id="6b1ed" class="javax.swing.JSpinner" binding="myChangedOnServerInterval">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="cache.settings.dialog.title"/>
<children>
<component id="f7b04" class="javax.swing.JComponent" binding="myCachePanel" custom-create="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
</component>
<hspacer id="8e704">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
</children>
</grid>
<grid id="9c106" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
</component>
<component id="765cd" class="javax.swing.JLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/VcsBundle" title-key="options.check.changed.on.server.title"/>
<children>
<component id="9e0bc" class="javax.swing.JCheckBox" binding="myTrackChangedOnServer">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="vcs.config.track.changed.on.server"/>
</properties>
</component>
<hspacer id="899ad">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<component id="6b1ed" class="javax.swing.JSpinner" binding="myChangedOnServerInterval">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="765cd" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="minutes"/>
</properties>
</component>
</children>
</grid>
<properties>
<text value="minutes"/>
</properties>
</component>
</children>
</grid>
</children>
</grid>
<vspacer id="ca331">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</children>
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form
+11 -21
View File
@@ -1,32 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.cvsSupport2.config.ui.CvsConfigurationPanel">
<grid id="4429e" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="4429e" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="35" y="22" width="470" height="325"/>
<xy x="35" y="22" width="470" height="341"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="a9d61" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="bfbd0" class="javax.swing.JButton" binding="myConfigureGlobalButton">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="button.text.global.settings"/>
</properties>
</component>
</children>
</grid>
<grid id="9df1d" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="9df1d" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
@@ -137,6 +119,14 @@
</grid>
</children>
</grid>
<component id="bfbd0" class="javax.swing.JButton" binding="myConfigureGlobalButton">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="button.text.global.settings"/>
</properties>
</component>
</children>
</grid>
</children>
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.form
+18 -14
View File
@@ -61,7 +61,7 @@
<grid id="408c" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -69,6 +69,23 @@
</clientProperties>
<border type="none" title="Artifactory or Nexus Service URLs:"/>
<children>
<scrollpane id="3bdae" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="4" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="406" height="128"/>
</grid>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="652af" class="com.intellij.ui.components.JBList" binding="myServiceList">
<constraints/>
<properties>
<layoutOrientation value="0"/>
</properties>
</component>
</children>
</scrollpane>
<grid id="b0065" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
@@ -117,19 +134,6 @@
</component>
</children>
</grid>
<scrollpane id="3bdae" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="652af" class="com.intellij.ui.components.JBList" binding="myServiceList">
<constraints/>
<properties/>
</component>
</children>
</scrollpane>
</children>
</grid>
</children>
plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
+4 -4
View File
@@ -87,7 +87,7 @@
<grid id="5ec35" binding="panelForDictionaryChooser" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -95,7 +95,7 @@
</grid>
<component id="a371c" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<font size="10"/>
@@ -119,7 +119,7 @@
<grid id="607a1" binding="panelForFolderChooser" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -127,7 +127,7 @@
</grid>
<component id="be7e9" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<font size="10"/>