You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/09 09:39:25 UTC
[causeway] branch spring6 updated: Bump vaadin.version from 24.0.0.alpha5 to 24.0.0
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new a389eaad68 Bump vaadin.version from 24.0.0.alpha5 to 24.0.0
a389eaad68 is described below
commit a389eaad68e98bea711a512a07584085025ef4c6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 9 10:39:21 2023 +0100
Bump vaadin.version from 24.0.0.alpha5 to 24.0.0
---
bom/pom.xml | 2 +-
.../causeway/incubator/viewer/vaadin/model/util/Vaa.java | 10 ++++++++++
.../viewer/vaadin/ui/components/object/ObjectViewVaa.java | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 17f0c1741e..59fcabd2e0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -186,7 +186,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<togglz.version>3.3.3</togglz.version>
- <vaadin.version>24.0.0.alpha5</vaadin.version>
+ <vaadin.version>24.0.0</vaadin.version>
<!-- 9.4.0 is last known good, before wicket put jupiter-api on the module graph -->
<!-- <wicket.version>936167650a</wicket.version> 28 Nov '22 build -->
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/util/Vaa.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/util/Vaa.java
index 33a08306bf..9f72b955f5 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/util/Vaa.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/util/Vaa.java
@@ -26,6 +26,8 @@ import com.vaadin.flow.component.HasComponents;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.tabs.Tab;
+import com.vaadin.flow.component.tabs.Tabs;
import lombok.val;
import lombok.experimental.UtilityClass;
@@ -43,6 +45,12 @@ public class Vaa {
return component;
}
+ // specific overload for tabs
+ public Tab add(final Tabs container, final Tab component) {
+ container.add(component);
+ return component;
+ }
+
public Button newButton(final String label) {
val component = new Button(label);
component.getStyle().set("margin-left", "0.5em");
@@ -74,4 +82,6 @@ public class Vaa {
return component;
}
+
+
}
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
index 879668b911..19f28a2021 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
@@ -154,7 +154,7 @@ public class ObjectViewVaa extends VerticalLayout {
}
@Override
- protected HasComponents newTab(final Tabs container, final BSTab tabData) {
+ protected Tab newTab(final Tabs container, final BSTab tabData) {
val uiTab = Vaa.add(container, new Tab(tabData.getName()));
return uiTab;
}