IDEA-80510
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 30 Jan 2012 13:53:15 +0000 (17:53 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 30 Jan 2012 13:53:15 +0000 (17:53 +0400)
plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BeanStep.form
plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BeanStep.java
plugins/ui-designer/src/messages/UIDesignerBundle.properties

index ba53947f26c675bad40642137dc0173a4bc3114f..e2167c3b53d4a177ba29bdc8d72df38280353bc0 100644 (file)
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.uiDesigner.wizard.BeanStep">
-  <grid id="2ea7d" binding="myComponent" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="2ea7d" binding="myComponent" layout-manager="GridLayoutManager" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="120" y="88" width="383" height="210"/>
-      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0"/>
+      <xy x="120" y="88" width="450" height="210"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <component id="bdf40" class="javax.swing.JRadioButton" binding="myRbBindToNewBean">
         <constraints>
-          <xy x="2" y="2" width="110" height="22"/>
-          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0"/>
+          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/UIDesignerBundle" key="radio.create.new.bean"/>
       </component>
       <component id="d00f2" class="javax.swing.JLabel">
         <constraints>
-          <xy x="22" y="32" width="33" height="14"/>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0"/>
+          <grid row="1" column="1" 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="9326f"/>
           <text resource-bundle="messages/UIDesignerBundle" key="editbox.class"/>
         </properties>
       </component>
       <component id="9326f" class="javax.swing.JTextField" binding="myTfShortClassName">
         <constraints>
-          <xy x="80" y="29" width="301" height="20"/>
-          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0"/>
+          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <columns value="25"/>
         </properties>
       </component>
-      <component id="370ca" class="javax.swing.JLabel">
+      <component id="370ca" class="javax.swing.JLabel" binding="myPackageLabel">
         <constraints>
-          <xy x="22" y="57" width="48" height="14"/>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0"/>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <inheritsPopupMenu value="true"/>
       </component>
       <hspacer id="c7908">
         <constraints>
-          <xy x="2" y="33" width="20" height="11"/>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="0" anchor="0" fill="1" indent="0">
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="20" height="-1"/>
           </grid>
         </constraints>
       </hspacer>
       <hspacer id="50aef">
         <constraints>
-          <xy x="2" y="130" width="20" height="11"/>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="0" anchor="0" fill="1" indent="0"/>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
       <component id="412f8" class="javax.swing.JRadioButton" binding="myRbBindToExistingBean">
         <constraints>
-          <xy x="2" y="99" width="127" height="22"/>
-          <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0"/>
+          <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/UIDesignerBundle" key="radio.bind.to.existing.bean"/>
         </properties>
       </component>
-      <component id="cc4af" class="javax.swing.JLabel">
+      <component id="cc4af" class="javax.swing.JLabel" binding="myExistClassLabel">
         <constraints>
-          <xy x="22" y="129" width="33" height="14"/>
-          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0"/>
+          <grid row="5" column="1" 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/UIDesignerBundle" key="editbox.class.2"/>
       </component>
       <component id="9b7be" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myTfWitgBtnChooseClass">
         <constraints>
-          <xy x="80" y="126" width="301" height="20"/>
-          <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0"/>
+          <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
       <vspacer id="3b24c">
         <constraints>
-          <xy x="40" y="146" width="11" height="62"/>
-          <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0"/>
+          <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <vspacer id="6822f">
         <constraints>
-          <xy x="40" y="79" width="11" height="20"/>
-          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0">
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
             <preferred-size width="-1" height="20"/>
           </grid>
         </constraints>
       </vspacer>
       <component id="45bb6" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myTfWithBtnChoosePackage">
         <constraints>
-          <xy x="80" y="54" width="301" height="20"/>
-          <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0"/>
+          <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
index 22922f454dd7b7a99347a204b6ad1ffc241125e0..9d093818b78ddcc29f357e8aa9ff250f55718630 100644 (file)
@@ -48,11 +48,16 @@ final class BeanStep extends StepAdapter{
   private JRadioButton myRbBindToExistingBean;
   JTextField myTfShortClassName;
   private TextFieldWithBrowseButton myTfWithBtnChoosePackage;
+  private JLabel myPackageLabel;
+  private JLabel myExistClassLabel;
   private final WizardData myData;
 
   public BeanStep(@NotNull final WizardData data) {
     myData = data;
 
+    myPackageLabel.setLabelFor(myTfWithBtnChoosePackage.getTextField());
+    myExistClassLabel.setLabelFor(myTfWitgBtnChooseClass.getTextField());
+
     final ItemListener itemListener = new ItemListener() {
       public void itemStateChanged(final ItemEvent e) {
         final boolean state = myRbBindToNewBean.isSelected();
index cd0ead7837a80ddbfea6d525fc1fd3e336392d2d..883a27e82812f8f6bc8a48f5d7ed7643091f397c 100644 (file)
@@ -179,7 +179,7 @@ error.cannot.create.field.reason=Cannot create field ''{0}''.\nReason: {1}
 tooltip.press.accelerator=Click or press {0}
 property.not.defined=<not defined>
 editbox.class.2=C&lass:
-radio.bind.to.existing.bean=Bind to &existing bean
+radio.bind.to.existing.bean=Bind to existing &bean
 editbox.package=&Package:
 radio.create.new.bean=Cre&ate new bean
 column.form.field=Form Field