projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed MainMachineLaunchConfigTab in the Wizard
[Mograsim.git]
/
plugins
/
net.mograsim.plugin.core
/
src
/
net
/
mograsim
/
plugin
/
tables
/
mi
/
RowHighlighter.java
diff --git
a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/RowHighlighter.java
b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/RowHighlighter.java
index
18e0108
..
e7435a2
100644
(file)
--- a/
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/RowHighlighter.java
+++ b/
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/RowHighlighter.java
@@
-1,54
+1,46
@@
package net.mograsim.plugin.tables.mi;
package net.mograsim.plugin.tables.mi;
-import java.util.
concurrent.atomic.AtomicBoolean
;
+import java.util.
Optional
;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Table;
import net.mograsim.plugin.tables.LazyTableViewer;
import org.eclipse.swt.widgets.Table;
import net.mograsim.plugin.tables.LazyTableViewer;
+import net.mograsim.plugin.util.SingleSWTRequest;
public class RowHighlighter
{
public class RowHighlighter
{
- private int highlighted
, toHighlight
;
+ private int highlighted
= -1
;
private LazyTableViewer viewer;
private LazyTableViewer viewer;
- private AtomicBoolean waiting = new AtomicBoolean();
+ private FontAndColorHelper cProv;
+ private SingleSWTRequest requester = new SingleSWTRequest();
- public RowHighlighter(LazyTableViewer viewer)
+ public RowHighlighter(LazyTableViewer viewer
, FontAndColorHelper cProv
)
{
this.viewer = viewer;
{
this.viewer = viewer;
+ this.cProv = cProv;
}
public void highlight(int row)
{
}
public void highlight(int row)
{
- synchronized (waiting)
+ requester.request(() ->
{
{
- toHighlight = row;
- if (!waiting.get())
- {
- waiting.set(true);
- Display.getDefault().asyncExec(() ->
- {
- synchronized (waiting)
- {
- waiting.set(false);
- if (!viewer.getTable().isDisposed())
- innerHighlight(toHighlight);
- }
- });
- }
- }
+ if (!viewer.getTable().isDisposed())
+ innerHighlight(row);
+ });
}
private void innerHighlight(int row)
{
}
private void innerHighlight(int row)
{
-
viewer.highlightRow(highlighted, false
);
-
highlighted = row
;
+
Table table = viewer.getTable(
);
+
cProv.highlight(row)
;
if (row != -1)
{
if (row != -1)
{
- viewer.highlightRow(row, true);
- Table table = viewer.getTable();
table.showItem(table.getItem(Math.min(table.getItemCount(), row + 2)));
table.showItem(table.getItem(row));
table.showItem(table.getItem(Math.min(table.getItemCount(), row + 2)));
table.showItem(table.getItem(row));
+ Optional.ofNullable(table.getItem(row).getData()).ifPresent(d -> viewer.update(d, null));
}
}
+ if (highlighted != -1)
+ Optional.ofNullable(table.getItem(highlighted).getData()).ifPresent(d -> viewer.update(d, null));
+ highlighted = row;
}
}
}
}