Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JPDA Evaluator: Value, Description and Children should not be fetched on the EDT #5877

Merged
merged 1 commit into from
Jun 10, 2023
Merged

JPDA Evaluator: Value, Description and Children should not be fetched on the EDT #5877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 37 additions & 6 deletions ...r.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/EvaluatorTableModelFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,55 @@

import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.Executor;
import org.netbeans.api.debugger.jpda.JPDADebugger;
import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
import org.netbeans.spi.debugger.ContextProvider;
import org.netbeans.spi.debugger.DebuggerServiceRegistration;
import org.netbeans.spi.debugger.ui.CodeEvaluator;
import org.netbeans.spi.debugger.ui.CodeEvaluator.Result.DefaultHistoryItem;
import org.netbeans.spi.debugger.ui.Constants;
import org.netbeans.spi.viewmodel.AsynchronousModelFilter;
import org.netbeans.spi.viewmodel.ModelListener;
import org.netbeans.spi.viewmodel.TableModel;
import org.netbeans.spi.viewmodel.TableModelFilter;
import org.netbeans.spi.viewmodel.UnknownTypeException;

import static org.netbeans.spi.viewmodel.AsynchronousModelFilter.CALL.CHILDREN;
import static org.netbeans.spi.viewmodel.AsynchronousModelFilter.CALL.DISPLAY_NAME;
import static org.netbeans.spi.viewmodel.AsynchronousModelFilter.CALL.SHORT_DESCRIPTION;
import static org.netbeans.spi.viewmodel.AsynchronousModelFilter.CALL.VALUE;
import static org.netbeans.spi.viewmodel.AsynchronousModelFilter.CURRENT_THREAD;

@DebuggerServiceRegistration(path="netbeans-JPDASession/ResultsView",
types=TableModelFilter.class,
types = { TableModelFilter.class, AsynchronousModelFilter.class },
position=330)
public class EvaluatorTableModelFilter implements TableModelFilter {
public class EvaluatorTableModelFilter implements TableModelFilter, AsynchronousModelFilter {

private final Collection<ModelListener> listeners = new HashSet<ModelListener>();
private final Executor rp;
private final Collection<ModelListener> listeners = new HashSet<>();

public EvaluatorTableModelFilter() {
public EvaluatorTableModelFilter(ContextProvider lookupProvider) {
JPDADebuggerImpl debugger = (JPDADebuggerImpl) lookupProvider.
lookupFirst(null, JPDADebugger.class);
rp = debugger.getRequestProcessor();
}

@Override
public void addModelListener(ModelListener l) {
synchronized (listeners) {
listeners.add (l);
}
}

@Override
public void removeModelListener (ModelListener l) {
synchronized (listeners) {
listeners.remove (l);
}
}

@Override
@SuppressWarnings("ConvertToStringSwitch")
public Object getValueAt(TableModel original, Object node, String columnID) throws UnknownTypeException {
if (node instanceof DefaultHistoryItem) {
DefaultHistoryItem item = (DefaultHistoryItem) node;
Expand All @@ -71,18 +88,32 @@ public Object getValueAt(TableModel original, Object node, String columnID) thro
return original.getValueAt(node, columnID);
}

@Override
public boolean isReadOnly(TableModel original, Object node, String columnID) throws UnknownTypeException {
if (node instanceof DefaultHistoryItem || node instanceof EvaluatorTreeModel.HistoryNode) {
return true;
}
return original.isReadOnly(node, columnID);
}

@Override
public void setValueAt(TableModel original, Object node, String columnID, Object value) throws UnknownTypeException {
if (node instanceof DefaultHistoryItem || node instanceof EvaluatorTreeModel.HistoryNode) {
return;
}
original.setValueAt(node, columnID, value);
}

@Override
public Executor asynchronous(Executor exec, CALL asynchCall, Object object) {
switch (asynchCall) {
case VALUE:
case CHILDREN:
case SHORT_DESCRIPTION:
return rp;
case DISPLAY_NAME:
return CURRENT_THREAD;
}
return null; // ??
}
}