1. Alessio Caiazza
  2. nyagua-mirror

Commits

Rudi Giacomini  committed 448f874 Draft

Fixed error - missing buttons groups in utility form

  • Participants
  • Parent commits 0d8abf8
  • Branches default

Comments (0)

Files changed (2)

File src/nyagua/Utility.form

View file
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <NonVisualComponents>
+    <Component class="javax.swing.ButtonGroup" name="relationButtons">
+    </Component>
+    <Component class="javax.swing.ButtonGroup" name="supportButtons">
+    </Component>
+    <Component class="javax.swing.ButtonGroup" name="pumpunitsButtons">
+    </Component>
+    <Component class="javax.swing.ButtonGroup" name="sizeunitsButtons">
+    </Component>
+    <Component class="javax.swing.ButtonGroup" name="tempUnitsButtons">
+    </Component>
+    <Component class="javax.swing.ButtonGroup" name="tankMatButtons">
+    </Component>
+  </NonVisualComponents>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
         </Component>
         <Component class="javax.swing.JRadioButton" name="utilityDegRadioButton">
           <Properties>
+            <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+              <ComponentRef name="relationButtons"/>
+            </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="nyagua/Bundle.properties" key="utilityDegRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Component>
         <Component class="javax.swing.JRadioButton" name="utilityPpmRadioButton">
           <Properties>
+            <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+              <ComponentRef name="relationButtons"/>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityPpmRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
           <SubComponents>
             <Component class="javax.swing.JRadioButton" name="utilityHCGlassRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="tankMatButtons"/>
+                </Property>
                 <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCGlassRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Component>
             <Component class="javax.swing.JRadioButton" name="UtilityHCAcrylicRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="tankMatButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.UtilityHCAcrylicRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>
           <SubComponents>
             <Component class="javax.swing.JRadioButton" name="utilityHCSupportWoodRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="supportButtons"/>
+                </Property>
                 <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCSupportWoodRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityHCSupportFeltRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="supportButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCSupportFeltRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityHCSupportGumRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="supportButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCSupportGumRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityHCSupportOpenRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="supportButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCSupportOpenRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>
           <SubComponents>
             <Component class="javax.swing.JRadioButton" name="utilityHCCmRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="sizeunitsButtons"/>
+                </Property>
                 <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCCmRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityHCInchRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="sizeunitsButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCInchRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityHCCRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="tempUnitsButtons"/>
+                </Property>
                 <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCCRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityHCFRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="tempUnitsButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityHCFRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>
           <SubComponents>
             <Component class="javax.swing.JRadioButton" name="utilityPFCmRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="pumpunitsButtons"/>
+                </Property>
                 <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityPFCmRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Component>
             <Component class="javax.swing.JRadioButton" name="utilityPFInchRadioButton">
               <Properties>
+                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+                  <ComponentRef name="pumpunitsButtons"/>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="nyagua/Bundle.properties" key="Ny.utilityPFInchRadioButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </Property>

File src/nyagua/Utility.java

