From 717b2e466ce5963e7e324a2193f92b1d4ccf0452 Mon Sep 17 00:00:00 2001 From: Konloch Date: Sun, 11 Jul 2021 02:17:46 -0700 Subject: [PATCH] Main Viewer GUI Cleanup --- .../bytecode/club/bytecodeviewer/gui/MainViewerGUI.java | 9 --------- .../bytecodeviewer/gui/resourcesearch/PerformSearch.java | 4 ++-- .../resources/importing/ImportResource.java | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java index 8b842fe1..271a099d 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java @@ -777,15 +777,6 @@ public class MainViewerGUI extends JFrame public void openFile(final ResourceContainer container, final String name, byte[] content) { workPane.addFileResource(container, name, content); } - - @SuppressWarnings("unchecked") - public static T getComponent(final Class clazz) { - for (final VisibleComponent vc : uiComponents) { - if (vc.getClass() == clazz) - return (T) vc; - } - return null; - } public void compileOnNewThread() { diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/PerformSearch.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/PerformSearch.java index b594417d..830c1cca 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/PerformSearch.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/PerformSearch.java @@ -46,8 +46,8 @@ class PerformSearch extends BackgroundSearchThread for (ClassNode c : container.resourceClasses.values()) searchBoxPane.searchType.details.search(container, c, srn, searchBoxPane.exact.isSelected()); - Objects.requireNonNull(MainViewerGUI.getComponent(SearchBoxPane.class)).search.setEnabled(true); - Objects.requireNonNull(MainViewerGUI.getComponent(SearchBoxPane.class)).search.setText(TranslatedStrings.SEARCH.getText()); + BytecodeViewer.viewer.searchBoxPane.search.setEnabled(true); + BytecodeViewer.viewer.searchBoxPane.search.setText(TranslatedStrings.SEARCH.getText()); searchBoxPane.tree.expandPath(new TreePath(searchBoxPane.tree.getModel().getRoot())); searchBoxPane.tree.updateUI(); diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java index 2239f23b..ee4be323 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/ImportResource.java @@ -93,7 +93,7 @@ public class ImportResource implements Runnable { BytecodeViewer.updateBusyStatus(false); try { - Objects.requireNonNull(MainViewerGUI.getComponent(ResourceListPane.class)).updateTree(); + BytecodeViewer.viewer.resourcePane.updateTree(); } catch (NullPointerException ignored) { } } }