From 5b4af69330836255dfd8ca1b6983091964cb02ef Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sun, 5 Feb 2023 17:38:52 +0000 Subject: [PATCH] Use lambdas and `<>` where appropriate --- .../lwjgl3ify/mixins/game/MixinStitcher.java | 2 +- .../sound/libraries/LibraryLWJGLOpenAL.java | 14 +++++++------- .../sound/libraries/SourceLWJGLOpenAL.java | 2 +- src/main/java/org/lwjglx/LWJGLUtil.java | 17 ++++++++--------- src/main/java/org/lwjglx/openal/ALCdevice.java | 2 +- src/main/java/org/lwjglx/opengl/Sync.java | 14 ++++++-------- .../org/lwjglx/test/spaceinvaders/Game.java | 4 ++-- .../test/spaceinvaders/TextureLoader.java | 6 +++--- src/main/java/org/lwjglx/util/Display.java | 2 +- src/main/java/org/lwjglx/util/XPMFile.java | 2 +- .../org/lwjglx/util/glu/tessellation/Sweep.java | 13 +++---------- 11 files changed, 34 insertions(+), 44 deletions(-) diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java index c2611d2..b1353ba 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/game/MixinStitcher.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; @Mixin(Stitcher.class) -@SuppressWarnings("unchecked") +@SuppressWarnings({"unchecked", "rawtypes"}) public abstract class MixinStitcher { @Shadow @Final diff --git a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java index 656fe89..17f6593 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/LibraryLWJGLOpenAL.java @@ -140,7 +140,7 @@ public class LibraryLWJGLOpenAL extends Library { */ public LibraryLWJGLOpenAL() throws SoundSystemException { super(); - ALBufferMap = new HashMap(); + ALBufferMap = new HashMap<>(); reverseByteOrder = true; } @@ -299,12 +299,12 @@ public class LibraryLWJGLOpenAL extends Library { public boolean loadSound(FilenameURL filenameURL) { // Make sure the buffer map exists: if (bufferMap == null) { - bufferMap = new HashMap(); + bufferMap = new HashMap<>(); importantMessage("Buffer Map was null in method 'loadSound'"); } // Make sure the OpenAL buffer map exists: if (ALBufferMap == null) { - ALBufferMap = new HashMap(); + ALBufferMap = new HashMap<>(); importantMessage("Open AL Buffer Map was null in method" + "'loadSound'"); } @@ -396,12 +396,12 @@ public class LibraryLWJGLOpenAL extends Library { public boolean loadSound(SoundBuffer buffer, String identifier) { // Make sure the buffer map exists: if (bufferMap == null) { - bufferMap = new HashMap(); + bufferMap = new HashMap<>(); importantMessage("Buffer Map was null in method 'loadSound'"); } // Make sure the OpenAL buffer map exists: if (ALBufferMap == null) { - ALBufferMap = new HashMap(); + ALBufferMap = new HashMap<>(); importantMessage("Open AL Buffer Map was null in method" + "'loadSound'"); } @@ -711,12 +711,12 @@ public class LibraryLWJGLOpenAL extends Library { // Make sure the buffer map exists: if (bufferMap == null) { - bufferMap = new HashMap(); + bufferMap = new HashMap<>(); importantMessage("Buffer Map was null in method 'copySources'"); } // Make sure the OpenAL buffer map exists: if (ALBufferMap == null) { - ALBufferMap = new HashMap(); + ALBufferMap = new HashMap<>(); importantMessage("Open AL Buffer Map was null in method" + "'copySources'"); } diff --git a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java index 50a8a23..adc00bf 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/paulscode/sound/libraries/SourceLWJGLOpenAL.java @@ -625,7 +625,7 @@ public class SourceLWJGLOpenAL extends Source { if (codec == null) return false; codec.initialize(filenameURL.getURL()); - LinkedList preLoadBuffers = new LinkedList(); + LinkedList preLoadBuffers = new LinkedList<>(); for (int i = 0; i < SoundSystemConfig.getNumberStreamingBuffers(); i++) { soundBuffer = codec.read(); diff --git a/src/main/java/org/lwjglx/LWJGLUtil.java b/src/main/java/org/lwjglx/LWJGLUtil.java index dc47ccb..a149913 100644 --- a/src/main/java/org/lwjglx/LWJGLUtil.java +++ b/src/main/java/org/lwjglx/LWJGLUtil.java @@ -52,6 +52,7 @@ import org.lwjgl.system.Platform; * @version $Revision: 3608 $ * $Id: LWJGLUtil.java 3608 2011-08-10 16:05:46Z spasi $ */ +@SuppressWarnings("rawtypes") public class LWJGLUtil { public static final int PLATFORM_LINUX = 1; public static final int PLATFORM_MACOSX = 2; @@ -345,7 +346,7 @@ public class LWJGLUtil { */ public static String[] getLibraryPaths(String libname, String[] platform_lib_names, ClassLoader classloader) { // need to pass path of possible locations of library to native side - List possible_paths = new ArrayList(); + List possible_paths = new ArrayList<>(); String classloader_path = getPathFromClassLoader(libname, classloader); if (classloader_path != null) { @@ -412,13 +413,11 @@ public class LWJGLUtil { while (c != null) { final Class clazz = c; try { - return AccessController.doPrivileged(new PrivilegedExceptionAction() { - public String run() throws Exception { - Method findLibrary = clazz.getDeclaredMethod("findLibrary", String.class); - findLibrary.setAccessible(true); - String path = (String) findLibrary.invoke(classloader, libname); - return path; - } + return AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Method findLibrary = clazz.getDeclaredMethod("findLibrary", String.class); + findLibrary.setAccessible(true); + String path = (String) findLibrary.invoke(classloader, libname); + return path; }); } catch (PrivilegedActionException e) { log("Failed to locate findLibrary method: " + e.getCause()); @@ -529,7 +528,7 @@ public class LWJGLUtil { */ public static Map getClassTokens( final TokenFilter filter, Map target, final Iterable tokenClasses) { - if (target == null) target = new HashMap(); + if (target == null) target = new HashMap<>(); final int TOKEN_MODIFIERS = Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL; diff --git a/src/main/java/org/lwjglx/openal/ALCdevice.java b/src/main/java/org/lwjglx/openal/ALCdevice.java index b6ecdcb..d046fcc 100644 --- a/src/main/java/org/lwjglx/openal/ALCdevice.java +++ b/src/main/java/org/lwjglx/openal/ALCdevice.java @@ -56,7 +56,7 @@ public final class ALCdevice { private boolean valid; /** List of contexts belonging to the device */ - private final HashMap contexts = new HashMap(); + private final HashMap contexts = new HashMap<>(); /** * Creates a new instance of ALCdevice diff --git a/src/main/java/org/lwjglx/opengl/Sync.java b/src/main/java/org/lwjglx/opengl/Sync.java index e2124ea..2a46e5f 100644 --- a/src/main/java/org/lwjglx/opengl/Sync.java +++ b/src/main/java/org/lwjglx/opengl/Sync.java @@ -110,12 +110,10 @@ class Sync { // over 10ms making in unusable. However it can be forced to // be a bit more accurate by running a separate sleeping daemon // thread. - Thread timerAccuracyThread = new Thread(new Runnable() { - public void run() { - try { - Thread.sleep(Long.MAX_VALUE); - } catch (Exception e) { - } + Thread timerAccuracyThread = new Thread(() -> { + try { + Thread.sleep(Long.MAX_VALUE); + } catch (Exception e) { } }); @@ -159,8 +157,8 @@ class Sync { public long avg() { long sum = 0; - for (int i = 0; i < this.slots.length; i++) { - sum += this.slots[i]; + for (long slot : this.slots) { + sum += slot; } return sum / this.slots.length; } diff --git a/src/main/java/org/lwjglx/test/spaceinvaders/Game.java b/src/main/java/org/lwjglx/test/spaceinvaders/Game.java index 9d62b29..0f46441 100644 --- a/src/main/java/org/lwjglx/test/spaceinvaders/Game.java +++ b/src/main/java/org/lwjglx/test/spaceinvaders/Game.java @@ -82,10 +82,10 @@ public class Game { private TextureLoader textureLoader; /** The list of all the entities that exist in our game */ - private ArrayList entities = new ArrayList(); + private ArrayList entities = new ArrayList<>(); /** The list of entities that need to be removed from the game this loop */ - private ArrayList removeList = new ArrayList(); + private ArrayList removeList = new ArrayList<>(); /** The entity representing the player */ private ShipEntity ship; diff --git a/src/main/java/org/lwjglx/test/spaceinvaders/TextureLoader.java b/src/main/java/org/lwjglx/test/spaceinvaders/TextureLoader.java index 7c4b7a1..d8c070c 100644 --- a/src/main/java/org/lwjglx/test/spaceinvaders/TextureLoader.java +++ b/src/main/java/org/lwjglx/test/spaceinvaders/TextureLoader.java @@ -69,7 +69,7 @@ import org.lwjglx.BufferUtils; */ public class TextureLoader { /** The table of textures that have been loaded in this loader */ - private HashMap table = new HashMap(); + private HashMap table = new HashMap<>(); /** The colour model including alpha for the GL image */ private ColorModel glAlphaColorModel; @@ -238,10 +238,10 @@ public class TextureLoader { // for a texture if (bufferedImage.getColorModel().hasAlpha()) { raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, texWidth, texHeight, 4, null); - texImage = new BufferedImage(glAlphaColorModel, raster, false, new Hashtable()); + texImage = new BufferedImage(glAlphaColorModel, raster, false, new Hashtable<>()); } else { raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, texWidth, texHeight, 3, null); - texImage = new BufferedImage(glColorModel, raster, false, new Hashtable()); + texImage = new BufferedImage(glColorModel, raster, false, new Hashtable<>()); } // copy the source image into the produced image diff --git a/src/main/java/org/lwjglx/util/Display.java b/src/main/java/org/lwjglx/util/Display.java index 8bd6128..dc9214a 100644 --- a/src/main/java/org/lwjglx/util/Display.java +++ b/src/main/java/org/lwjglx/util/Display.java @@ -76,7 +76,7 @@ public final class Display { } } - ArrayList matches = new ArrayList(modes.length); + ArrayList matches = new ArrayList<>(modes.length); for (int i = 0; i < modes.length; i++) { assert modes[i] != null : "" + i + " " + modes.length; diff --git a/src/main/java/org/lwjglx/util/XPMFile.java b/src/main/java/org/lwjglx/util/XPMFile.java index d40ef74..cfddeff 100644 --- a/src/main/java/org/lwjglx/util/XPMFile.java +++ b/src/main/java/org/lwjglx/util/XPMFile.java @@ -125,7 +125,7 @@ public class XPMFile { private void readImage(InputStream is) { try { LineNumberReader reader = new LineNumberReader(new InputStreamReader(is)); - HashMap colors = new HashMap(); + HashMap colors = new HashMap<>(); format = parseFormat(nextLineOfInterest(reader)); diff --git a/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java index ee62def..5505814 100644 --- a/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java +++ b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java @@ -1146,11 +1146,8 @@ class Sweep { * This order is maintained in a dynamic dictionary. */ { /* __gl_dictListNewDict */ - tess.dict = Dict.dictNewDict(tess, new Dict.DictLeq() { - public boolean leq(Object frame, Object key1, Object key2) { - return EdgeLeq(tess, (ActiveRegion) key1, (ActiveRegion) key2); - } - }); + tess.dict = + Dict.dictNewDict(tess, (frame, key1, key2) -> EdgeLeq(tess, (ActiveRegion) key1, (ActiveRegion) key2)); if (tess.dict == null) throw new RuntimeException(); AddSentinel(tess, -SENTINEL_COORD); @@ -1224,11 +1221,7 @@ class Sweep { GLUvertex v, vHead; /* __gl_pqSortNewPriorityQ */ - pq = tess.pq = PriorityQ.pqNewPriorityQ(new PriorityQ.Leq() { - public boolean leq(Object key1, Object key2) { - return Geom.VertLeq(((GLUvertex) key1), (GLUvertex) key2); - } - }); + pq = tess.pq = PriorityQ.pqNewPriorityQ((key1, key2) -> Geom.VertLeq(((GLUvertex) key1), (GLUvertex) key2)); if (pq == null) return false; vHead = tess.mesh.vHead;