View file
     private void initComponents() {
         java.awt.GridBagConstraints gridBagConstraints;
 
+        relationButtons = new javax.swing.ButtonGroup();
+        supportButtons = new javax.swing.ButtonGroup();
+        pumpunitsButtons = new javax.swing.ButtonGroup();
+        sizeunitsButtons = new javax.swing.ButtonGroup();
+        tempUnitsButtons = new javax.swing.ButtonGroup();
+        tankMatButtons = new javax.swing.ButtonGroup();
         phKhCo2RelationPanel = new javax.swing.JPanel();
         utilityPhLabel = new javax.swing.JLabel();
         utilityPhTextField1 = new javax.swing.JTextField();
         gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
         phKhCo2RelationPanel.add(utilityPhTextField1, gridBagConstraints);
 
+        relationButtons.add(utilityDegRadioButton);
         utilityDegRadioButton.setSelected(true);
         utilityDegRadioButton.setText(bundle.getString("utilityDegRadioButton.text")); // NOI18N
         utilityDegRadioButton.setAlignmentY(0.0F);
         gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
         phKhCo2RelationPanel.add(utilityDegRadioButton, gridBagConstraints);
 
+        relationButtons.add(utilityPpmRadioButton);
         utilityPpmRadioButton.setText(bundle.getString("Ny.utilityPpmRadioButton.text")); // NOI18N
         utilityPpmRadioButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
         utilityHCTankPanel.setMinimumSize(new java.awt.Dimension(200, 100));
         utilityHCTankPanel.setLayout(new java.awt.GridBagLayout());
 
+        tankMatButtons.add(utilityHCGlassRadioButton);
         utilityHCGlassRadioButton.setSelected(true);
         utilityHCGlassRadioButton.setText(bundle.getString("Ny.utilityHCGlassRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
         utilityHCTankPanel.add(utilityHCGlassRadioButton, gridBagConstraints);
 
+        tankMatButtons.add(UtilityHCAcrylicRadioButton);
         UtilityHCAcrylicRadioButton.setText(bundle.getString("Ny.UtilityHCAcrylicRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         utilityHCSupportPanel.setMinimumSize(new java.awt.Dimension(120, 100));
         utilityHCSupportPanel.setLayout(new java.awt.GridBagLayout());
 
+        supportButtons.add(utilityHCSupportWoodRadioButton);
         utilityHCSupportWoodRadioButton.setSelected(true);
         utilityHCSupportWoodRadioButton.setText(bundle.getString("Ny.utilityHCSupportWoodRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         utilityHCSupportPanel.add(utilityHCSupportWoodRadioButton, gridBagConstraints);
 
+        supportButtons.add(utilityHCSupportFeltRadioButton);
         utilityHCSupportFeltRadioButton.setText(bundle.getString("Ny.utilityHCSupportFeltRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         utilityHCSupportPanel.add(utilityHCSupportFeltRadioButton, gridBagConstraints);
 
+        supportButtons.add(utilityHCSupportGumRadioButton);
         utilityHCSupportGumRadioButton.setText(bundle.getString("Ny.utilityHCSupportGumRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
         utilityHCSupportPanel.add(utilityHCSupportGumRadioButton, gridBagConstraints);
 
+        supportButtons.add(utilityHCSupportOpenRadioButton);
         utilityHCSupportOpenRadioButton.setText(bundle.getString("Ny.utilityHCSupportOpenRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         utilityHCUnitsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("Ny.utilityHCUnitsPanel.border.title"))); // NOI18N
         utilityHCUnitsPanel.setLayout(new java.awt.GridBagLayout());
 
+        sizeunitsButtons.add(utilityHCCmRadioButton);
         utilityHCCmRadioButton.setSelected(true);
         utilityHCCmRadioButton.setText(bundle.getString("Ny.utilityHCCmRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.insets = new java.awt.Insets(0, 1, 0, 6);
         utilityHCUnitsPanel.add(utilityHCCmRadioButton, gridBagConstraints);
 
+        sizeunitsButtons.add(utilityHCInchRadioButton);
         utilityHCInchRadioButton.setText(bundle.getString("Ny.utilityHCInchRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.insets = new java.awt.Insets(0, 1, 0, 6);
         utilityHCUnitsPanel.add(utilityHCInchRadioButton, gridBagConstraints);
 
+        tempUnitsButtons.add(utilityHCCRadioButton);
         utilityHCCRadioButton.setSelected(true);
         utilityHCCRadioButton.setText(bundle.getString("Ny.utilityHCCRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST;
         utilityHCUnitsPanel.add(utilityHCCRadioButton, gridBagConstraints);
 
+        tempUnitsButtons.add(utilityHCFRadioButton);
         utilityHCFRadioButton.setText(bundle.getString("Ny.utilityHCFRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 2;
         utilityPFUnitsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("Ny.utilityHCUnitsPanel.border.title"))); // NOI18N
         utilityPFUnitsPanel.setLayout(new java.awt.GridBagLayout());
 
+        pumpunitsButtons.add(utilityPFCmRadioButton);
         utilityPFCmRadioButton.setSelected(true);
         utilityPFCmRadioButton.setText(bundle.getString("Ny.utilityPFCmRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.insets = new java.awt.Insets(0, 1, 0, 6);
         utilityPFUnitsPanel.add(utilityPFCmRadioButton, gridBagConstraints);
 
+        pumpunitsButtons.add(utilityPFInchRadioButton);
         utilityPFInchRadioButton.setText(bundle.getString("Ny.utilityPFInchRadioButton.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
                 .addComponent(heaterCalculatorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(pumpFlowPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(17, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
     private javax.swing.JPanel heaterCalculatorPanel;
     private javax.swing.JPanel phKhCo2RelationPanel;
     private javax.swing.JPanel pumpFlowPanel;
+    private javax.swing.ButtonGroup pumpunitsButtons;
+    private javax.swing.ButtonGroup relationButtons;
+    private javax.swing.ButtonGroup sizeunitsButtons;
+    private javax.swing.ButtonGroup supportButtons;
+    private javax.swing.ButtonGroup tankMatButtons;
+    private javax.swing.ButtonGroup tempUnitsButtons;
     private javax.swing.JLabel utilityCo2Label;
     private javax.swing.JTextField utilityCo2TextField;
     private javax.swing.JRadioButton utilityDegRadioButton;