Merge branch 'release_24_0_0' of https://github.com/dbeaver/dbeaver i…

…nto release_24_0_0
dbeaver · Mar 1, 2024 · a9556da · a9556da
2 parents 8ed4444 + f6f71b2
commit a9556da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/plugins/org.jkiss.dbeaver.model.sm/src/org/jkiss/dbeaver/model/security/user/SMTeam.java b/plugins/org.jkiss.dbeaver.model.sm/src/org/jkiss/dbeaver/model/security/user/SMTeam.java
@@ -18,6 +18,7 @@
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.utils.CommonUtils;
 
 import java.util.LinkedHashSet;
 import java.util.Objects;
@@ -42,7 +43,7 @@ public SMTeam(String teamId, String name, String description, boolean secretStor
     @NotNull
     @Override
     public String getName() {
-        return Objects.requireNonNullElse(teamName, subjectId);
+        return CommonUtils.isEmpty(teamName) ? subjectId : teamName;
     }
 
     @Property(viewable = true, order = 1)
@@ -53,7 +54,7 @@ public String getTeamId() {
     @NotNull
     @Property(viewable = true, order = 2)
     public String getTeamName() {
-        return Objects.requireNonNullElse(teamName, subjectId);
+        return CommonUtils.isEmpty(teamName) ? subjectId : teamName;
     }
 
     public void setTeamName(String teamName) {

diff --git a/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml b/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml
@@ -47,10 +47,10 @@
             <property name="windowImages" value="/icons/dbeaver16.png,/icons/dbeaver32.png,/icons/dbeaver48.png,/icons/dbeaver64.png,/icons/dbeaver256.png"/>
             <property name="appName" value="DBeaver"/>
             <property name="appEdition" value="ce"/>
-            <property name="versionInfoCoord" value="116,230"/>
+            <property name="versionInfoCoord" value="112,230"/>
             <property name="versionInfoSize" value="8"/>
             <property name="versionInfoColor" value="255,255,255"/>
-            <property name="startupMessageRect" value="60,275,240,21"/>
+            <property name="startupMessageRect" value="60,273,240,21"/>
             <property name="startupProgressRect" value="0,295,601,6"/>
             <property name="startupForegroundColor" value="FFFFFF"/>
             <property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default"/>
@@ -71,12 +71,12 @@
             <property name="email" value="%productEmail"/>
             <property name="windowImages" value="/icons/dbeaver16.png,/icons/dbeaver32.png,/icons/dbeaver48.png,/icons/dbeaver64.png,/icons/dbeaver256.png"/>
             <property name="appName" value="DBeaver CE"/>
-            <property name="startupForegroundColor" value="000000"/>
-            <property name="versionInfoCoord" value="116,230"/>
+            <property name="versionInfoCoord" value="112,230"/>
             <property name="versionInfoSize" value="8"/>
             <property name="versionInfoColor" value="255,255,255"/>
-            <property name="startupMessageRect" value="60,275,240,21"/>
+            <property name="startupMessageRect" value="60,273,240,21"/>
             <property name="startupProgressRect" value="0,295,601,6"/>
+            <property name="startupForegroundColor" value="FFFFFF"/>
             <property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default"/>
             <property name="applicationCSSResources" value="platform:/plugin/org.eclipse.ui.themes/images/"/>
             <property name="applicationXMI" value="org.jkiss.dbeaver.ui.app.standalone/dbeaver.e4xmi"/>