-
Notifications
You must be signed in to change notification settings - Fork 395
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'CB-6051-ability-to-download-driver-from-the-maven-repos…
…itory' of https://github.com/dbeaver/cloudbeaver into CB-6051-ability-to-download-driver-from-the-maven-repository
- Loading branch information
Showing
43 changed files
with
883 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...es/io.cloudbeaver.model/src/io/cloudbeaver/model/session/monitor/TaskProgressMonitor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2024 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.cloudbeaver.model.session.monitor; | ||
|
|
||
| import io.cloudbeaver.model.WebAsyncTaskInfo; | ||
| import io.cloudbeaver.model.session.WebSession; | ||
| import io.cloudbeaver.utils.WebEventUtils; | ||
| import org.jkiss.code.NotNull; | ||
| import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; | ||
| import org.jkiss.dbeaver.model.runtime.ProxyProgressMonitor; | ||
|
|
||
| /** | ||
| * Task progress monitor. | ||
| * Used by async GQL requests. | ||
| */ | ||
| public class TaskProgressMonitor extends ProxyProgressMonitor { | ||
|
|
||
| @NotNull | ||
| private final WebAsyncTaskInfo asyncTask; | ||
| private final WebSession webSession; | ||
|
|
||
| public TaskProgressMonitor(DBRProgressMonitor original, @NotNull WebSession webSession, @NotNull WebAsyncTaskInfo asyncTask) { | ||
| super(original); | ||
| this.webSession = webSession; | ||
| this.asyncTask = asyncTask; | ||
| } | ||
|
|
||
| @Override | ||
| public void beginTask(String name, int totalWork) { | ||
| super.beginTask(name, totalWork); | ||
| asyncTask.setStatus(name); | ||
| WebEventUtils.sendAsyncTaskEvent(webSession, asyncTask); | ||
| } | ||
|
|
||
| @Override | ||
| public void subTask(String name) { | ||
| super.subTask(name); | ||
| asyncTask.setStatus(name); | ||
| WebEventUtils.sendAsyncTaskEvent(webSession, asyncTask); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDriverLibraryFileInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2024 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.cloudbeaver.model; | ||
|
|
||
| import io.cloudbeaver.WebServiceUtils; | ||
| import org.jkiss.code.NotNull; | ||
| import org.jkiss.dbeaver.model.DBIcon; | ||
| import org.jkiss.dbeaver.model.connection.DBPDriverLibrary; | ||
| import org.jkiss.dbeaver.model.meta.Property; | ||
| import org.jkiss.dbeaver.registry.driver.DriverDescriptor; | ||
|
|
||
| public class WebDriverLibraryFileInfo { | ||
|
|
||
| @NotNull | ||
| private final DriverDescriptor.DriverFileInfo fileInfo; | ||
|
|
||
| public WebDriverLibraryFileInfo(@NotNull DriverDescriptor.DriverFileInfo fileInfo) { | ||
| this.fileInfo = fileInfo; | ||
| } | ||
|
|
||
|
|
||
| @Property | ||
| public String getId() { | ||
| return fileInfo.getId(); | ||
| } | ||
|
|
||
| @Property | ||
| public String getFileName() { | ||
| return fileInfo.toString(); | ||
| } | ||
|
|
||
| @Property | ||
| public String getIcon() { | ||
| if (fileInfo.getType() == DBPDriverLibrary.FileType.license) { | ||
| return WebServiceUtils.makeIconId(DBIcon.TYPE_TEXT); | ||
| } | ||
| return WebServiceUtils.makeIconId(DBIcon.JAR); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.