Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public EnumTranslation translate(final boolean value)

@Override
public EnumTranslation translate(final Enumerator obj) {
if (obj == null) {
return null;
}
final Enumerator enumerator = obj;
final String enumeratorName = EnumTranslationUtils
.getKeyBasis(enumerator);
Expand All @@ -71,7 +74,9 @@ public EnumTranslation translate(final Enumerator obj) {
public EnumTranslation translate(final BasisAttribut_AttributeGroup owner,
final Enumerator enumerator) {
final EnumTranslation translate = translate(enumerator);

if (translate == null) {
return null;
}
if (!translate.getAlternative().equals("sonstige")) { //$NON-NLS-1$
return translate;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ abstract class AbstractPlanPro2TableModelTransformator extends AbstractTableMode
return translate(wert);
}
if (wert instanceof Enumerator) {
return enumTranslationService.translate(owner, wert).alternative
return enumTranslationService.translate(owner, wert)?.alternative ?: ""
}
return null;
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class FootnoteTransformation {
].filterNull
val footnotes = #[notes, objectStateNote].flatten

return footnotes.toList.withPrefix(sb.prefix)
return footnotes.toList.withPrefix(sb.prefix).filterNull
] ?: #[]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@ private String fillBefestigung(final Signal_Befestigung befestigung) {
befestigung,
b -> b.getSignalBefestigungAllg().getBefestigungArt().getWert())
.orElse(null);
if (art == null) {
return "";
}
return switch (art) {
case ENUM_BEFESTIGUNG_ART_SONSTIGE -> {
final List<ID_Bearbeitungsvermerk_TypeClass> bearbeitungsvermerke = EObjectExtensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,10 @@ class TableExtensions {
public boolean removedInMain;
}

static def dispatch Iterable<FootnoteInfo> getFootnoteInfos(
Void fnContainer) {
return #[]
}
static def dispatch Iterable<FootnoteInfo> getFootnoteInfos(
FootnoteContainer fnContainer) {
return #[]
Expand Down
Loading