This is an automated email from the ASF dual-hosted git repository.

mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 133ede79d2 Fixed display of hints descriptions for php in the hints 
settings
     new 7da74a54d6 Merge pull request #5649 from 
troizet/corrects_display_php_hint_description
133ede79d2 is described below

commit 133ede79d2d7740923a8bc97c38b9d0efbfabd9c
Author: Alexey Borokhvostov <[email protected]>
AuthorDate: Fri Mar 10 23:06:54 2023 +0700

    Fixed display of hints descriptions for php in the hints settings
---
 .../php/editor/verification/AccidentalAssignmentCustomizer.form       | 2 +-
 .../php/editor/verification/AccidentalAssignmentCustomizer.java       | 4 +---
 .../modules/php/editor/verification/ImmutableVariablesCustomizer.form | 2 +-
 .../modules/php/editor/verification/ImmutableVariablesCustomizer.java | 2 +-
 .../php/editor/verification/UninitializedVariableCustomizer.form      | 2 +-
 .../php/editor/verification/UninitializedVariableCustomizer.java      | 2 +-
 .../modules/php/editor/verification/UnusedVariableCustomizer.form     | 2 +-
 .../modules/php/editor/verification/UnusedVariableCustomizer.java     | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.form
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.form
index 673f7a7daa..5ca1adcd55 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.form
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.form
@@ -62,7 +62,7 @@
               <Component id="checkAssignmentsInSubStatementsCheckBox" min="-2" 
max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="checkAssignmentsInWhileStatementsCheckBox" 
min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="238" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.java
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.java
index 59618425a7..1ff69baf31 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.java
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/AccidentalAssignmentCustomizer.java
@@ -56,8 +56,6 @@ public class AccidentalAssignmentCustomizer extends 
javax.swing.JPanel {
         checkAssignmentsInWhileStatementsCheckBox = new 
javax.swing.JCheckBox();
         checkAssignmentsInSubStatementsCheckBox = new javax.swing.JCheckBox();
 
-        setFocusTraversalPolicy(null);
-
         checkAssignmentsInWhileStatementsCheckBox.setMnemonic('a');
         
checkAssignmentsInWhileStatementsCheckBox.setText(org.openide.util.NbBundle.getMessage(AccidentalAssignmentCustomizer.class,
 "AccidentalAssignmentCustomizer.includeWhileCB.text")); // NOI18N
         checkAssignmentsInWhileStatementsCheckBox.addActionListener(new 
java.awt.event.ActionListener() {
@@ -92,7 +90,7 @@ public class AccidentalAssignmentCustomizer extends 
javax.swing.JPanel {
                 .addComponent(checkAssignmentsInSubStatementsCheckBox)
                 
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkAssignmentsInWhileStatementsCheckBox)
-                .addContainerGap(238, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
 
         
checkAssignmentsInWhileStatementsCheckBox.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(AccidentalAssignmentCustomizer.class,
 
"AccidentalAssignmentCustomizer.cbIncludeWhile.AccessibleContext.accessibleName"));
 // NOI18N
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.form
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.form
index 1c43a5cee6..421458efd2 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.form
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.form
@@ -54,7 +54,7 @@
                   <Component id="jLabel1" alignment="3" min="-2" max="-2" 
attributes="0"/>
                   <Component id="numberOfAllowedAssignmentsSpinner" 
alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="260" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.java
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.java
index ea5847eaf1..960c16fffe 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.java
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ImmutableVariablesCustomizer.java
@@ -80,7 +80,7 @@ public class ImmutableVariablesCustomizer extends 
javax.swing.JPanel {
                 
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(jLabel1)
                     .addComponent(numberOfAllowedAssignmentsSpinner, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(260, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.form
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.form
index c19428b83f..0bda6fcb3e 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.form
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.form
@@ -64,7 +64,7 @@
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="216" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.java
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.java
index 3f4bb675c8..bd518b400f 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.java
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UninitializedVariableCustomizer.java
@@ -87,7 +87,7 @@ public class UninitializedVariableCustomizer extends 
javax.swing.JPanel {
                 .addComponent(jLabel1)
                 
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jLabel2)
-                .addContainerGap(216, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.form
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.form
index c0ca9d76aa..20f4003119 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.form
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.form
@@ -54,7 +54,7 @@
               <Component id="checkUnusedFormalParametersCheckBox" min="-2" 
max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="checkInheritedMethodParametersCheckBox" min="-2" 
max="-2" attributes="0"/>
-              <EmptySpace pref="236" max="32767" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.java
 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.java
index 6e328572fa..071b054c24 100644
--- 
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.java
+++ 
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableCustomizer.java
@@ -94,7 +94,7 @@ public class UnusedVariableCustomizer extends 
javax.swing.JPanel {
                 .addComponent(checkUnusedFormalParametersCheckBox)
                 
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkInheritedMethodParametersCheckBox)
-                .addContainerGap(236, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to