- * This is done because selection construction can be very expensive as the
- * selected set grows larger when the user is pressing shift+arrow keys.
- * GraphExplorerImpl will naturally listen to all changes in the tree
- * selection, but as an optimization will not construct new
- * StructuredSelection instances for every selection change event. A new
- * selection will be constructed and set only if the selection hasn't
- * changed for the amount of milliseconds specified by this constant.
- */
- private static final long SELECTION_CHANGE_QUIET_TIME = 150;
-
private final IThreadWorkQueue thread;
/**
@@ -326,11 +310,11 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
Tree tree;
@SuppressWarnings({ "rawtypes" })
- final HashMap, NodeQueryProcessor> processors = new HashMap, NodeQueryProcessor>();
+ final HashMap, NodeQueryProcessor> processors = new HashMap<>();
@SuppressWarnings({ "rawtypes" })
- final HashMap
*/
- BijectionMap contextToItem = new BijectionMap();
+ BijectionMap contextToItem = new BijectionMap<>();
/**
* Columns of the UI viewer. Use {@link #setColumns(Column[])} to
* initialize.
*/
Column[] columns = new Column[0];
- Map columnKeyToIndex = new HashMap();
+ Map columnKeyToIndex = new HashMap<>();
boolean refreshingColumnSizes = false;
boolean columnsAreVisible = true;
@@ -535,19 +519,19 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
/** Set to true when the Tree widget is disposed. */
private boolean disposed = false;
- private final CopyOnWriteArrayList focusListeners = new CopyOnWriteArrayList();
- private final CopyOnWriteArrayList mouseListeners = new CopyOnWriteArrayList();
- private final CopyOnWriteArrayList keyListeners = new CopyOnWriteArrayList();
+ private final CopyOnWriteArrayList focusListeners = new CopyOnWriteArrayList<>();
+ private final CopyOnWriteArrayList mouseListeners = new CopyOnWriteArrayList<>();
+ private final CopyOnWriteArrayList keyListeners = new CopyOnWriteArrayList<>();
/** Selection provider */
- private GraphExplorerPostSelectionProvider postSelectionProvider = new GraphExplorerPostSelectionProvider(this);
+ private GraphExplorerPostSelectionProvider postSelectionProvider = new GraphExplorerPostSelectionProvider(this);
protected BasePostSelectionProvider selectionProvider = new BasePostSelectionProvider();
protected SelectionDataResolver selectionDataResolver;
protected SelectionFilter selectionFilter;
- protected BinaryFunction selectionTransformation = new BinaryFunction() {
+ protected BiFunction selectionTransformation = new BiFunction() {
@Override
- public Object[] call(GraphExplorer explorer, Object[] objects) {
+ public Object[] apply(GraphExplorer explorer, Object[] objects) {
Object[] result = new Object[objects.length];
for (int i = 0; i < objects.length; i++) {
IHintContext context = new AdaptableHintContext(SelectionHints.KEY_MAIN);
@@ -568,12 +552,12 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
* item was a part of the current selection in which case the selection must
* be updated.
*/
- private final Map selectedItems = new HashMap();
+ private final Map selectedItems = new HashMap<>();
/**
* TODO: specify what this is for
*/
- private final Set selectionRefreshContexts = new HashSet();
+ private final Set selectionRefreshContexts = new HashSet<>();
/**
* If this field is non-null, it means that if {@link #setData(Event)}
@@ -647,7 +631,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
*
* @see #setPendingImages(IProgressMonitor)
*/
- Map imageTasks = new THashMap();
+ Map imageTasks = new THashMap<>();
/**
* A state flag indicating whether the vertical scroll bar was visible for
@@ -711,7 +695,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
updateCounter = 0;
uiUpdateScheduler.schedule(this, 50, TimeUnit.MILLISECONDS);
} else {
- tree.getDisplay().asyncExec(new UpdateRunner(GraphExplorerImpl.this, GraphExplorerImpl.this.explorerContext));
+ tree.getDisplay().asyncExec(new UpdateRunner(GraphExplorerImpl.this));
}
}
@@ -786,7 +770,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
* modified. These are used internally to prevent duplicate edits from being
* initiated which should always be a sensible thing to do.
*/
- private Set currentlyModifiedNodes = new THashSet();
+ private Set currentlyModifiedNodes = new THashSet<>();
private final TreeEditor editor;
private Color invalidModificationColor = null;
@@ -1379,17 +1363,14 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
// Keep track of the previous single selection to help
// decide whether to start editing a tree node on mouse
// downs or not.
- tree.addListener(SWT.Selection, new Listener() {
- @Override
- public void handleEvent(Event event) {
- TreeItem[] selection = tree.getSelection();
- if (selection.length == 1) {
- //for (TreeItem item : selection)
- // System.out.println("selection: " + item);
- previousSingleSelection = selection[0];
- } else {
- previousSingleSelection = null;
- }
+ tree.addListener(SWT.Selection, event -> {
+ TreeItem[] selection = tree.getSelection();
+ if (selection.length == 1) {
+ //for (TreeItem item : selection)
+ // System.out.println("selection: " + item);
+ previousSingleSelection = selection[0];
+ } else {
+ previousSingleSelection = null;
}
});
@@ -1491,39 +1472,33 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
};
tree.addListener(SWT.MouseDown, mouseEditListener);
tree.addListener(SWT.DragDetect, mouseEditListener);
- tree.addListener(SWT.DragDetect, new Listener() {
- @Override
- public void handleEvent(Event event) {
- Point test = new Point(event.x, event.y);
- TreeItem item = tree.getItem(test);
- if(item != null) {
- for(int i=0;i {
+ Point test = new Point(event.x, event.y);
+ TreeItem item = tree.getItem(test);
+ if(item != null) {
+ for(int i=0;i {
+ Point test = new Point(event.x, event.y);
+ TreeItem item = tree.getItem(test);
+ if(item != null) {
+ for(int i=0;i {
+ resetSelectionFromWidget();
+ }));
+ os.addPostSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
+ //System.out.println("OPENSTRATEGY: post selection changed: " + e);
+ resetSelectionFromWidgetAndFirePostSelection(true);
+ }));
// This listener takes care of updating the set of currently selected
// TreeItem instances. This set is needed because we need to know in
@@ -1610,107 +1581,33 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
}
/**
- * Mod count for delaying post selection changed events.
- */
- int postSelectionModCount = 0;
-
- /**
- * Last tree selection modification time for implementing a quiet
- * time for selection changes.
+ * @return the new selection if it was different from the old selection in
+ * {@link #selectionProvider}
*/
- long lastSelectionModTime = System.currentTimeMillis() - 10000;
-
- /**
- * Current target time for the selection to be set. Calculated
- * according to the set quiet time and last selection modification
- * time.
- */
- long selectionSetTargetTime = 0;
+ private ISelection resetSelectionFromWidget() {
+ ISelection widgetSelection = getWidgetSelection();
+// System.out.println("resetSelection()");
+// System.out.println(" provider selection: " + selectionProvider.getSelection());
+// System.out.println(" widget selection: " + widgetSelection);
+ boolean equals = selectionProvider.selectionEquals(widgetSelection);
+ selectionProvider.setSelectionWithoutFiring(widgetSelection);
+ return equals ? null : widgetSelection;
+ }
/**
- * true if delayed selection runnable is current scheduled or
- * running.
+ * @return the new selection if it was different from the old selection in
+ * {@link #selectionProvider}
*/
- boolean delayedSelectionScheduled = false;
-
- Runnable SELECTION_DELAY = new Runnable() {
- @Override
- public void run() {
- if (tree.isDisposed())
- return;
- long now = System.currentTimeMillis();
- long waitTimeLeft = selectionSetTargetTime - now;
- if (waitTimeLeft > 0) {
- // Not enough quiet time, reschedule.
- delayedSelectionScheduled = true;
- tree.getDisplay().timerExec((int) waitTimeLeft, this);
- } else {
- // Time to perform selection, stop rescheduling.
- delayedSelectionScheduled = false;
- resetSelection();
- }
- }
- };
-
- private void widgetSelectionChanged(boolean forceSelectionChange) {
- long modTime = System.currentTimeMillis();
- long delta = modTime - lastSelectionModTime;
- lastSelectionModTime = modTime;
- if (!forceSelectionChange && delta < SELECTION_CHANGE_QUIET_TIME) {
- long msToWait = SELECTION_CHANGE_QUIET_TIME - delta;
- selectionSetTargetTime = modTime + msToWait;
- if (!delayedSelectionScheduled) {
- delayedSelectionScheduled = true;
- tree.getDisplay().timerExec((int) msToWait, SELECTION_DELAY);
- }
- // Make sure that post selection change events do not fire.
- ++postSelectionModCount;
- return;
+ private boolean resetSelectionFromWidgetAndFirePostSelection(boolean force) {
+ ISelection s = resetSelectionFromWidget();
+ boolean fire = s != null || force;
+ if (fire) {
+ //System.out.println("FIRING POST-SELECTION: " + selectionProvider.getSelection());
+ selectionProvider.firePostSelection(selectionProvider.getSelection());
}
-
- // Immediate selection reconstruction.
- resetSelection();
+ return fire;
}
- private void resetSelection() {
- final ISelection selection = getWidgetSelection();
-
- //System.out.println("resetSelection(" + postSelectionModCount + ")");
- //System.out.println(" provider selection: " + selectionProvider.getSelection());
- //System.out.println(" widget selection: " + selection);
-
- selectionProvider.setAndFireNonEqualSelection(selection);
-
- // Implement deferred firing of post selection events
- final int count = ++postSelectionModCount;
- //System.out.println("[" + System.currentTimeMillis() + "] scheduling postSelectionChanged " + count + ": " + selection);
- ThreadUtils.getNonBlockingWorkExecutor().schedule(new Runnable() {
- @Override
- public void run() {
- int newCount = postSelectionModCount;
- // Don't publish selection yet, there's another change incoming.
- //System.out.println("[" + System.currentTimeMillis() + "] checking post selection publish: " + count + " vs. " + newCount + ": " + selection);
- if (newCount != count)
- return;
- //System.out.println("[" + System.currentTimeMillis() + "] " + count + " count equals, firing post selection listeners: " + selection);
-
- if (tree.isDisposed())
- return;
-
- //System.out.println("scheduling fire post selection changed: " + selection);
- tree.getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- if (tree.isDisposed() || selectionProvider == null)
- return;
- //System.out.println("firing post selection changed: " + selection);
- selectionProvider.firePostSelection(selection);
- }
- });
- }
- }, POST_SELECTION_DELAY, TimeUnit.MILLISECONDS);
- }
-
protected void setDefaultProcessors() {
// Add a simple IMAGER query processor that always returns null.
// With this processor no images will ever be shown.
@@ -1812,7 +1709,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
}
@Override
- public void setSelectionTransformation(BinaryFunction f) {
+ public void setSelectionTransformation(BiFunction f) {
this.selectionTransformation = f;
}
@@ -1882,15 +1779,15 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
});
}
}
-
+
private void initializeState() {
if (persistor == null)
return;
+ ExplorerStates.scheduleRead(getRoot(), persistor)
+ .thenAccept(state -> SWTUtils.asyncExec(tree, () -> restoreState(state)));
+ }
- ExplorerState state = persistor.deserialize(
- Platform.getStateLocation(Activator.getDefault().getBundle()).toFile(),
- getRoot());
-
+ private void restoreState(ExplorerState state) {
// topNodeToSet will be processed by #setData when it encounters a
// NodeContext that matches this one.
// topNodePath = state.topNodePath;
@@ -1901,7 +1798,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
if (processor instanceof DefaultIsExpandedProcessor) {
DefaultIsExpandedProcessor isExpandedProcessor = (DefaultIsExpandedProcessor)processor;
for(NodeContext expanded : state.expandedNodes) {
- isExpandedProcessor.setExpanded(expanded, true);
+ isExpandedProcessor.replaceExpanded(expanded, true);
}
}
}
@@ -1946,7 +1843,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
}
persistor.serialize(
- Platform.getStateLocation(Activator.getDefault().getBundle()).toFile(),
+ ExplorerStates.explorerStateLocation(),
getRoot(),
new ExplorerState(topNodePath, topNodePathChildIndex, expandedNodes, columnWidths));
}
@@ -2425,7 +2322,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
// System.out.println("MODCOUNT: " + modCount + " vs. " + count);
if (modCount != count)
return;
- widgetSelectionChanged(true);
+ resetSelectionFromWidgetAndFirePostSelection(false);
}
});
}
@@ -3168,7 +3065,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
}
protected Object[] transformSelection(Object[] objects) {
- return selectionTransformation.call(this, objects);
+ return selectionTransformation.apply(this, objects);
}
protected static Object[] filter(SelectionFilter filter, NodeContext[] contexts) {
@@ -3250,13 +3147,16 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
*/
private void doSetColumns(Column[] cols, Consumer