select correct tab opcodechooser

GraxCode · Aug 11, 2019 · 8b027b4 · 8b027b4
1 parent 061a743
commit 8b027b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/me/nov/cafebabe/gui/opchooser/OpcodeChooserPane.java b/src/me/nov/cafebabe/gui/opchooser/OpcodeChooserPane.java
@@ -46,6 +46,7 @@ public OpcodeChooserPane(OpcodeChooserDialog chooser, AbstractInsnNode ain) {
 				CALOAD, SALOAD, IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, SASTORE))));
 		this.addTab(Translations.get("Other"), new JScrollPane(
 				addList(new OpList(chooser, TABLESWITCH, LOOKUPSWITCH, MONITORENTER, MONITOREXIT, IINC, NOP, JSR, RET))));
+		this.refresh();
 	}
 
 	private OpList addList(OpList opList) {
@@ -54,8 +55,11 @@ private OpList addList(OpList opList) {
 	}
 
 	public void refresh() {
-		for (OpList ol : lists) {
-			ol.refresh();
+		for (int i = 0; i < lists.size(); i++) {
+			OpList ol = lists.get(i);
+			if(ol.refresh()) {
+				setSelectedIndex(i);
+			}
 		}
 	}
 

diff --git a/src/me/nov/cafebabe/gui/smalleditor/list/OpList.java b/src/me/nov/cafebabe/gui/smalleditor/list/OpList.java
@@ -25,8 +25,6 @@ public OpList(OpcodeChooserDialog chooser, int... opcodes) {
 			llm.addElement(new OpcodeNode(opcode));
 		}
 		this.setModel(llm);
-		this.refresh();
-		this.repaint();
 		for (MouseListener ml : this.getMouseListeners())
 			this.removeMouseListener(ml);
 		this.addMouseListener(new MouseAdapter() {
@@ -43,16 +41,19 @@ public void mouseClicked(MouseEvent evt) {
 
 	}
 
-	public void refresh() {
+	public boolean refresh() {
 		clearSelection();
 		int i = 0;
 		if (opcodes != null)
 			for (int opcode : opcodes) {
 				if (chooser.getOpcode() == opcode) {
 					setSelectedIndex(i);
+					super.repaint();
+					return true;
 				}
 				i++;
 			}
 		super.repaint();
+		return false;
 	}
 }