Bump checkstyle and spotbugs

bobbylight · bobbylight · commit 46c3820026a8 · 2024-11-23T15:01:26.000-05:00
diff --git a/RSyntaxTextArea/src/main/java/org/fife/io/DocumentReader.java b/RSyntaxTextArea/src/main/java/org/fife/io/DocumentReader.java
@@ -93,7 +93,7 @@ public boolean markSupported() {
 	 */
 	@Override
 	public int read() {
-		if(position>=document.getLength()) {
+		if (position>=document.getLength()) {
 			return -1;      // Read past end of document.
 		}
 		try {
@@ -133,14 +133,14 @@ public int read(char[] array) {
 	@Override
 	public int read(char[] cbuf, int off, int len) {
 		int k;
-		if(position>=document.getLength()) {
+		if (position>=document.getLength()) {
 			return -1;      // Read past end of document.
 		}
 		k = len;
-		if((position+k)>=document.getLength()) {
+		if ((position+k)>=document.getLength()) {
 			k = document.getLength() - (int)position;
 		}
-		if(off + k >= cbuf.length) {
+		if (off + k >= cbuf.length) {
 			k = cbuf.length - off;
 		}
 		try {
@@ -178,7 +178,7 @@ public boolean ready() {
 	 */
 	@Override
 	public void reset() {
-		if(mark==-1) {
+		if (mark==-1) {
 			position = 0;
 		}
 		else {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/print/RPrintUtilities.java b/RSyntaxTextArea/src/main/java/org/fife/print/RPrintUtilities.java
@@ -539,7 +539,7 @@ private static Segment removeEndingWhitespace(Segment segment) {
 	 * A tab expander for the document currently being printed with the
 	 * font being used for the printing.
 	 */
-	private static class RPrintTabExpander implements TabExpander {
+	private static final class RPrintTabExpander implements TabExpander {
 
 		@Override
 		public float nextTabStop(float x, int tabOffset) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/CodeTemplateManager.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/CodeTemplateManager.java
@@ -340,7 +340,7 @@ private synchronized void sortTemplates() {
 	 * parameter and a <code>Segment</code> as its second, and knows
 	 * to compare the template's ID to the segment's text.
 	 */
-	private static class TemplateComparator implements Comparator<Object>,
+	private static final class TemplateComparator implements Comparator<Object>,
 			Serializable{
 
 		@Override
@@ -382,7 +382,7 @@ public int compare(Object template, Object segment) {
 	/**
 	 * A file filter that accepts only XML files.
 	 */
-	private static class XMLFileFilter implements FileFilter {
+	private static final class XMLFileFilter implements FileFilter {
 		@Override
 		public boolean accept(File f) {
 			return f.getName().toLowerCase().endsWith(".xml");
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/ErrorStrip.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/ErrorStrip.java
@@ -699,7 +699,7 @@ private int yToLine(int y) {
 	 *
 	 * @author predi
 	 */
-	private static class DefaultErrorStripMarkerToolTipProvider
+	private static final class DefaultErrorStripMarkerToolTipProvider
 			implements ErrorStripMarkerToolTipProvider {
 
 		@Override
@@ -753,7 +753,7 @@ public interface ErrorStripMarkerToolTipProvider {
 	/**
 	 * Listens for events in the error strip and its markers.
 	 */
-	private class Listener extends MouseAdapter
+	private final class Listener extends MouseAdapter
 					implements PropertyChangeListener, CaretListener {
 
 		private final Rectangle r = new Rectangle();
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/MatchedBracketPopup.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/MatchedBracketPopup.java
@@ -184,7 +184,7 @@ private void setLocation() {
 	/**
 	 * Action performed when Escape is pressed in this popup.
 	 */
-	private class EscapeAction extends AbstractAction {
+	private final class EscapeAction extends AbstractAction {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaHighlighter.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaHighlighter.java
@@ -284,7 +284,7 @@ void removeParserHighlight(HighlightInfo tag) {
 	 * Highlight info implementation used for parser notices and marked
 	 * occurrences.
 	 */
-	private static class SyntaxLayeredHighlightInfoImpl extends
+	private static final class SyntaxLayeredHighlightInfoImpl extends
 			LayeredHighlightInfoImpl {
 
 		private ParserNotice notice;
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxUtilities.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxUtilities.java
@@ -711,7 +711,7 @@ public static int getNextVisualPositionFrom(int pos, Position.Bias b,
 
 			case WEST:
 				int endOffs = view.getEndOffset();
-				if(pos == -1) {
+				if (pos == -1) {
 					pos = Math.max(0, endOffs - 1);
 				}
 				else {
@@ -732,7 +732,7 @@ public static int getNextVisualPositionFrom(int pos, Position.Bias b,
 				break;
 
 			case EAST:
-				if(pos == -1) {
+				if (pos == -1) {
 					pos = view.getStartOffset();
 				}
 				else {
@@ -1144,7 +1144,7 @@ public static int getWordStart(RSyntaxTextArea textArea, int offs)
 
 		int endOffs = Math.min(offs+1, doc.getLength());
 		String s = doc.getText(lineStart, endOffs-lineStart);
-		if(s != null && !s.isEmpty()) {
+		if (s != null && !s.isEmpty()) {
 			int i = s.length() - 1;
 			char ch = s.charAt(i);
 			if (Character.isWhitespace(ch)) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/Theme.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/Theme.java
@@ -595,7 +595,7 @@ private static Color stringToColor(String s, Color defaultVal) {
 	/**
 	 * Loads a <code>SyntaxScheme</code> from an XML file.
 	 */
-	private static class XmlHandler extends DefaultHandler {
+	private static final class XmlHandler extends DefaultHandler {
 
 		private Theme theme;
 
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java
@@ -689,23 +689,23 @@ public Shape modelToView(int pos, Shape a, Position.Bias b)
 
 		boolean isBackward = (b == Position.Bias.Backward);
 		int testPos = (isBackward) ? Math.max(0, pos - 1) : pos;
-		if(isBackward && testPos < getStartOffset()) {
+		if (isBackward && testPos < getStartOffset()) {
 			return null;
 		}
 
 		int vIndex = getViewIndexAtPosition(testPos);
 		if ((vIndex != -1) && (vIndex < getViewCount())) {
 			View v = getView(vIndex);
-			if(v != null && testPos >= v.getStartOffset() &&
+			if (v != null && testPos >= v.getStartOffset() &&
 					testPos < v.getEndOffset()) {
 				Shape childShape = getChildAllocation(vIndex, a);
 				if (childShape == null) {
 					// We are likely invalid, fail.
 					return null;
 				}
 				Shape retShape = v.modelToView(pos, childShape, b);
-				if(retShape == null && v.getEndOffset() == pos) {
-					if(++vIndex < getViewCount()) {
+				if (retShape == null && v.getEndOffset() == pos) {
+					if (++vIndex < getViewCount()) {
 						v = getView(vIndex);
 						retShape = v.modelToView(pos, getChildAllocation(vIndex, a), b);
 					}
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/focusabletip/FocusableTip.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/focusabletip/FocusableTip.java
@@ -304,7 +304,7 @@ public void toolTipRequested(MouseEvent e, String text) {
 	/**
 	 * Listens for events in a text area.
 	 */
-	private class TextAreaListener extends MouseInputAdapter implements
+	private final class TextAreaListener extends MouseInputAdapter implements
 			CaretListener, ComponentListener, FocusListener, KeyListener {
 
 		@Override
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/focusabletip/SizeGrip.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/focusabletip/SizeGrip.java
@@ -132,7 +132,7 @@ private void possiblyFixCursor(boolean ltr) {
 	 * Listens for mouse events on this panel and resizes the parent window
 	 * appropriately.
 	 */
-	private class MouseHandler extends MouseInputAdapter {
+	private final class MouseHandler extends MouseInputAdapter {
 
 		/*
 		 * NOTE: We use SwingUtilities.convertPointToScreen() instead of just using
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/focusabletip/TipWindow.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/focusabletip/TipWindow.java
@@ -194,7 +194,7 @@ void fixSize() {
 			r = textArea.modelToView(textArea.getDocument().getLength()-1);
 			if (r.y+r.height>d.height) {
 				d.height = r.y + r.height + 5;
-				if(ft.getMaxSize() != null) {
+				if (ft.getMaxSize() != null) {
 					d.height = Math.min(d.height, maxWindowH);
 				}
 				textArea.setPreferredSize(d);
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/folding/DefaultFoldManager.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/folding/DefaultFoldManager.java
@@ -510,7 +510,7 @@ private void updateFoldParser() {
 	/**
 	 * Listens for events in the text editor.
 	 */
-	private class Listener implements DocumentListener, PropertyChangeListener {
+	private final class Listener implements DocumentListener, PropertyChangeListener {
 
 		@Override
 		public void changedUpdate(DocumentEvent e) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/folding/HtmlFoldParser.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/folding/HtmlFoldParser.java
@@ -386,7 +386,7 @@ private static void removeFold(Fold fold, List<Fold> folds) {
 	 * A simple wrapper for the token denoting the closing of a tag (i.e.
 	 * "<code>&gt;</code>" or "<code>/&gt;</code>").
 	 */
-	private static class TagCloseInfo {
+	private static final class TagCloseInfo {
 
 		private Token closeToken;
 		private int line;
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/ClipboardHistoryPopup.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/ClipboardHistoryPopup.java
@@ -246,7 +246,7 @@ private void updateTextAreaCaret(boolean visible) {
 	/**
 	 * Action performed when Escape is pressed in this popup.
 	 */
-	private class EscapeAction extends AbstractAction {
+	private final class EscapeAction extends AbstractAction {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/ConfigurableCaret.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/ConfigurableCaret.java
@@ -712,7 +712,7 @@ public enum SelectionType {
 	 *
 	 * Common cases: backspacing to visible line of collapsed region.
 	 */
-	private class FoldAwareNavigationFilter extends NavigationFilter {
+	private final class FoldAwareNavigationFilter extends NavigationFilter {
 
 		@Override
 	    public void setDot(FilterBypass fb, int dot, Position.Bias bias) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/FoldIndicator.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/FoldIndicator.java
@@ -913,7 +913,7 @@ public void setTextArea(RTextArea textArea) {
 	 * Updates the alpha used for this component's "collapsed" fold icons, if
 	 * necessary.
 	 */
-	private class AlphaRunnable implements ActionListener {
+	private final class AlphaRunnable implements ActionListener {
 
 		private float delta;
 
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/Gutter.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/Gutter.java
@@ -1153,7 +1153,7 @@ public void setEdges(int top, int left, int bottom, int right) {
 	/**
 	 * Listens for the text area resizing.
 	 */
-	private class TextAreaListener extends ComponentAdapter
+	private final class TextAreaListener extends ComponentAdapter
 						implements DocumentListener, PropertyChangeListener,
 						ActiveLineRangeListener {
 
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/LineHighlightManager.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/LineHighlightManager.java
@@ -227,7 +227,7 @@ public int hashCode() {
 	 * distinguished from one another.  See:
 	 * https://github.com/bobbylight/RSyntaxTextArea/issues/161
 	 */
-	private static class LineHighlightInfoComparator
+	private static final class LineHighlightInfoComparator
 			implements Comparator<LineHighlightInfo> {
 
 		@Override
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/LineNumberList.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/LineNumberList.java
@@ -776,7 +776,7 @@ void updateCellWidths() {
 	/**
 	 * Listens for events in the text area we're interested in.
 	 */
-	private class Listener implements CaretListener, PropertyChangeListener {
+	private final class Listener implements CaretListener, PropertyChangeListener {
 
 		private boolean installed;
 
@@ -853,7 +853,7 @@ public void uninstall(RTextArea textArea) {
 	}
 
 
-	private static class SimpleLineNumberFormatter implements LineNumberFormatter {
+	private static final class SimpleLineNumberFormatter implements LineNumberFormatter {
 		@Override
 		public String format(int lineNumber) {
 			return Integer.toString(lineNumber);
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/RDocument.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/RDocument.java
@@ -45,7 +45,7 @@ public char charAt(int offset) throws BadLocationException {
 	/**
 	 * Document content that provides fast access to individual characters.
 	 */
-	private static class RGapContent extends GapContent {
+	private static final class RGapContent extends GapContent {
 
 		protected char charAt(int offset) throws BadLocationException {
 			if (offset<0 || offset>=length()) {
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/RTextAreaEditorKit.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/RTextAreaEditorKit.java
@@ -428,7 +428,7 @@ public void read(Reader in, Document doc, int pos)
 			} // End of for (int counter = 0; counter < nch; counter++).
 
 			if (last < nch) {
-				if(lastWasCR) {
+				if (lastWasCR) {
 					if (last < (nch - 1)) {
 						doc.insertString(pos, new String(buff, last,
 										nch - last - 1), null);
@@ -2012,7 +2012,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 
 			try {
 
-				if(magicPosition == null &&
+				if (magicPosition == null &&
 					(direction == SwingConstants.NORTH ||
 					direction == SwingConstants.SOUTH)) {
 					Rectangle r = textArea.modelToView(dot);
@@ -2037,7 +2037,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 					caret.setDot(dot);
 				}
 
-				if(magicPosition != null &&
+				if (magicPosition != null &&
 					(direction == SwingConstants.NORTH ||
 					direction == SwingConstants.SOUTH)) {
 						caret.setMagicCaretPosition(magicPosition);
@@ -2078,7 +2078,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 
 			try {
 				offs = getNextWord(textArea, offs);
-				if(offs >= curPara.getEndOffset() &&
+				if (offs >= curPara.getEndOffset() &&
 							oldOffs != curPara.getEndOffset() - 1) {
 					// we should first move to the end of current paragraph
 					// https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4278839
@@ -2087,7 +2087,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 			} catch (BadLocationException ble) {
 				int end = textArea.getDocument().getLength();
 				if (offs != end) {
-					if(oldOffs != curPara.getEndOffset() - 1) {
+					if (oldOffs != curPara.getEndOffset() - 1) {
 						offs = curPara.getEndOffset() - 1;
 					}
 					else {
@@ -2146,7 +2146,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 			}
 
 			selectedIndex = textArea.getCaretPosition();
-			if(selectedIndex != -1) {
+			if (selectedIndex != -1) {
 				if (left) {
 					selectedIndex = textArea.viewToModel(
 									new Point(visible.x, visible.y));
@@ -2161,7 +2161,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 					(selectedIndex  > (doc.getLength()-1))) {
 					selectedIndex = doc.getLength()-1;
 				}
-				else if(selectedIndex  < 0) {
+				else if (selectedIndex  < 0) {
 					selectedIndex = 0;
 				}
 				if (select) {
@@ -2301,7 +2301,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 
 				Element curPara = Utilities.getParagraphElement(textArea, offs);
 				offs = getPreviousWord(textArea, offs);
-				if(offs < curPara.getStartOffset()) {
+				if (offs < curPara.getStartOffset()) {
 					offs = Utilities.getParagraphElement(textArea, offs).
 												getEndOffset() - 1;
 				}
diff --git a/RSyntaxTextAreaDemo/src/main/java/org/fife/ui/rsyntaxtextarea/demo/DemoRootPane.java b/RSyntaxTextAreaDemo/src/main/java/org/fife/ui/rsyntaxtextarea/demo/DemoRootPane.java
@@ -680,7 +680,7 @@ public void actionPerformed(ActionEvent e) {
 	/**
 	 * Formats line numbers into Hindu-Arabic numerals.
 	 */
-	private static class HinduArabicLineNumberFormatter implements LineNumberFormatter {
+	private static final class HinduArabicLineNumberFormatter implements LineNumberFormatter {
 		private static final String[] NUMERALS = {
 			"٠", "١", "٢", "٣", "٤", "٥", "٦", "٧", "٨", "٩"
 		};
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.github.spotbugs' version '5.2.5'
+    id 'com.github.spotbugs' version '6.0.26'
 }
 
 // We require building with JDK 11 or later. Built artifact compatibility
@@ -47,7 +47,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = '9.3'
+        toolVersion = '10.20.1'
         configDirectory = file("$rootProject.projectDir/config/checkstyle")
     }
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
