GP-844: Fixed focus issues, introduced "activation"

This commit is contained in:
Dan
2021-04-12 10:15:48 -04:00
parent 62bd317380
commit 997ab4d9a0
71 changed files with 554 additions and 300 deletions

View File

@@ -89,7 +89,7 @@ public class JdiModelTargetConnector extends JdiModelTargetObjectImpl
}
@Override
public CompletableFuture<Void> select() {
public CompletableFuture<Void> setActive() {
connectors.setDefaultConnector(this);
return CompletableFuture.completedFuture(null);
}

View File

@@ -89,7 +89,7 @@ public class JdiModelTargetProcess extends JdiModelTargetObjectImpl
@Override
@Internal
public CompletableFuture<Void> select() {
public CompletableFuture<Void> setActive() {
return CompletableFuture.completedFuture(null);
///return thread.select();
}

View File

@@ -126,7 +126,7 @@ public class JdiModelTargetStackFrame extends JdiModelTargetObjectImpl implement
}
@Override
public CompletableFuture<Void> select() {
public CompletableFuture<Void> setActive() {
///return frame.select();
return CompletableFuture.completedFuture(null);
}

View File

@@ -299,7 +299,7 @@ public class JdiModelTargetThread extends JdiModelTargetObjectReference implemen
@Override
@Internal
public CompletableFuture<Void> select() {
public CompletableFuture<Void> setActive() {
return CompletableFuture.completedFuture(null);
}

View File

@@ -370,7 +370,7 @@ public class JdiModelTargetVM extends JdiModelTargetObjectImpl implements //
@Override
@Internal
public CompletableFuture<Void> select() {
public CompletableFuture<Void> setActive() {
return CompletableFuture.completedFuture(null);
}

View File

@@ -21,6 +21,6 @@ import ghidra.dbg.jdi.model.iface2.JdiModelTargetObject;
public interface JdiModelSelectableObject extends JdiModelTargetObject {
public CompletableFuture<Void> select();
public CompletableFuture<Void> setActive();
}

View File

@@ -55,7 +55,7 @@ public interface JdiModelTargetFocusScope extends JdiModelTargetObject, TargetFo
if (cur instanceof JdiModelSelectableObject) {
JdiModelSelectableObject sel = (JdiModelSelectableObject) cur;
setFocus(sel);
return sel.select();
return sel.setActive();
}
cur = cur.getParent();
}