Skip to content

Commit cfbf9e8

Browse files
committed
dbeaver/pro#5848 use display name
1 parent f47f917 commit cfbf9e8

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/RMLocalProject.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public RMLocalProject(
4747
super(workspace, sessionContext);
4848
this.projectPath = projectPath;
4949
loadProperties();
50-
this.rmProject = new RMProject(getName());
50+
this.rmProject = new RMProject(getRmProjectName());
5151
this.rmProject.setId(RMUtils.makeProjectIdFromPath(projectPath, type));
5252
this.rmProject.setDescription(getDescription());
5353
this.rmProject.setType(type);
@@ -65,6 +65,12 @@ public String getId() {
6565
return rmProject.getId();
6666
}
6767

68+
@NotNull
69+
@Override
70+
public String getName() {
71+
return rmProject.getDisplayName();
72+
}
73+
6874
@NotNull
6975
@Override
7076
public Path getAbsolutePath() {
@@ -139,4 +145,13 @@ public RMProject getRMProject() {
139145
protected DBPDataSourceRegistry createDataSourceRegistry() {
140146
return new DataSourceRegistry<>(this);
141147
}
148+
149+
@NotNull
150+
private String getRmProjectName() {
151+
Object projectName = this.getProjectProperty(PROP_PROJECT_NAME);
152+
if (projectName != null) {
153+
return projectName.toString();
154+
}
155+
return projectPath.getFileName().toString();
156+
}
142157
}

0 commit comments

Comments
 (0)