$ cvs diff -N
cvs server: Diffing .
Index: Bundle.properties
===================================================================
RCS file: /cvs/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/Bundle.properties,v
retrieving revision 1.7
diff -r1.7 Bundle.properties
90a91,92
>
> JsfDesignerAdvancedOptionsPanel.promptForName.text=Prompt for Data Source Name
Index: JsfDesignerAdvancedOptions.java
===================================================================
RCS file: /cvs/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptions.java,v
retrieving revision 1.2
diff -r1.2 JsfDesignerAdvancedOptions.java
82a83
>                         component.setPromptForName(dataConnectivity.getPromptForName());
117a119
>                         dataConnectivity.setPromptForName(component.isPromptForName());
Index: JsfDesignerAdvancedOptionsPanel.form
===================================================================
RCS file: /cvs/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptionsPanel.form,v
retrieving revision 1.1
diff -r1.1 JsfDesignerAdvancedOptionsPanel.form
5a6
>     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
47c48
<                       <Component id="checkRowsetDuplicate" min="-2" max="-2" attributes="0"/>
---
>                       <Component id="promptForName" min="-2" max="-2" attributes="0"/>
52c53
<                           <Component id="rowsetInSession" min="-2" max="-2" attributes="0"/>
---
>                           <Component id="checkRowsetDuplicate" min="-2" max="-2" attributes="0"/>
57c58
<                               <Component id="snapToGrid" min="-2" max="-2" attributes="0"/>
---
>                               <Component id="rowsetInSession" min="-2" max="-2" attributes="0"/>
60,68c61,64
<                           <Group type="102" alignment="0" attributes="0">
<                               <Component id="showGrid" min="-2" max="-2" attributes="0"/>
<                               <EmptySpace max="-2" attributes="0"/>
<                           </Group>
<                           <Group type="102" alignment="1" attributes="0">
<                               <Group type="103" groupAlignment="1" attributes="0">
<                                   <Component id="rowsetSuffix" alignment="0" pref="166" max="32767" attributes="1"/>
<                                   <Component id="dataProviderSuffix" alignment="0" pref="166" max="32767" attributes="1"/>
<                                   <Component id="resolution" alignment="1" pref="166" max="32767" attributes="1"/>
---
>                           <Group type="103" alignment="0" groupAlignment="0" attributes="0">
>                               <Group type="102" alignment="0" attributes="0">
>                                   <Component id="snapToGrid" min="-2" max="-2" attributes="0"/>
>                                   <EmptySpace max="-2" attributes="0"/>
70,76c66,84
<                               <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
<                           </Group>
<                           <Group type="102" alignment="0" attributes="0">
<                               <Group type="103" groupAlignment="1" max="-2" attributes="0">
<                                   <Component id="gridWidth" alignment="0" max="32767" attributes="1"/>
<                                   <Component id="gridHeight" alignment="0" max="32767" attributes="1"/>
<                                   <Component id="defaultFontSize" alignment="0" pref="44" max="32767" attributes="1"/>
---
>                               <Group type="102" alignment="0" attributes="0">
>                                   <Component id="showGrid" min="-2" max="-2" attributes="0"/>
>                                   <EmptySpace max="-2" attributes="0"/>
>                               </Group>
>                               <Group type="102" alignment="1" attributes="0">
>                                   <Group type="103" groupAlignment="1" attributes="0">
>                                       <Component id="rowsetSuffix" alignment="0" pref="166" max="32767" attributes="1"/>
>                                       <Component id="dataProviderSuffix" alignment="0" pref="166" max="32767" attributes="1"/>
>                                       <Component id="resolution" alignment="1" pref="166" max="32767" attributes="1"/>
>                                   </Group>
>                                   <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
>                               </Group>
>                               <Group type="102" alignment="0" attributes="0">
>                                   <Group type="103" groupAlignment="1" max="-2" attributes="0">
>                                       <Component id="gridWidth" alignment="0" max="32767" attributes="1"/>
>                                       <Component id="gridHeight" alignment="0" max="32767" attributes="1"/>
>                                       <Component id="defaultFontSize" alignment="0" pref="44" max="32767" attributes="1"/>
>                                   </Group>
>                                   <EmptySpace pref="136" max="32767" attributes="0"/>
78d85
<                               <EmptySpace pref="136" max="32767" attributes="0"/>
126a134,135
>               <EmptySpace max="-2" attributes="0"/>
>               <Component id="promptForName" min="-2" max="-2" attributes="0"/>
263a273,287
>         </Property>
>       </Properties>
>     </Component>
>     <Component class="javax.swing.JCheckBox" name="promptForName">
>       <Properties>
>         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
>           <ResourceString bundle="org/netbeans/modules/visualweb/designer/jsf/Bundle.properties" key="JsfDesignerAdvancedOptionsPanel.promptForName.
text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
>         </Property>
>         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
>           <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
>             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
>           </Border>
>         </Property>
>         <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
>           <Insets value="[0, 0, 0, 0]"/>
Index: JsfDesignerAdvancedOptionsPanel.java
===================================================================
RCS file: /cvs/visualweb/designer/jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptionsPanel.java,v
retrieving revision 1.2
diff -r1.2 JsfDesignerAdvancedOptionsPanel.java
99a100,105
>     boolean isPromptForName() {
>         return promptForName.isSelected();
>     }
>     void setPromptForName(boolean b) {
>         promptForName.setSelected(b);
>     }
124a131
>         promptForName = new javax.swing.JCheckBox();
159a167,170
>         promptForName.setText(org.openide.util.NbBundle.getMessage(JsfDesignerAdvancedOptionsPanel.class, "JsfDesignerAdvancedOptionsPanel.promptFor
Name.text")); // NOI18N
>         promptForName.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
>         promptForName.setMargin(new java.awt.Insets(0, 0, 0, 0));
>
187c198
<                         .add(checkRowsetDuplicate)
---
>                         .add(promptForName)
191c202
<                             .add(rowsetInSession)
---
>                             .add(checkRowsetDuplicate)
195,198c206
<                                 .add(snapToGrid)
<                                 .addContainerGap())
<                             .add(layout.createSequentialGroup()
<                                 .add(showGrid)
---
>                                 .add(rowsetInSession)
200,211c208,226
<                             .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
<                                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
<                                     .add(org.jdesktop.layout.GroupLayout.LEADING, rowsetSuffix, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 166, S
hort.MAX_VALUE)
<                                     .add(org.jdesktop.layout.GroupLayout.LEADING, dataProviderSuffix, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
166, Short.MAX_VALUE)
<                                     .add(resolution, 0, 166, Short.MAX_VALUE))
<                                 .add(14, 14, 14))
<                             .add(layout.createSequentialGroup()
<                                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
<                                     .add(org.jdesktop.layout.GroupLayout.LEADING, gridWidth)
<                                     .add(org.jdesktop.layout.GroupLayout.LEADING, gridHeight)
<                                     .add(org.jdesktop.layout.GroupLayout.LEADING, defaultFontSize, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 44,
 Short.MAX_VALUE))
