From 1d0ec4fd5c7176c9db69ef0651ab28e4064a59d0 Mon Sep 17 00:00:00 2001 From: extio-de Date: Fri, 26 Dec 2025 15:18:03 +0100 Subject: [PATCH] refactor(renderer): Remove controlId from ControlRenderingBo and related classes --- .../renderer/container/legacy/ScrollBar.java | 1 - .../renderer/container/legacy/Window.java | 1 - .../renderer/g2d/control/G2DDrawControl.java | 23 ++++--------------- .../renderer/model/bo/ControlRenderingBo.java | 4 ---- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java b/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java index 779264d..09e8863 100644 --- a/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java +++ b/src/main/java/de/extio/game_engine/renderer/container/legacy/ScrollBar.java @@ -58,7 +58,6 @@ public class ScrollBar { this.lastNumElements = numElements; final var bo = renderingBoPool.acquire(this.name + "_Slider", ControlRenderingBo.class) - .setControlId(this.name) .setType(SliderControl.class) .setCustomData(Boolean.FALSE) .setCustomData2(Double.valueOf(1.0D - this.scrollPosition)) diff --git a/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java b/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java index e3ded7f..28ef14d 100644 --- a/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java +++ b/src/main/java/de/extio/game_engine/renderer/container/legacy/Window.java @@ -186,7 +186,6 @@ public class Window implements HasPositionAndDimension2, AutoCloseable { if (this.drawCloseButton) { bo = this.renderingBoPool.acquire(this.name + "_Close", ControlRenderingBo.class) .setType(WindowCloseButtonControl.class) - .setControlId(this.name + "_Close") .setCustomData(this.draggable) .setEnabled(true) .setVisible(true) diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java index dd41237..2b8d927 100644 --- a/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java +++ b/src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java @@ -41,8 +41,6 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen public static Map> CONTROL_GROUPS = new HashMap<>(); - private String controlId; - private Class clazz; private String caption; @@ -69,17 +67,6 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen super(RenderingBoLayer.UI0_0); } - @Override - public ControlRenderingBo setControlId(final String id) { - this.controlId = id; - return this; - } - - @Override - public String getControlId() { - return this.controlId; - } - @Override public ControlRenderingBo setType(final Class clazz) { this.clazz = clazz; @@ -148,7 +135,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen @Override public void render(final Graphics2D graphics, final double scaleFactor, final boolean force) { - var control = (G2DBaseControlImpl) CACHED_CONTROLS.get(this.controlId); + var control = (G2DBaseControlImpl) CACHED_CONTROLS.get(this.id); if (control == null) { if (this.clazz == ButtonControl.class) { control = new G2DButtonControlImpl(); @@ -191,7 +178,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen control.setScaleFactor(scaleFactor) .setControlGroup(this.controlGroup) .setRendererData(this.rendererData) - .setControlId(this.controlId); + .setControlId(this.id); if (this.clazz == TextfieldControl.class && this.customData instanceof Boolean) { ((TextfieldControl) control).setMultiLine(((Boolean) this.customData).booleanValue()); } @@ -199,7 +186,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen control.build(); - CACHED_CONTROLS.put(this.controlId, control); + CACHED_CONTROLS.put(this.id, control); if (this.controlGroup != null && !this.controlGroup.isEmpty()) { var controls = CONTROL_GROUPS.get(this.controlGroup); if (controls == null) { @@ -318,7 +305,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen super.apply(other); if (other instanceof final G2DDrawControl o) { - this.controlId = o.controlId; + this.id = o.id; this.clazz = o.clazz; this.caption = o.caption; this.controlGroup = o.controlGroup; @@ -337,7 +324,7 @@ public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRen public void close() throws Exception { super.close(); - this.controlId = null; + this.id = null; this.clazz = null; this.caption = null; this.controlGroup = null; diff --git a/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java b/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java index 0169152..00771e3 100644 --- a/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java +++ b/src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java @@ -12,10 +12,6 @@ import de.extio.game_engine.resource.StaticResource; */ public interface ControlRenderingBo extends RenderingBoHasDimension { - ControlRenderingBo setControlId(String id); - - String getControlId(); - /** * Sets the type of the control. See class tree of BaseControl */