Skip to content

[Sskz] fix filling of column B #1251

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
TruongQuangSB merged 9 commits into from
Jan 15, 2025
Merged

[Sskz] fix filling of column B #1251

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f59f9cf
evaluate all cases for sskz column B and combine them
mariusheine Jan 15, 2025
11c11dd
revert formatting
mariusheine Jan 15, 2025
33d94b1
revert formatting
mariusheine Jan 15, 2025
f2d686b
revert formatting
mariusheine Jan 15, 2025
d15ca96
revert formatting
mariusheine Jan 15, 2025
97a2c97
revert formatting
mariusheine Jan 15, 2025
1eb1511
revert formatting
mariusheine Jan 15, 2025
99fa6d2
revert formatting
mariusheine Jan 15, 2025
c23342f
easify expression
mariusheine Jan 15, 2025
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
79 changes: 44 additions & 35 deletions ...e.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskz/SskzTransformator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator;
Expand Down Expand Up @@ -123,8 +125,15 @@ private Table transform(final Iterable<Aussenelementansteuerung> controls,
.keySet().stream().map(this::fieldElementCase)
.toArray(Case[]::new);

fillSwitch(row, getColumn(cols, Betriebl_Bez_Feldelem), control,
fieldElementCases);
fillIterable(row, getColumn(cols, Betriebl_Bez_Feldelem), control,
(final Aussenelementansteuerung element) -> List
.of(fieldElementCases).stream()
.filter(c -> c.condition.apply(element))
.map(c -> c.filling.apply(element))
.flatMap(it -> StreamSupport
.stream(it.spliterator(), false))
.collect(Collectors.toList()),
Copy link
Contributor

@TruongQuangSB TruongQuangSB Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.collect(Collectors.toList()),
.toList(),

From Stream can direct toList() 😄

Copy link
Contributor Author

@mariusheine mariusheine Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TruongQuangSB I changedit

null);

// C: Sskz.Techn_Bez_OC
fill(row, getColumn(cols, Techn_Bez_OC), control, e -> ""); //$NON-NLS-1$
Expand Down Expand Up @@ -178,23 +187,23 @@ private <T extends Ur_Objekt> Case<Aussenelementansteuerung> fieldElementCase(
private List<Aussenelementansteuerung> getControlFromFieldELement(
final Ur_Objekt object) {
final Function<Ur_Objekt, List<Aussenelementansteuerung>> getAussElement = urObject -> switch (urObject) {
case final W_Kr_Gsp_Element gsp -> getControlFromFieldELement(
gsp.getIDStellelement().getValue());
case final Signal signal -> getControlFromFieldELement(
case final W_Kr_Gsp_Element gsp -> getControlFromFieldELement(
gsp.getIDStellelement().getValue());
case final Signal signal -> getControlFromFieldELement(
signal.getSignalReal().getSignalRealAktiv()
.getIDStellelement().getValue());
case final FMA_Komponente fma -> fma
.getFMAKomponenteAchszaehlpunkt().getIDInformation()
.stream()
.map(ID_Aussenelementansteuerung_TypeClass::getValue)
.toList();
case final PZB_Element pzb -> getControlFromFieldELement(
pzb.getIDStellelement().getValue());
case final Schluesselsperre schluessel -> getControlFromFieldELement(
schluessel.getIDStellelement().getValue());
case final Stellelement stellement -> List
.of(stellement.getIDInformation().getValue());
default -> null;
case final PZB_Element pzb -> getControlFromFieldELement(
pzb.getIDStellelement().getValue());
case final Schluesselsperre schluessel -> getControlFromFieldELement(
schluessel.getIDStellelement().getValue());
case final Stellelement stellement -> List
.of(stellement.getIDInformation().getValue());
default -> null;
Copy link
Contributor

@TruongQuangSB TruongQuangSB Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the change intentional?

Copy link
Contributor Author

@mariusheine mariusheine Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TruongQuangSB No it was not intentional. The autoformatter changed it... I will revert it

Copy link
Contributor Author

@mariusheine mariusheine Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TruongQuangSB Puhh that was ahrd to reset 🤣 Damn eclipse autoformatter. But now it is as before

};
return getNullableObject(object, getAussElement::apply)
.orElse(Collections.emptyList());
Expand All @@ -203,35 +212,35 @@ private List<Aussenelementansteuerung> getControlFromFieldELement(
@SuppressWarnings("nls")
private String getFieldElementDesignation(final Ur_Objekt object) {
final Function<Ur_Objekt, String> destignationFunc = urObject -> switch (urObject) {
case final W_Kr_Gsp_Element gsp -> gsp.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final Signal signal -> signal.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final FMA_Komponente fma -> fma.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final PZB_Element pzb -> {
final ENUMPZBArt pzbArt = getNullableObject(pzb,
ele -> ele.getPZBArt().getWert()).orElse(null);
if (pzbArt == null) {
yield "";
}
final List<String> pzbElementBezugspunkt = PZBElementExtensions
.getPZBElementBezugspunkt(pzb).stream()
.map(ele -> switch (ele) {
case final Signal signal -> signal.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final W_Kr_Gsp_Element gsp -> gsp.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final Signal signal -> signal.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final FMA_Komponente fma -> fma.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final PZB_Element pzb -> {
final ENUMPZBArt pzbArt = getNullableObject(pzb,
ele -> ele.getPZBArt().getWert()).orElse(null);
if (pzbArt == null) {
yield "";
}
final List<String> pzbElementBezugspunkt = PZBElementExtensions
.getPZBElementBezugspunkt(pzb).stream()
.map(ele -> switch (ele) {
case final Signal signal -> signal.getBezeichnung()
.getBezeichnungTabelle().getWert();
case final W_Kr_Gsp_Element gsp -> gsp
.getBezeichnung().getBezeichnungTabelle()
.getWert();
default -> "";
default -> "";

}).toList();
yield String.format("%s (%s)", translate(pzbArt),
String.join(",", pzbElementBezugspunkt));
}
}).toList();
yield String.format("%s (%s)", translate(pzbArt),
String.join(",", pzbElementBezugspunkt));
}
case final Schluesselsperre schluessel -> schluessel
.getBezeichnung().getBezeichnungTabelle().getWert();
default -> null;
default -> null;
};
return getNullableObject(object, destignationFunc::apply).orElse("");
}
Expand Down
Loading