Merge pull request #7324 from apache/delivery

Sync delivery to release220 for 22-rc2
apache · Apr 29, 2024 · 148b168 · 148b168
2 parents 553bcec + 41b0a86
commit 148b168
Show file tree

Hide file tree

Showing 63 changed files with 689 additions and 880 deletions.
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/jakartaee_11.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/jakartaee_11.xsd
@@ -52,7 +52,7 @@
 
 
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-              schemaLocation="https://www.w3.org/2001/xml.xsd"/>
+              schemaLocation="xml.xsd"/>
 
   <xsd:include schemaLocation="jakartaee_web_services_client_2_0.xsd"/>
 

diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java
@@ -108,8 +108,5 @@ private static void openTransactionView() {
         tv.requestActive();        
     }
 
-    public static void log(String s) {
-	log("MonitorAction::" + s); //NOI18N
-    }
 }
 
diff --git a/...src/org/netbeans/modules/groovy/editor/completion/provider/GroovyCompletionCollector.java b/...src/org/netbeans/modules/groovy/editor/completion/provider/GroovyCompletionCollector.java
@@ -539,7 +539,7 @@ public boolean isPrefixMatch() {
 
         @Override
         public boolean isCaseSensitive() {
-            return isCaseSensitive();
+            return GroovyCompletionCollector.isCaseSensitive();
         }
     }
 

diff --git a/...csl.api/src/org/netbeans/modules/csl/editor/completion/MethodParamsTipPaintComponent.java b/...csl.api/src/org/netbeans/modules/csl/editor/completion/MethodParamsTipPaintComponent.java
@@ -39,9 +39,9 @@ public class MethodParamsTipPaintComponent extends JToolTip {
     private int descent;
     private FontMetrics fontMetrics;
 
-    private List<List<String>> params;
-    private int idx;
-    private JTextComponent component;
+    private final List<List<String>> params;
+    private final int idx;
+    private final JTextComponent component;
 
     public MethodParamsTipPaintComponent(List<List<String>> params, int idx, JTextComponent component){
         super();
@@ -123,11 +123,6 @@ protected int getWidth(String s, Font font) {
         return getFontMetrics(font).stringWidth(s);
     }
 
-    protected int getHeight(String s, Font font) {
-        if (font == null) return fontMetrics.stringWidth(s);
-        return getFontMetrics(font).stringWidth(s);
-    }
-
     public @Override void setFont(Font font) {
         super.setFont(font);
         fontMetrics = this.getFontMetrics(font);

diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldOptionsPanel.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldOptionsPanel.java
@@ -172,14 +172,14 @@ public void preferenceChange(PreferenceChangeEvent evt) {
                 foldedSummary.setEnabled(enabled);
                 useDefaults.setEnabled(enabled);
             } 
-            if (k == null || FoldUtilitiesImpl.PREF_CONTENT_PREVIEW.equals(FoldUtilitiesImpl.PREF_CONTENT_PREVIEW)) {
+            if (k == null || k.equals(FoldUtilitiesImpl.PREF_CONTENT_PREVIEW)) {
                 contentPreview.setSelected(currentPreferences.getBoolean(FoldUtilitiesImpl.PREF_CONTENT_PREVIEW, true));
             }
-            if (k == null || FoldUtilitiesImpl.PREF_CONTENT_SUMMARY.equals(FoldUtilitiesImpl.PREF_CONTENT_SUMMARY)) {
+            if (k == null || k.equals(FoldUtilitiesImpl.PREF_CONTENT_SUMMARY)) {
                 foldedSummary.setSelected(currentPreferences.getBoolean(FoldUtilitiesImpl.PREF_CONTENT_SUMMARY, true));
             } 
             // must not replicate defaults over current settings if unspecified key arrives.
-            if (k != null && FoldUtilitiesImpl.PREF_OVERRIDE_DEFAULTS.equals(k)) {
+            if (FoldUtilitiesImpl.PREF_OVERRIDE_DEFAULTS.equals(k)) {
                 boolean b = parentPrefs == null || !currentPreferences.getBoolean(FoldUtilitiesImpl.PREF_OVERRIDE_DEFAULTS, true);
                 if (parentPrefs != null) {
                     if (b) {