angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 14:37:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

added Error Prone (https://errorprone.info/) and fixed reported errors and warnings

Browse Source 
- CI runs Error Prone with Java 11
- use Gradle task `errorprone` to run it on development machine
- fixes are mostly cosmetic except:
  - use Locale.ENGLISH for String.toLowerCase()
  - use explicit character encoding when reading/writing files
  - TabbedPane: wrong logic in mouse-wheel scrolling
  - SplitPane: simplified property change listener (fixes hiding field `propertyChangeListener` of superclass)
This commit is contained in:
Karl Tauber
2023-05-19 22:58:12 +02:00
parent 9d84501bc8
commit 97018df2f9
46 changed files with 167 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java
View File

@@ -1456,7 +1456,7 @@ public class FlatComponents2Test
//---- TestTableRowHeaderModel --------------------------------------------
private class TestTableRowHeaderModel
private static class TestTableRowHeaderModel
extends AbstractTableModel
implements TableModelListener
{

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java
View File

@@ -932,7 +932,7 @@ public class FlatDisabledIconsTest
@Override
public int filterRGB(int x, int y, int rgb) {
// Reduce the color bandwidth in quarter (>> 2) and Shift 0x88.
return (rgb & 0xff000000) + 0x888888 + ((((rgb >> 16) & 0xff) >> 2) << 16) + ((((rgb >> 8) & 0xff) >> 2) << 8) + (((rgb) & 0xff) >> 2);
return (rgb & 0xff000000) + 0x888888 + ((((rgb >> 16) & 0xff) >> 2) << 16) + ((((rgb >> 8) & 0xff) >> 2) << 8) + ((rgb & 0xff) >> 2);
}
}
}

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java
View File

@@ -937,7 +937,7 @@ public class FlatMenusTest
//---- class PopupMenu ----------------------------------------------------
private class PopupMenu extends JPopupMenu {
private static class PopupMenu extends JPopupMenu {
private PopupMenu() {
initComponents();
}

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatSubMenusTest.java
View File

@@ -398,7 +398,7 @@ public class FlatSubMenusTest
//---- class PopupMenu ----------------------------------------------------
private class PopupMenu extends JPopupMenu {
private static class PopupMenu extends JPopupMenu {
private PopupMenu() {
initComponents();
}

17
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
View File

@@ -22,16 +22,20 @@ import java.awt.Font;
import java.awt.Insets;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -229,7 +233,8 @@ public class UIDefaultsDump
}
if( origFile != null ) {
try {
Map<String, String> defaults1 = parse( new FileReader( origFile ) );
Map<String, String> defaults1 = parse( new InputStreamReader(
new FileInputStream( origFile ), StandardCharsets.UTF_8 ) );
Map<String, String> defaults2 = parse( new StringReader( stringWriter.toString() ) );
content = diff( defaults1, defaults2 );
@@ -242,7 +247,9 @@ public class UIDefaultsDump
// write to file
file.getParentFile().mkdirs();
try( FileWriter fileWriter = new FileWriter( file ) ) {
try( Writer fileWriter = new OutputStreamWriter(
new FileOutputStream( file ), StandardCharsets.UTF_8 ) )
{
fileWriter.write( content );
} catch( IOException ex ) {
ex.printStackTrace();
@@ -419,7 +426,7 @@ public class UIDefaultsDump
} else if( value instanceof Character ) {
char ch = ((Character)value).charValue();
if( ch >= ' ' && ch <= '~' )
out.printf( "'%c'", value );
out.printf( "'%c'", ch );
else
out.printf( "'\\u%h'", (int) ch );
} else if( value.getClass().isArray() )

15
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsKeysDump.java
View File

@@ -19,10 +19,13 @@ package com.formdev.flatlaf.testing.uidefaults;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Locale;
@@ -47,7 +50,9 @@ public class UIDefaultsKeysDump
// load existing keys file
HashSet<String> keys = new HashSet<>();
try( BufferedReader reader = new BufferedReader( new FileReader( keysFile ) ) ) {
try( BufferedReader reader = new BufferedReader( new InputStreamReader(
new FileInputStream( keysFile ), StandardCharsets.UTF_8 ) ) )
{
String key;
while( (key = reader.readLine()) != null ) {
keys.add( key );
@@ -64,7 +69,9 @@ public class UIDefaultsKeysDump
collectKeys( FlatTestLaf.class.getName(), keys );
// write key file
try( Writer fileWriter = new BufferedWriter( new FileWriter( keysFile ) ) ) {
try( Writer fileWriter = new BufferedWriter( new OutputStreamWriter(
new FileOutputStream( keysFile ), StandardCharsets.UTF_8 ) ) )
{
String[] sortedKeys = keys.toArray( new String[keys.size()] );
Arrays.sort( sortedKeys );
for( String key : sortedKeys ) {