summaryrefslogtreecommitdiff
path: root/enigma-swing/src/main/java
diff options
context:
space:
mode:
authorGravatar 2xsaiko2021-01-24 13:19:13 +0100
committerGravatar GitHub2021-01-24 13:19:13 +0100
commit38b46e1e2e7d60f55ee3f661560c692fe680d149 (patch)
treee64f9bd1b8b2767a05f66b35ed20185bd4ae6748 /enigma-swing/src/main/java
parentMerge pull request #341 from Juuxel/structure-panel-prs/fix-switching (diff)
parentFixes open declaration not opening declaration (diff)
downloadenigma-fork-38b46e1e2e7d60f55ee3f661560c692fe680d149.tar.gz
enigma-fork-38b46e1e2e7d60f55ee3f661560c692fe680d149.tar.xz
enigma-fork-38b46e1e2e7d60f55ee3f661560c692fe680d149.zip
Merge pull request #338 from liachmodded/fix/def-browse
Fixes open declaration not opening declaration
Diffstat (limited to 'enigma-swing/src/main/java')
-rw-r--r--enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index a2346f1..f990f98 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -273,7 +273,7 @@ public class GuiController implements ClientPacketHandler {
273 if (entry == null) { 273 if (entry == null) {
274 throw new IllegalArgumentException("Entry cannot be null!"); 274 throw new IllegalArgumentException("Entry cannot be null!");
275 } 275 }
276 openReference(new EntryReference<>(entry, entry.getName())); 276 openReference(EntryReference.declaration(entry, entry.getName()));
277 } 277 }
278 278
279 /** 279 /**
@@ -301,7 +301,7 @@ public class GuiController implements ClientPacketHandler {
301 * @param reference the reference 301 * @param reference the reference
302 */ 302 */
303 private void setReference(EntryReference<Entry<?>, Entry<?>> reference) { 303 private void setReference(EntryReference<Entry<?>, Entry<?>> reference) {
304 gui.openClass(reference.getLocationClassEntry()).showReference(reference); 304 gui.openClass(reference.getLocationClassEntry().getOutermostClass()).showReference(reference);
305 } 305 }
306 306
307 public Collection<Token> getTokensForReference(DecompiledClassSource source, EntryReference<Entry<?>, Entry<?>> reference) { 307 public Collection<Token> getTokensForReference(DecompiledClassSource source, EntryReference<Entry<?>, Entry<?>> reference) {