<                                 .addContainerGap(136, Short.MAX_VALUE))))))
---
>                             .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
>                                 .add(layout.createSequentialGroup()
>                                     .add(snapToGrid)
>                                     .addContainerGap())
>                                 .add(layout.createSequentialGroup()
>                                     .add(showGrid)
>                                     .addContainerGap())
>                                 .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
>                                     .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
>                                         .add(org.jdesktop.layout.GroupLayout.LEADING, rowsetSuffix, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 16
6, Short.MAX_VALUE)
>                                         .add(org.jdesktop.layout.GroupLayout.LEADING, dataProviderSuffix, org.jdesktop.layout.GroupLayout.DEFAULT_SI
ZE, 166, Short.MAX_VALUE)
>                                         .add(resolution, 0, 166, Short.MAX_VALUE))
>                                     .add(14, 14, 14))
>                                 .add(layout.createSequentialGroup()
>                                     .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
>                                         .add(org.jdesktop.layout.GroupLayout.LEADING, gridWidth)
>                                         .add(org.jdesktop.layout.GroupLayout.LEADING, gridHeight)
>                                         .add(org.jdesktop.layout.GroupLayout.LEADING, defaultFontSize, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
 44, Short.MAX_VALUE))
>                                     .addContainerGap(136, Short.MAX_VALUE)))))))
247a263,264
>                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
>                 .add(promptForName)
264a282
>     private javax.swing.JCheckBox promptForName;