Skip to content

Commit bd9bd09

Browse files
style: rewrite CheckStyle exceptions
Signed-off-by: manticore-projects <andreas@manticore-projects.com>
1 parent 8edf83b commit bd9bd09

File tree

33 files changed

+67
-64
lines changed

33 files changed

+67
-64
lines changed

build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ subprojects {
7373
"**/*Proto.java",
7474
"**/*ProtoIn.java",
7575
"**/*ProtoOut.java",
76-
"**/Jwt.java"
76+
"**/Jwt.java",
77+
'**/proto/Directdraw.java',
78+
'webswing-app-toolkit/src/main/java/org/webswing/audio/*.java'
7779
]
7880
}
7981
}
@@ -90,7 +92,8 @@ subprojects {
9092
'**/*ProtoIn.java',
9193
'**/*ProtoOut.java',
9294
'**/Jwt.java',
93-
'**/proto/Directdraw.java'
95+
'**/proto/Directdraw.java',
96+
'webswing-app-toolkit/src/main/java/org/webswing/audio/*.java'
9497
}
9598

9699
spotless {
@@ -122,12 +125,12 @@ dependencies {
122125
rewrite {
123126
configFile = file('config/rewrite/rewrite.yml')
124127
activeRecipe(
125-
// "org.openrewrite.java.migrate.UpgradeToJava17",
128+
"org.openrewrite.java.migrate.UpgradeToJava17",
129+
'org.openrewrite.staticanalysis.CodeCleanup',
126130
"org.openrewrite.staticanalysis.NeedBraces",
127131
"org.openrewrite.staticanalysis.UnnecessaryParentheses",
128132
"org.openrewrite.staticanalysis.MultipleVariableDeclarations",
129133
"org.openrewrite.java.format.Spaces",
130-
'org.openrewrite.staticanalysis.CodeCleanup',
131134
'org.openrewrite.java.NoStaticImport',
132135
'org.openrewrite.java.OrderImports',
133136
'org.openrewrite.java.RemoveUnusedImports',
@@ -140,7 +143,7 @@ rewrite {
140143
"**/*ProtoOut.java",
141144
"**/Jwt.java",
142145
"**/proto/Directdraw.java",
143-
'**/org.webswing.audio/*.java'
146+
'webswing-app-toolkit/src/main/java/org/webswing/audio/*.java'
144147
)
145148
}
146149

webswing-app-services/src/main/java/org/webswing/classloader/ClassModificationRegister.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void readUnmodified() {
4646
Scanner sc = null;
4747
try {
4848
sc = new Scanner(getClassListFile());
49-
for (; sc.hasNextLine();) {
49+
for (; sc.hasNextLine(); ) {
5050
unmodifiedClassSet.add(sc.nextLine());
5151
}
5252
} catch (FileNotFoundException e) {

webswing-app-services/src/main/java/org/webswing/classloader/SwingClassloader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ public class SwingClassloader extends URLClassLoader {
293293
private final FallbackURLClassLoader repoClassLoader;
294294

295295
public SwingClassloader(URL[] classpath, ClassLoader parent) {
296-
super(new URL[] {}, parent);
297-
this.ignored_packages = new String[] {"org.webswing.special.", "org.webswing.model.",
296+
super(new URL[]{}, parent);
297+
this.ignored_packages = new String[]{"org.webswing.special.", "org.webswing.model.",
298298
"org.webswing.toolkit.", "netscape.javascript."};
299299
this.repoClassLoader = new FallbackURLClassLoader(classpath);
300300

@@ -366,7 +366,7 @@ private JavaClass createClass(String class_name) {
366366
protected JavaClass modifyClass(JavaClass clazz) {
367367

368368
// do not modify classes placed in this list
369-
if (ClassLoaderUtil.isInPackage(clazz.getPackageName(), new String[] {"org.webswing"})) {
369+
if (ClassLoaderUtil.isInPackage(clazz.getPackageName(), new String[]{"org.webswing"})) {
370370
return clazz;
371371
}
372372

@@ -628,7 +628,7 @@ protected Class<?> findClass(String class_name) throws ClassNotFoundException {
628628
: classFilePath;
629629
CodeSource source = null;
630630
try {
631-
source = new CodeSource(new URL(classFilePath), new Certificate[] {});
631+
source = new CodeSource(new URL(classFilePath), new Certificate[]{});
632632
} catch (MalformedURLException e) {
633633
AppLogger.fatal("Exception resolving code source:", e);
634634
// should not happen

webswing-app-toolkit-fx/src/main/java/org/webswing/javafx/toolkit/WebFxView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private void handleKeyEvent(java.awt.event.KeyEvent e) {
149149
int action = mapAction(e);
150150
int keyCode = mapKeyCode(e);
151151
int modifiers = mapModifiers(e.getModifiersEx());
152-
char[] chars = new char[] {e.getKeyChar()};
152+
char[] chars = new char[]{e.getKeyChar()};
153153
eventHandler.handleKeyEvent(this, time, action, keyCode, chars, modifiers);
154154
}
155155

webswing-app-toolkit/src/main/java/org/webswing/dispatch/AbstractPaintDispatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public void notifyDeleteSelectedFile() {
366366
File[] selected = getFileChooserDialog().getSelectedFiles();
367367
if ((selected == null || selected.length == 0)
368368
&& getFileChooserDialog().getSelectedFile() != null) {
369-
selected = new File[] {getFileChooserDialog().getSelectedFile()};
369+
selected = new File[]{getFileChooserDialog().getSelectedFile()};
370370
}
371371
if (selected != null) {
372372
for (File f : selected) {

webswing-app-toolkit/src/main/java/org/webswing/toolkit/WebClipboardTransferable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public boolean isDataFlavorSupported(DataFlavor flavor) {
6060
}
6161

6262
public DataFlavor[] getTransferDataFlavors() {
63-
return new DataFlavor[] {DataFlavor.imageFlavor, DataFlavor.stringFlavor,
63+
return new DataFlavor[]{DataFlavor.imageFlavor, DataFlavor.stringFlavor,
6464
WebClipboard.HTML_FLAVOR};
6565
}
6666

webswing-app-toolkit/src/main/java/org/webswing/toolkit/WebComponentPeer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private boolean isInitialized() {
140140

141141
public Component getHwComponentAt(int x, int y) {
142142
Component result = (Component) getTarget();
143-
for (Iterator<WebComponentPeer> i = hwLayers.iterator(); i.hasNext();) {
143+
for (Iterator<WebComponentPeer> i = hwLayers.iterator(); i.hasNext(); ) {
144144
WebComponentPeer wcp = i.next();
145145
Insets insets = ((Window) this.getTarget()).getInsets();
146146
if (wcp.getBounds().contains(x - getBounds().x - insets.left,

webswing-app-toolkit/src/main/java/org/webswing/toolkit/WebPrinterJobWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,11 @@ public static PrintService[] wrappedLookupPrintServices(DocFlavor flavor,
241241
AttributeSet attributes) {
242242
String delegateClass = System.getProperty(Constants.PRINTER_JOB_CLASS, null);
243243
if (delegateClass.equals(WebPrinterJob.class.getCanonicalName())) {
244-
return new PrintService[] {WebPrintService.getService()};
244+
return new PrintService[]{WebPrintService.getService()};
245245
} else {
246246
PrintService[] services = PrintServiceLookup.lookupPrintServices(flavor, attributes);
247247
if (services == null) {
248-
services = new PrintService[] {};
248+
services = new PrintService[]{};
249249
}
250250
return services;
251251
}

webswing-app-toolkit/src/main/java/org/webswing/toolkit/WebswingApiImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ private static WebswingUrlState parseState(String url) {
255255
Iterator<String> i = params.iterator();
256256
String path = URLDecoder.decode(i.next(), "UTF-8");
257257
Map<String, String> parameters = new LinkedHashMap<String, String>();
258-
for (; i.hasNext();) {
258+
for (; i.hasNext(); ) {
259259
String param = i.next();
260260
String key = URLDecoder.decode(param, "UTF-8");
261261
String value = null;

webswing-app-toolkit/src/main/java/org/webswing/toolkit/ge/BufferedImageDevice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public String getIDstring() {
4444
*/
4545
@Override
4646
public GraphicsConfiguration[] getConfigurations() {
47-
return new GraphicsConfiguration[] {config};
47+
return new GraphicsConfiguration[]{config};
4848
}
4949

5050
/**

0 commit comments

Comments
 (0)