From 6a54207ba711a4eb5ebf2dabcd6ba1c733294d43 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 6 Nov 2025 12:58:13 -0300 Subject: [PATCH 1/4] style: remove unused imports --- .../com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java index 1f219c8..4cfb220 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java @@ -28,9 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import org.apache.commons.lang3.StringUtils; @SuppressWarnings("serial") class SplitLayoutDemo extends Composite { From be4f397e359ae4c8960aae84ea6417753164ab38 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 6 Nov 2025 13:07:00 -0300 Subject: [PATCH 2/4] style: remove unnecessary 'this' qualifier --- .../flowingcode/vaadin/addons/demo/SplitLayoutDemo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java index 4cfb220..28abe7f 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java @@ -48,8 +48,8 @@ public SplitLayoutDemo(Component demo, List tabs) { code = new MultiSourceCodeViewer(tabs, properties); - this.sourcePosition = code.getSourcePosition(); - switch (this.sourcePosition) { + sourcePosition = code.getSourcePosition(); + switch (sourcePosition) { case PRIMARY: getContent().addToPrimary(code); getContent().addToSecondary(demo); @@ -64,7 +64,7 @@ public SplitLayoutDemo(Component demo, List tabs) { } public void switchSourcePosition(SourcePosition position) { - if (!this.sourcePosition.equals(position)) { + if (!sourcePosition.equals(position)) { toggleSourcePosition(); } } @@ -75,7 +75,7 @@ public void toggleSourcePosition() { getContent().removeAll(); getContent().addToPrimary(secondary); getContent().addToSecondary(primary); - this.sourcePosition = this.sourcePosition.toggle(); + sourcePosition = sourcePosition.toggle(); } public void setOrientation(Orientation o) { From f03f35e4d77d0ce0034d238a85948024966a0919 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Fri, 7 Nov 2025 15:34:32 -0300 Subject: [PATCH 3/4] refactor: rename switchSourcePosition method --- .../com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java index 28abe7f..4a879ba 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java @@ -63,7 +63,7 @@ public SplitLayoutDemo(Component demo, List tabs) { getContent().setSizeFull(); } - public void switchSourcePosition(SourcePosition position) { + private void setSourcePosition(SourcePosition position) { if (!sourcePosition.equals(position)) { toggleSourcePosition(); } From c209bb6184849df90adbf5b388d92a3dc2f52231 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Fri, 7 Nov 2025 15:38:41 -0300 Subject: [PATCH 4/4] refactor: rewrite toggleSourcePosition using setSourcePosition --- .../vaadin/addons/demo/SplitLayoutDemo.java | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java index 4a879ba..03ba67d 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/SplitLayoutDemo.java @@ -33,6 +33,7 @@ class SplitLayoutDemo extends Composite { private MultiSourceCodeViewer code; + private Component demo; private SourcePosition sourcePosition; public SplitLayoutDemo(Component demo, String sourceUrl, SourcePosition sourcePosition) { @@ -47,35 +48,31 @@ public SplitLayoutDemo(Component demo, List tabs) { properties.put("flow", Version.getFullVersion()); code = new MultiSourceCodeViewer(tabs, properties); - - sourcePosition = code.getSourcePosition(); - switch (sourcePosition) { - case PRIMARY: - getContent().addToPrimary(code); - getContent().addToSecondary(demo); - break; - case SECONDARY: - default: - getContent().addToPrimary(demo); - getContent().addToSecondary(code); - } + this.demo = demo; + setSourcePosition(code.getSourcePosition()); getContent().setSizeFull(); } private void setSourcePosition(SourcePosition position) { - if (!sourcePosition.equals(position)) { - toggleSourcePosition(); + if (!position.equals(sourcePosition)) { + getContent().removeAll(); + switch (position) { + case PRIMARY: + getContent().addToPrimary(code); + getContent().addToSecondary(demo); + break; + case SECONDARY: + default: + getContent().addToPrimary(demo); + getContent().addToSecondary(code); + } + sourcePosition = position; } } public void toggleSourcePosition() { - Component primary = getContent().getPrimaryComponent(); - Component secondary = getContent().getSecondaryComponent(); - getContent().removeAll(); - getContent().addToPrimary(secondary); - getContent().addToSecondary(primary); - sourcePosition = sourcePosition.toggle(); + setSourcePosition(sourcePosition.toggle()); } public void setOrientation(Orientation o) {