Skip to content

Commit 92e710d

Browse files
committed
Use DptId for map of property types
1 parent 327b960 commit 92e710d

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

src/io/calimero/gui/PropertyEditorTab.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ private void writeValues(final int objectIndex, final int pid, final String valu
649649
final PropertyClient.Property p)
650650
{
651651
final var optDptid = Optional.ofNullable(PropertyTypes.getAllPropertyTypes().get(p.pdt()));
652-
final int typeSize = optDptid.flatMap(dptid -> dptSize(dptid.getMainNumber(), dptid.getDPT()))
652+
final int typeSize = optDptid.flatMap(dptid -> dptSize(dptid))
653653
.or(() -> p.dpt().flatMap(dpt -> dptSize(dpt)))
654654
.orElse(1);
655655

@@ -688,19 +688,6 @@ private static Optional<Integer> dptSize(DptId dpt) {
688688
return createTranslator(dpt).map(DPTXlator::getTypeSize).map(size -> Math.max(1, size));
689689
}
690690

691-
private static Optional<Integer> dptSize(final int main, final String dpt) {
692-
return createTranslator(main, dpt).map(DPTXlator::getTypeSize).map(size -> Math.max(1, size));
693-
}
694-
695-
private static Optional<DPTXlator> createTranslator(final int main, final String dptId) {
696-
try {
697-
return Optional.of(TranslatorTypes.createTranslator(main, dptId));
698-
}
699-
catch (final KNXException ignore) {
700-
return Optional.empty();
701-
}
702-
}
703-
704691
private static Optional<DPTXlator> createTranslator(final DptId dptId) {
705692
try {
706693
return Optional.of(TranslatorTypes.createTranslator(dptId));

0 commit comments

Comments
 (0)