Skip to content

Fix table empty row by change area #2363

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 4 commits into from
Apr 24, 2026
Merged

Fix table empty row by change area #2363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6e59e4
Fix table empty row by change area
TruongQuangSB Apr 23, 2026
6db5c7f
Update CellContentExtensions.xtend
TruongQuangSB Apr 23, 2026
3372c04
fix compile
TruongQuangSB Apr 23, 2026
775342a
Apply suggestions from code review
TruongQuangSB Apr 23, 2026
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
22 changes: 10 additions & 12 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 @@ -374,11 +374,9 @@ private static void filterRowGroupBelongToControlAreaByDiffState(
(rowGroup, notBelongToAreaState) -> rowGroup.getRows()
.forEach(row -> handleTableRowNotBelongToArea()
.accept(row, notBelongToAreaState)));
result.getTablecontent().getRowgroups().forEach(group -> {
if (!relevantRowGroup.contains(group)) {
group.getRows().clear();
}
});
result.getTablecontent()
.getRowgroups()
.removeIf(group -> !relevantRowGroup.contains(group));
}

private static <T> List<T> filterElementBelongToControlArea(
Expand Down Expand Up @@ -413,13 +411,13 @@ private static <T> List<T> filterElementBelongToControlArea(

return listElement.stream().filter(ele -> {
final UrObjektEachContainer objEachContainer = getUrObj.apply(ele);

final boolean isInitialObjBelongToAreas = transformationService
.isObjectBelongToRendereArea(objEachContainer.initalObj,
inititalControlAreas);
final boolean isFinalObjBelongToAreas = transformationService
.isObjectBelongToRendereArea(objEachContainer.finalObj,
finalControlAreas);
final boolean isInitialObjBelongToAreas = !inititalControlAreas
.isEmpty()
&& transformationService.isObjectBelongToRendereArea(
objEachContainer.initalObj, inititalControlAreas);
final boolean isFinalObjBelongToAreas = !finalControlAreas.isEmpty()
&& transformationService.isObjectBelongToRendereArea(
objEachContainer.finalObj, finalControlAreas);
if (isInitialObjBelongToAreas != isFinalObjBelongToAreas
&& handleByInitialOrFinalElementNotBelongToArea != null) {
handleByInitialOrFinalElementNotBelongToArea.accept(ele,
Expand Down
11 changes: 9 additions & 2 deletions ...el.extensions/src/org/eclipse/set/model/tablemodel/extensions/CellContentExtensions.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,12 @@ class CellContentExtensions {

static def dispatch String getPlainStringValue(
CompareStateCellContent content) {
return '''«content.oldValue.stringValueIterable»/«content.newValue.stringValueIterable»'''
val oldValue = content?.oldValue?.stringValueIterable
val newValue = content?.newValue?.stringValueIterable
if (oldValue.isNullOrEmpty && newValue.nullOrEmpty) {
return ""
}
return '''«oldValue»/«newValue»'''
}

static def dispatch String getPlainStringValue(
Expand Down Expand Up @@ -217,7 +222,9 @@ class CellContentExtensions {

static def dispatch Iterable<String> getStringValueIterable(
StringCellContent content) {
return content.value
return content?.value?.filterNull?.map[trim]?.filter [
!blank && !nullOrEmpty
] ?: #[]
}

static def List<String> getStringValueList(CellContent content) {
Expand Down
Loading