Skip to content

Commit 125ae5b

Browse files
update parameter to expandLevel
1 parent 6f1ac7e commit 125ae5b

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public TmfModelResponse<TmfTreeModel<M>> fetchTree(Map<String, Object> fetchPara
106106
boolean isComplete = true;
107107
List<Entry<M, Object>> entries = new ArrayList<>();
108108
List<ITableColumnDescriptor> columnDescriptor = null;
109-
boolean collapseChildren = false;
109+
int expandLevel = -1;
110110

111111
Table<Object, Long, @NonNull M> scopedEntries = HashBasedTable.create();
112112
for (P dataProvider : fProviders) {
@@ -156,7 +156,7 @@ public TmfModelResponse<TmfTreeModel<M>> fetchTree(Map<String, Object> fetchPara
156156
if (columnDescriptor == null) {
157157
columnDescriptor = model.getColumnDescriptors();
158158
}
159-
collapseChildren = model.isCollapseChildren();
159+
expandLevel = model.getExpandLevel();
160160
}
161161
if (monitor != null && monitor.isCanceled()) {
162162
return new TmfModelResponse<>(null, ITmfResponse.Status.CANCELLED, CommonStatusMessage.TASK_CANCELLED);
@@ -169,7 +169,7 @@ public TmfModelResponse<TmfTreeModel<M>> fetchTree(Map<String, Object> fetchPara
169169
}
170170
treeModelBuilder.setColumnDescriptors(columnDescriptor)
171171
.setEntries(Lists.transform(entries, e -> e.getKey()))
172-
.setCollapseChildren(collapseChildren);
172+
.setExpandLevel(expandLevel);
173173

174174
if (isComplete) {
175175
return new TmfModelResponse<>(treeModelBuilder.build(), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);

tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeModel.java

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ public class TmfTreeModel<T extends ITmfTreeDataModel> {
3535
private List<ITableColumnDescriptor> fColumnDescriptors;
3636
private List<T> fEntries;
3737
private @Nullable String fScope;
38-
private boolean fCollapseChildren = false;
38+
/*
39+
* Indicates which level of the tree should be expanded. If expandLevel is missing or has value of -1 it
40+
* would mean that all the levels are expanded (default behaviour). If the expandLevel is set to 1 for
41+
* example, it will expand to the first nodes under the root.
42+
*/
43+
private int fExpandLevel = -1;
3944

4045
/**
4146
* Constructor
@@ -89,7 +94,7 @@ private TmfTreeModel(Builder<T> builder) {
8994
fColumnDescriptors = builder.fColumnDescriptors;
9095
fEntries = builder.fEntries;
9196
fScope = builder.fScope;
92-
fCollapseChildren = builder.fCollapseChildren;
97+
fExpandLevel = builder.fExpandLevel;
9398
}
9499

95100
/**
@@ -123,15 +128,15 @@ public List<T> getEntries() {
123128
/**
124129
* @return
125130
*/
126-
public boolean isCollapseChildren() {
127-
return fCollapseChildren;
131+
public boolean getExpandLevel() {
132+
return fExpandLevel;
128133
}
129134

130135
/**
131-
* @param collapseChildren
136+
* @param expandLevel
132137
*/
133-
public void setCollapseChildren(boolean collapseChildren) {
134-
this.fCollapseChildren = collapseChildren;
138+
public void setExpandLevel(int expandLevel) {
139+
this.fExpandLevel = expandLevel;
135140
}
136141

137142
/**
@@ -147,7 +152,7 @@ public static class Builder<T extends ITmfTreeDataModel> {
147152
private List<ITableColumnDescriptor> fColumnDescriptors = new ArrayList<>();
148153
private List<T> fEntries;
149154
private @Nullable String fScope;
150-
private boolean fCollapseChildren = false;
155+
private int fExpandLevel = -1;
151156

152157
/**
153158
* Constructor
@@ -193,14 +198,14 @@ public Builder<T> setScope(String scope) {
193198
}
194199

195200
/**
196-
* Sets whether children should be collapsed
201+
* Sets which level of the tree should be expanded
197202
*
198-
* @param collapseChildren
199-
* true if children should be collapsed, false otherwise
203+
* @param expandLevel
204+
* expand level of the tree model
200205
* @return this {@link Builder} object
201206
*/
202-
public Builder<T> setCollapseChildren(boolean collapseChildren) {
203-
fCollapseChildren = collapseChildren;
207+
public Builder<T> setExpandLevel(boolean expandLevel) {
208+
fExpandLevel = expandLevel;
204209
return this;
205210
}
206211

0 commit comments

Comments
 (0)