From 1bf845709b2ab2bee0022e5c92d30fa736f64df1 Mon Sep 17 00:00:00 2001 From: Olaf Wintermann Date: Sat, 30 May 2026 20:58:41 +0200 Subject: [PATCH] remove redundant MemorySegment checks in UiString/UiText toString() --- ui-java/src/main/java/de/unixwork/ui/UiString.java | 5 +---- ui-java/src/main/java/de/unixwork/ui/UiText.java | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ui-java/src/main/java/de/unixwork/ui/UiString.java b/ui-java/src/main/java/de/unixwork/ui/UiString.java index 8793414..098c73d 100644 --- a/ui-java/src/main/java/de/unixwork/ui/UiString.java +++ b/ui-java/src/main/java/de/unixwork/ui/UiString.java @@ -34,13 +34,10 @@ public class UiString { } long length = (long)ui.strlen.invoke(cstr); cstr = cstr.reinterpret(length+1); - if (cstr != null && cstr.address() != 0) { - return cstr.getString(0); - } + return cstr.getString(0); } catch (Throwable e) { throw new RuntimeException(e); } - return ""; } public void setString(String string) { diff --git a/ui-java/src/main/java/de/unixwork/ui/UiText.java b/ui-java/src/main/java/de/unixwork/ui/UiText.java index 237b394..1a39c9f 100644 --- a/ui-java/src/main/java/de/unixwork/ui/UiText.java +++ b/ui-java/src/main/java/de/unixwork/ui/UiText.java @@ -30,13 +30,10 @@ public class UiText { } long length = (long)ui.strlen.invoke(cstr); cstr = cstr.reinterpret(length+1); - if (cstr != null && cstr.address() != 0) { - return cstr.getString(0); - } + return cstr.getString(0); } catch (Throwable e) { throw new RuntimeException(e); } - return null; } public void setText(String string) { -- 2.47.3