summaryrefslogtreecommitdiff
path: root/enigma-swing/src/main/java
diff options
context:
space:
mode:
authorGravatar Yanis482020-12-15 21:23:08 +0100
committerGravatar Yanis482020-12-15 21:23:08 +0100
commit8f9df2a0b2167e79d5ef3e0373998dcada143246 (patch)
tree9e8003ad82de75eba2ada58313cf4770dce6dcb9 /enigma-swing/src/main/java
parentavoid duplicate logic (diff)
parentAdd separate constructor icon (#3) (diff)
downloadenigma-8f9df2a0b2167e79d5ef3e0373998dcada143246.tar.gz
enigma-8f9df2a0b2167e79d5ef3e0373998dcada143246.tar.xz
enigma-8f9df2a0b2167e79d5ef3e0373998dcada143246.zip
Merge branch 'structure-panel' of https://github.com/YanisBft/Enigma into structure-panel
Diffstat (limited to 'enigma-swing/src/main/java')
-rw-r--r--enigma-swing/src/main/java/cuchaz/enigma/gui/panels/StructurePanel.java6
-rw-r--r--enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java1
2 files changed, 6 insertions, 1 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/StructurePanel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/StructurePanel.java
index 32f803f8..d6044dc7 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/StructurePanel.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/StructurePanel.java
@@ -89,7 +89,7 @@ public class StructurePanel extends JPanel {
89 if (entry instanceof ClassEntry) { 89 if (entry instanceof ClassEntry) {
90 this.label.setIcon(GuiUtil.CLASS_ICON); 90 this.label.setIcon(GuiUtil.CLASS_ICON);
91 } else if (entry instanceof MethodEntry) { 91 } else if (entry instanceof MethodEntry) {
92 this.label.setIcon(GuiUtil.METHOD_ICON); 92 this.label.setIcon(isConstructor(entry) ? GuiUtil.CONSTRUCTOR_ICON : GuiUtil.METHOD_ICON);
93 } else if (entry instanceof FieldEntry) { 93 } else if (entry instanceof FieldEntry) {
94 this.label.setIcon(GuiUtil.FIELD_ICON); 94 this.label.setIcon(GuiUtil.FIELD_ICON);
95 } 95 }
@@ -98,5 +98,9 @@ public class StructurePanel extends JPanel {
98 98
99 return this.label; 99 return this.label;
100 } 100 }
101
102 private boolean isConstructor(ParentedEntry<?> entry) {
103 return "<init>".equals(entry.getName());
104 }
101 } 105 }
102} 106}
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java
index 666fc0aa..6393913d 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java
@@ -18,6 +18,7 @@ public class GuiUtil {
18 public static final Icon CLASS_ICON = loadIcon("class"); 18 public static final Icon CLASS_ICON = loadIcon("class");
19 public static final Icon METHOD_ICON = loadIcon("method"); 19 public static final Icon METHOD_ICON = loadIcon("method");
20 public static final Icon FIELD_ICON = loadIcon("field"); 20 public static final Icon FIELD_ICON = loadIcon("field");
21 public static final Icon CONSTRUCTOR_ICON = loadIcon("constructor");
21 22
22 public static void openUrl(String url) { 23 public static void openUrl(String url) {
23 try { 24 try {