|
1 | 1 | /* |
2 | 2 | Calimero GUI - A graphical user interface for the Calimero 3 tools |
3 | | - Copyright (c) 2015, 2024 B. Malinowsky |
| 3 | + Copyright (c) 2015, 2025 B. Malinowsky |
4 | 4 |
|
5 | 5 | This program is free software; you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -512,7 +512,7 @@ private void showPropertyPage(final int objectIndex, final int pid) |
512 | 512 | override.addSelectionListener(adapt(e -> elems.setEnabled(override.getSelection()))); |
513 | 513 |
|
514 | 514 | set.addSelectionListener(adapt(e -> writeValues(objectIndex, pid, value.getText(), |
515 | | - override.getSelection() ? Integer.parseInt(elems.getText()) : -1, p))); |
| 515 | + override.getSelection() ? Integer.parseUnsignedInt(elems.getText()) : -1, p))); |
516 | 516 |
|
517 | 517 | singleLineLabel("(Maximum elements " + (d.maxElements() > 0 ? d.maxElements() : "unknown") + ")"); |
518 | 518 |
|
@@ -767,7 +767,7 @@ private void onItemPaint(final Event event) |
767 | 767 | final String io = (String) event.item.getData(ObjectIndex); |
768 | 768 | final String objType = (String) event.item.getData(ObjectType); |
769 | 769 | final String header = "Interface Object " + io + " - " |
770 | | - + PropertyClient.getObjectTypeName(Integer.parseInt(objType)) + " (Object Type " |
| 770 | + + PropertyClient.getObjectTypeName(Integer.parseUnsignedInt(objType)) + " (Object Type " |
771 | 771 | + objType + ")"; |
772 | 772 | final GC gc = new GC(table); |
773 | 773 | final Point extent = gc.stringExtent(header); |
@@ -802,9 +802,9 @@ private void onMouseDown(final Event event) |
802 | 802 | else if (e.type == SWT.Traverse) { |
803 | 803 | switch (e.detail) { |
804 | 804 | case SWT.TRAVERSE_RETURN: |
805 | | - final int objectIndex = Integer.parseInt((String) item.getData(ObjectIndex)); |
806 | | - final int objectType = Integer.parseInt((String) item.getData(ObjectType)); |
807 | | - final int pid = Integer.parseInt(item.getText(Columns.Pid.ordinal())); |
| 805 | + final int objectIndex = Integer.parseUnsignedInt((String) item.getData(ObjectIndex)); |
| 806 | + final int objectType = Integer.parseUnsignedInt((String) item.getData(ObjectType)); |
| 807 | + final int pid = Integer.parseUnsignedInt(item.getText(Columns.Pid.ordinal())); |
808 | 808 | final var definition = getDefinition(objectType, pid).orElse(unknown); |
809 | 809 | writeValues(objectIndex, pid, text.getText(), -1, definition); |
810 | 810 | // fall through |
@@ -849,9 +849,9 @@ private void updateDptBounds(final String objType, final String pid) |
849 | 849 | { |
850 | 850 | bounds.removeAll(); |
851 | 851 |
|
852 | | - final Optional<PropertyClient.Property> opt = getDefinition(Integer.parseInt(objType), Integer.parseInt(pid)); |
853 | | - if (opt.isPresent()) { |
854 | | - final PropertyClient.Property p = opt.get(); |
| 852 | + final var optProp = getDefinition(Integer.parseUnsignedInt(objType), Integer.parseUnsignedInt(pid)); |
| 853 | + if (optProp.isPresent()) { |
| 854 | + final PropertyClient.Property p = optProp.get(); |
855 | 855 | p.dpt().flatMap(dpt -> createTranslator(0, dpt)).or(() -> createTranslator(p.pdt())) |
856 | 856 | .ifPresentOrElse(t -> { |
857 | 857 | final DPT dpt = t.getType(); |
|
0 commit comments