From 34285c27b43ee46f2f275336fdb426c53f6b851d Mon Sep 17 00:00:00 2001 From: sschr15 Date: Sun, 14 Nov 2021 12:44:43 -0600 Subject: [PATCH 1/2] fix (somehow many?) bugs occurring on (seemingly only) Windows --- pom.xml | 2 +- .../gui/components/MethodsRenderer.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8dd1d8f2..a8174aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ the.bytecode.club Bytecode-Viewer - 2.10.16 + 2.10.17 diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MethodsRenderer.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MethodsRenderer.java index 31b503d3..e63fa900 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MethodsRenderer.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/MethodsRenderer.java @@ -1,9 +1,12 @@ package the.bytecode.club.bytecodeviewer.gui.components; import java.awt.Component; +import java.util.List; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; + +import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel; import the.bytecode.club.bytecodeviewer.gui.util.BytecodeViewPanelUpdater; import the.bytecode.club.bytecodeviewer.util.MethodParser; @@ -44,8 +47,16 @@ public class MethodsRenderer extends JLabel implements ListCellRenderer public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - MethodParser methods = bytecodeViewPanelUpdater.viewer.methods.get(bytecodeViewPanelUpdater.bytecodeViewPanel.decompiler.ordinal()); - MethodParser.Method method = methods.getMethod((Integer) value); + int methodIndex = (Integer) value; + MethodParser methods; + List methodParsers = bytecodeViewPanelUpdater.viewer.methods; + BytecodeViewPanel bytecodeViewPanel = bytecodeViewPanelUpdater.bytecodeViewPanel; + try { + methods = methodParsers.get(bytecodeViewPanel.decompiler.ordinal()); + } catch (ArrayIndexOutOfBoundsException e) { + methods = methodParsers.get(bytecodeViewPanel.panelIndex); + } + MethodParser.Method method = methods.getMethod(methodIndex); setText(method.toString()); return this; } From 8a5f1861526a5b0ebdffb44086f8c00d66802130 Mon Sep 17 00:00:00 2001 From: sschr15 Date: Sun, 14 Nov 2021 13:09:41 -0600 Subject: [PATCH 2/2] undo version increment --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8174aa6..8dd1d8f2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ the.bytecode.club Bytecode-Viewer - 2.10.17 + 2.10.16