eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant boxing and casting (#51)

Browse Source 
remove redundant boxing and casting
This commit is contained in:
Ben Fry
2020-01-20 07:29:44 -05:00
committed by GitHub
parent d259373553 108f9b6a6b
commit 4a6cdf5252
7 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/awt/PSurfaceAWT.java
+4 -4
View File
@@ -633,8 +633,8 @@ public class PSurfaceAWT extends PSurfaceNone {
Class<?> thinkDifferent =
Thread.currentThread().getContextClassLoader().loadClass(td);
Method method =
thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
method.invoke(null, new Object[] { awtImage });
thinkDifferent.getMethod("setIconImage", Image.class);
method.invoke(null, awtImage);
} catch (Exception e) {
e.printStackTrace(); // That's unfortunate
}
@@ -691,8 +691,8 @@ public class PSurfaceAWT extends PSurfaceNone {
Class<?> thinkDifferent =
Thread.currentThread().getContextClassLoader().loadClass(td);
Method method =
thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
method.invoke(null, new Object[] { Toolkit.getDefaultToolkit().getImage(url) });
thinkDifferent.getMethod("setIconImage", Image.class);
method.invoke(null, Toolkit.getDefaultToolkit().getImage(url));
} catch (Exception e) {
e.printStackTrace(); // That's unfortunate
}
core/src/processing/core/PApplet.java
+10 -21
View File
@@ -1454,18 +1454,7 @@ public class PApplet implements PConstants {
}
}
protected void handleMethods(String methodName) {
synchronized (registerLock) {
RegisteredMethods meth = registerMap.get(methodName);
if (meth != null) {
meth.handle();
}
}
}
protected void handleMethods(String methodName, Object[] args) {
protected void handleMethods(String methodName, Object...args) {
synchronized (registerLock) {
RegisteredMethods meth = registerMap.get(methodName);
if (meth != null) {
@@ -2096,7 +2085,7 @@ public class PApplet implements PConstants {
Class<?> rendererClass =
Thread.currentThread().getContextClassLoader().loadClass(renderer);
Constructor<?> constructor = rendererClass.getConstructor(new Class[] { });
Constructor<?> constructor = rendererClass.getConstructor();
PGraphics pg = (PGraphics) constructor.newInstance();
pg.setParent(this);
@@ -2580,7 +2569,7 @@ public class PApplet implements PConstants {
break;
}
handleMethods("mouseEvent", new Object[] { event });
handleMethods("mouseEvent", event);
switch (action) {
case MouseEvent.PRESS:
@@ -2852,7 +2841,7 @@ public class PApplet implements PConstants {
}
*/
handleMethods("keyEvent", new Object[] { event });
handleMethods("keyEvent", event);
// if someone else wants to intercept the key, they should
// set key to zero (or something besides the ESC).
@@ -3689,8 +3678,8 @@ public class PApplet implements PConstants {
*/
public void method(String name) {
try {
Method method = getClass().getMethod(name, new Class[] {});
method.invoke(this, new Object[] { });
Method method = getClass().getMethod(name);
method.invoke(this);
} catch (IllegalArgumentException e) {
e.printStackTrace();
@@ -6150,8 +6139,8 @@ public class PApplet implements PConstants {
try {
Class<?> callbackClass = callbackObject.getClass();
Method selectMethod =
callbackClass.getMethod(callbackMethod, new Class[] { File.class });
selectMethod.invoke(callbackObject, new Object[] { selectedFile });
callbackClass.getMethod(callbackMethod, File.class);
selectMethod.invoke(callbackObject, selectedFile);
} catch (IllegalAccessException iae) {
System.err.println(callbackMethod + "() must be public");
@@ -10236,8 +10225,8 @@ public class PApplet implements PConstants {
Class<?> thinkDifferent =
Thread.currentThread().getContextClassLoader().loadClass(td);
Method method =
thinkDifferent.getMethod("init", new Class[] { PApplet.class });
method.invoke(null, new Object[] { sketch });
thinkDifferent.getMethod("init", PApplet.class);
method.invoke(null, sketch);
} catch (Exception e) {
e.printStackTrace(); // That's unfortunate
}
core/src/processing/data/Table.java
+14 -18
View File
@@ -1062,7 +1062,7 @@ public class Table {
con = target.getDeclaredConstructor(); //new Class[] { });
// PApplet.println("no enclosing class");
} else {
con = target.getDeclaredConstructor(new Class[] { enclosingClass });
con = target.getDeclaredConstructor(enclosingClass);
// PApplet.println("enclosed by " + enclosingClass.getName());
}
if (!con.canAccess(null)) {
@@ -1509,17 +1509,15 @@ public class Table {
entry = new ZipEntry("content.xml");
zos.putNextEntry(entry);
//lines = new String[] {
writeUTF(zos, new String[] {
xmlHeader,
"<office:document-content" +
" xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"" +
" xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"" +
" xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"" +
" office:version=\"1.2\">",
" <office:body>",
" <office:spreadsheet>",
" <table:table table:name=\"Sheet1\" table:print=\"false\">"
});
writeUTF(zos, xmlHeader,
"<office:document-content" +
" xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"" +
" xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"" +
" xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"" +
" office:version=\"1.2\">",
" <office:body>",
" <office:spreadsheet>",
" <table:table table:name=\"Sheet1\" table:print=\"false\">");
//zos.write(PApplet.join(lines, "\n").getBytes());
byte[] rowStart = " <table:table-row>\n".getBytes();
@@ -1546,12 +1544,10 @@ public class Table {
}
//lines = new String[] {
writeUTF(zos, new String[] {
" </table:table>",
" </office:spreadsheet>",
" </office:body>",
"</office:document-content>"
});
writeUTF(zos, " </table:table>",
" </office:spreadsheet>",
" </office:body>",
"</office:document-content>");
//zos.write(PApplet.join(lines, "\n").getBytes());
zos.closeEntry();
core/src/processing/opengl/PGraphicsOpenGL.java
+3 -3
View File
@@ -53,7 +53,7 @@ public class PGraphicsOpenGL extends PGraphics {
// Using the technique alternative to finalization described in:
// http://www.oracle.com/technetwork/articles/java/finalization-137655.html
private static ReferenceQueue<Object> refQueue = new ReferenceQueue<>();
private static List<Disposable<? extends Object>> reachableWeakReferences =
private static List<Disposable<?>> reachableWeakReferences =
new LinkedList<>();
static final private int MAX_DRAIN_GLRES_ITERATIONS = 10;
@@ -61,8 +61,8 @@ public class PGraphicsOpenGL extends PGraphics {
static void drainRefQueueBounded() {
int iterations = 0;
while (iterations < MAX_DRAIN_GLRES_ITERATIONS) {
Disposable<? extends Object> res =
(Disposable<? extends Object>) refQueue.poll();
Disposable<?> res =
(Disposable<?>) refQueue.poll();
if (res == null) {
break;
}
core/src/processing/opengl/PJOGL.java
+1 -1
View File
@@ -1469,7 +1469,7 @@ public class PJOGL extends PGL {
@Override
public void shaderSource(int shader, String source) {
gl2.glShaderSource(shader, 1, new String[] { source }, (int[]) null, 0);
gl2.glShaderSource(shader, 1, new String[] { source }, null, 0);
}
@Override
core/src/processing/opengl/PShapeOpenGL.java
+1 -1
View File
@@ -4681,7 +4681,7 @@ public class PShapeOpenGL extends PShape {
if (family == GROUP) {
if (fragmentedGroup(gl)) {
for (int i = 0; i < childCount; i++) {
((PShapeOpenGL) children[i]).draw(gl);
children[i].draw(gl);
}
} else {
PImage tex = null;
core/src/processing/opengl/Texture.java
+2 -2
View File
@@ -925,7 +925,7 @@ public class Texture implements PConstants {
protected void getSourceMethods() {
try {
disposeBufferMethod = bufferSource.getClass().
getMethod("disposeBuffer", new Class[] { Object.class });
getMethod("disposeBuffer", Object.class);
} catch (Exception e) {
throw new RuntimeException("Provided source object doesn't have a " +
"disposeBuffer method.");
@@ -1659,7 +1659,7 @@ public class Texture implements PConstants {
void dispose() {
try {
// Disposing the native buffer.
disposeBufferMethod.invoke(bufferSource, new Object[] { natBuf });
disposeBufferMethod.invoke(bufferSource, natBuf);
natBuf = null;
rgbBuf = null;
} catch (Exception e) {