Skip to content

Sxxx: fix open by all tables was transform #2365

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

Merged
mariusheine merged 1 commit into from
Apr 24, 2026
+12 −6
Merged

Sxxx: fix open by all tables was transform #2365

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions ...undles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/SxxxTableView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ protected void preDestroy() {
protected void createView(final Composite parent) {
super.createView(parent);
addCalculateMissingTablesPanel(parent);
// Move the panel to top position
calculateMissingTablesPanel.moveAbove(parent.getChildren()[0]);
}

@Override
Expand Down Expand Up @@ -174,6 +172,8 @@ public void widgetSelected(final SelectionEvent e) {

calculateMissingTablesPanel = panel;
updateCalculateMissingTablesPanel();
// Move the panel to top of view
calculateMissingTablesPanel.moveAbove(parent.getChildren()[0]);
}

private void updateCalculateMissingTablesPanel() {
Expand Down
5 changes: 3 additions & 2 deletions ...clipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ public Table transformToTable(final TableInfo tableInfo,
return emptyTable;
}
final Table resultTable = TableServiceUtils.filterRequestValue(
EcoreUtil.copy((Table) table), tableType, modelSession,
getModelService(tableInfo), controlAreaIds);
EcoreUtil.copy((Table) table), tableType, tableInfo,
modelSession, getModelService(tableInfo), controlAreaIds);
TableServiceUtils.clearEmptyRow(resultTable);
getModelService(tableInfo).addAdditionRow((Table) table, resultTable);
sortTable(resultTable, tableInfo);
Expand Down Expand Up @@ -629,6 +629,7 @@ public Map<TableInfo, Table> transformTables(final IProgressMonitor monitor,
while (!TableService.isTransformComplete(tableInfo, null)) {
Thread.sleep(2000);
}
storageFootnotes(ToolboxFileRole.SESSION, tableInfo, table);
result.put(tableInfo, table);
monitor.worked(1);
} catch (final Exception e) {
Expand Down
9 changes: 7 additions & 2 deletions ...lipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,16 @@ public static void calculateAllMissingTables(
}

protected static Table filterRequestValue(final Table table,
final TableType tableType, final IModelSession modelsession,
final TableType tableType, final TableInfo tableInfo,
final IModelSession modelsession,
final PlanPro2TableTransformationService transformationService,
final Set<String> controlAreaIds) {
final Table result = filterTableByState(table, tableType);

// Worknotes table need only regard on table state
if (tableInfo.shortcut()
.equalsIgnoreCase(ToolboxConstants.WORKNOTES_TABLE_SHORTCUT)) {
return result;
}
if (tableType == TableType.DIFF) {
filterRowGroupBelongToControlAreaByDiffState(result, modelsession,
transformationService, controlAreaIds);
Expand Down
Loading