Tools/SCViewer
Tools
/
SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix tree node issue

This commit is contained in:
Eyck Jentzsch 2020-07-26 14:57:09 +02:00
parent 2a71ab94f5
commit 796a04b981
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java
View File

@ -21,6 +21,7 @@ import com.google.common.collect.Collections2;
import com.minres.scviewer.database.IHierNode; import com.minres.scviewer.database.IHierNode;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb; import com.minres.scviewer.database.IWaveformDb;
import com.minres.scviewer.e4.application.parts.LoadingWaveformDb;
/** /**
* The Class TxDbContentProvider providing the tree content of a database for the respective viewer. * The Class TxDbContentProvider providing the tree content of a database for the respective viewer.
@ -29,24 +30,24 @@ public class TxDbContentProvider implements ITreeContentProvider {
/** The show nodes. */ /** The show nodes. */
// private List<HierNode> nodes; // private List<HierNode> nodes;
private boolean showNodes; private boolean tabelEntries;
/** /**
* Instantiates a new tx db content provider. * Instantiates a new tx db content provider.
*/ */
public TxDbContentProvider() { public TxDbContentProvider() {
super(); super();
this.showNodes = false; this.tabelEntries = false;
} }
/** /**
* Instantiates a new tx db content provider. * Instantiates a new tx db content provider.
* *
* @param showNodes the show nodes * @param tableEntries get nodes for waveform table entries
*/ */
public TxDbContentProvider(boolean showNodes) { public TxDbContentProvider(boolean tableEntries) {
super(); super();
this.showNodes = showNodes; this.tabelEntries = tableEntries;
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -60,7 +61,6 @@ public class TxDbContentProvider implements ITreeContentProvider {
*/ */
@Override @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// showNodes=!(newInput instanceof IHierNode);
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -68,13 +68,13 @@ public class TxDbContentProvider implements ITreeContentProvider {
*/ */
@Override @Override
public Object[] getElements(Object inputElement) { public Object[] getElements(Object inputElement) {
if(inputElement instanceof IWaveformDb){ if(tabelEntries && inputElement instanceof IWaveformDb){
return new Object[]{}; return new Object[]{};
}else if(inputElement instanceof IHierNode){ }else if(inputElement instanceof IHierNode){
Collection<IHierNode> res = Collections2.filter(((IHierNode)inputElement).getChildNodes(), new Predicate<IHierNode>(){ Collection<IHierNode> res = Collections2.filter(((IHierNode)inputElement).getChildNodes(), new Predicate<IHierNode>(){
@Override @Override
public boolean apply(IHierNode arg0) { public boolean apply(IHierNode arg0) {
if(showNodes){ if(tabelEntries){
return arg0 instanceof IWaveform; return arg0 instanceof IWaveform;
} else{ } else{
return arg0.getChildNodes().size()!=0; return arg0.getChildNodes().size()!=0;