Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 c4107cdb 编写于 作者: S serge-rider
浏览文件
操作

#10 UI utils refactoring

上级 b61bbe4f
展开全部 隐藏空白更改
内联 并排
Showing with 295 addition and 385 deletion
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/rpc/DBeaverInstanceServer.java
浏览文件 @ c4107cdb
......@@ -24,7 +24,6 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.registry.DataSourceUtils;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler;
......@@ -72,7 +71,7 @@ public class DBeaverInstanceServer implements IInstanceController {
if (file.exists()) {
EditorUtils.openExternalFileEditor(file, window);
} else {
DBUserInterface.getInstance().showError("Open file", "Can't open '" + file.getAbsolutePath() + "': file doesn't exist");
DBWorkbench.getPlatformUI().showError("Open file", "Can't open '" + file.getAbsolutePath() + "': file doesn't exist");
}
}
shell.setMinimized(false);
......
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/help/GitHubWikiHelpUI.java
浏览文件 @ c4107cdb
......@@ -23,7 +23,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.ui.help.AbstractHelpUI;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import java.net.MalformedURLException;
import java.net.URL;
......@@ -82,7 +82,7 @@ public class GitHubWikiHelpUI extends AbstractHelpUI {
try {
support.getExternalBrowser().openURL(fileURL);
} catch (PartInitException e) {
DBUserInterface.getInstance().showError("Help system", "Can't open help in external browser", e);
DBWorkbench.getPlatformUI().showError("Help system", "Can't open help in external browser", e);
}
// }
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java
浏览文件 @ c4107cdb
......@@ -47,7 +47,6 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBPPlatformUI;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.LoadingJob;
import org.jkiss.dbeaver.ui.TrayIconHandler;
import org.jkiss.dbeaver.ui.UITask;
......@@ -117,7 +116,6 @@ public class DBeaverUI implements DBPPlatformUI {
private void initialize() {
this.trayItem = new TrayIconHandler();
DBUserInterface.setInstance(this);
if (DBeaverCore.isStandalone()) {
//Policy.setErrorSupportProvider(new ApplicationErrorSupportProvider());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @ c4107cdb
......@@ -51,9 +51,9 @@ import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.model.virtual.DBVModel;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.registry.formatter.DataFormatterProfile;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.TasksJob;
import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler;
import org.jkiss.dbeaver.utils.GeneralUtils;
import org.jkiss.dbeaver.utils.SystemVariablesResolver;
......@@ -865,7 +865,7 @@ public class DataSourceDescriptor
final DBRProcessDescriptor processDescriptor = new DBRProcessDescriptor(command, getVariablesResolver());
monitor.subTask("Execute process " + processDescriptor.getName());
DBUserInterface.getInstance().executeProcess(processDescriptor);
DBWorkbench.getPlatformUI().executeProcess(processDescriptor);
{
// Run output grab job
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/TasksJob.java
浏览文件 @ c4107cdb
......@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.Status;
import org.jkiss.dbeaver.model.runtime.AbstractJob;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.dialogs.exec.ExecutionQueueErrorJob;
import java.lang.reflect.InvocationTargetException;
......@@ -60,7 +59,7 @@ public class TasksJob extends AbstractJob
task.run(monitor);
} catch (InvocationTargetException e) {
if (tasks.size() == 1) {
DBUserInterface.getInstance().showError(getName(), null, e.getTargetException());
DBWorkbench.getPlatformUI().showError(getName(), null, e.getTargetException());
} else if (!ignoreErrors) {
boolean keepRunning = true;
switch (ExecutionQueueErrorJob.showError(getName(), e.getTargetException(), true)) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsHandler.java
浏览文件 @ c4107cdb
......@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNode;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import java.util.ArrayList;
import java.util.Iterator;
......@@ -70,7 +70,7 @@ public class CompareObjectsHandler extends AbstractHandler {
firstType = itemType;
} else {
if (firstType != itemType || firstMeta != meta) {
DBUserInterface.getInstance().showError("Different object types", "Objects of different types were selected. You may compare only objects of the same type");
DBWorkbench.getPlatformUI().showError("Different object types", "Objects of different types were selected. You may compare only objects of the same type");
return null;
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java
浏览文件 @ c4107cdb
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverNature;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.preferences.PrefPageProjectSettings;
import org.jkiss.dbeaver.ui.preferences.WizardPrefPage;
......@@ -88,7 +88,7 @@ public class ProjectCreateWizard extends BasicNewProjectResourceWizard implement
} catch (InterruptedException ex) {
return false;
} catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.dialog_project_create_wizard_error_cannot_create,
CoreMessages.dialog_project_create_wizard_error_cannot_create_message,
ex.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java
浏览文件 @ c4107cdb
......@@ -36,7 +36,6 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.registry.RegistryConstants;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.dbeaver.utils.GeneralUtils;
......@@ -97,7 +96,7 @@ public class ProjectExportWizard extends Wizard implements IExportWizard {
return false;
}
catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Export error",
"Cannot export projects",
ex.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java
浏览文件 @ c4107cdb
......@@ -38,7 +38,6 @@ import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.registry.RegistryConstants;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.dbeaver.utils.GeneralUtils;
......@@ -96,7 +95,7 @@ public class ProjectImportWizard extends Wizard implements IImportWizard {
return false;
}
catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Import error",
"Cannot import projects",
ex.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java
浏览文件 @ c4107cdb
......@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -86,7 +86,7 @@ public class ScriptsExportWizard extends Wizard implements IExportWizard {
return false;
}
catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Export error",
"Cannot export scripts",
ex.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java
浏览文件 @ c4107cdb
......@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.editors.EditorUtils;
import org.jkiss.dbeaver.ui.resources.ResourceUtils;
......@@ -81,7 +81,7 @@ public class ScriptsImportWizard extends Wizard implements IImportWizard {
return false;
}
catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.dialog_scripts_import_wizard_dialog_error_title,
CoreMessages.dialog_scripts_import_wizard_dialog_error_text,
ex.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/NavigatorActionExecuteTool.java
浏览文件 @ c4107cdb
......@@ -23,7 +23,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.tools.ToolDescriptor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.tools.IExternalTool;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
......@@ -58,7 +58,7 @@ public class NavigatorActionExecuteTool implements IActionDelegate
IExternalTool toolInstance = tool.createTool();
toolInstance.execute(window, part, objects);
} catch (Throwable e) {
DBUserInterface.getInstance().showError("Tool error", "Error executing tool '" + tool.getLabel() + "'", e);
DBWorkbench.getPlatformUI().showError("Tool error", "Error executing tool '" + tool.getLabel() + "'", e);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/NavigatorHandlerAddBookmark.java
浏览文件 @ c4107cdb
......@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDataSource;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.navigator.DBNResource;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.EnterNameDialog;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
......@@ -53,7 +53,7 @@ public class NavigatorHandlerAddBookmark extends NavigatorHandlerObjectBase {
if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
final DBNNode node = NavigatorUtils.getSelectedNode(selection);
if (node instanceof DBNDataSource) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.actions_navigator_bookmark_error_title,
"Connection itself cannot be bookmarked. Choose some element under a connection element.");
return null;
......@@ -66,7 +66,7 @@ public class NavigatorHandlerAddBookmark extends NavigatorHandlerObjectBase {
BookmarksHandlerImpl.createBookmark((DBNDatabaseNode) node, title, dialog.getTargetFolder());
}
} catch (DBException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.actions_navigator_bookmark_error_title,
CoreMessages.actions_navigator_bookmark_error_message, e);
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/common/ToggleViewAction.java
浏览文件 @ c4107cdb
......@@ -20,7 +20,7 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.*;
import org.eclipse.ui.views.IViewDescriptor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
public class ToggleViewAction extends Action implements IPartListener
......@@ -101,7 +101,7 @@ public class ToggleViewAction extends Action implements IPartListener
activePage.hideView(view);
}
} catch (PartInitException ex) {
DBUserInterface.getInstance().showError(viewId, "Can't open view " + viewId, ex);
DBWorkbench.getPlatformUI().showError(viewId, "Can't open view " + viewId, ex);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceAutoCommitHandler.java
浏览文件 @ c4107cdb
......@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.IDataSourceContainerProvider;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.exec.DBCTransactionManager;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
......@@ -63,7 +63,7 @@ public class DataSourceAutoCommitHandler extends AbstractDataSourceHandler imple
}
});
} catch (DBException e) {
DBUserInterface.getInstance().showError("Auto-Commit", "Error while toggle auto-commit", e);
DBWorkbench.getPlatformUI().showError("Auto-Commit", "Error while toggle auto-commit", e);
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceHandler.java
浏览文件 @ c4107cdb
......@@ -40,9 +40,9 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSInstance;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.jobs.ConnectJob;
import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UITask;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
......@@ -96,7 +96,7 @@ public class DataSourceHandler
if (onFinish != null) {
onFinish.onTaskFinished(result);
} else if (!result.isOK()) {
UIUtils.asyncExec(() -> DBUserInterface.getInstance().showError(
UIUtils.asyncExec(() -> DBWorkbench.getPlatformUI().showError(
connectJob.getName(),
null,//NLS.bind(CoreMessages.runtime_jobs_connect_status_error, dataSourceContainer.getName()),
result));
......@@ -159,7 +159,7 @@ public class DataSourceHandler
DBAAuthInfo authInfo = new UITask<DBAAuthInfo>() {
@Override
protected DBAAuthInfo runTask() {
return DBUserInterface.getInstance().promptUserCredentials(prompt, user, password, passwordOnly, !dataSourceContainer.isTemporary());
return DBWorkbench.getPlatformUI().promptUserCredentials(prompt, user, password, passwordOnly, !dataSourceContainer.isTemporary());
}
}.execute();
if (authInfo == null) {
......@@ -216,7 +216,7 @@ public class DataSourceHandler
if (onFinish != null) {
onFinish.run();
} else if (!result.isOK()) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
disconnectJob.getName(),
null,
result);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceInvalidateHandler.java
浏览文件 @ c4107cdb
......@@ -32,9 +32,9 @@ import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.IDataSourceContainerProviderEx;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
import org.jkiss.dbeaver.runtime.jobs.InvalidateJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UITask;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
......@@ -75,7 +75,7 @@ public class DataSourceInvalidateHandler extends AbstractDataSourceHandler
return;
}
final InvalidateJob invalidateJob = new InvalidateJob(dataSource);
invalidateJob.setFeedbackHandler(() -> DBUserInterface.getInstance().openConnectionEditor(dataSource.getContainer()));
invalidateJob.setFeedbackHandler(() -> DBWorkbench.getPlatformUI().openConnectionEditor(dataSource.getContainer()));
invalidateJob.addJobChangeListener(new JobChangeAdapter() {
@Override
public void done(IJobChangeEvent event) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceToolsContributor.java
浏览文件 @ c4107cdb
......@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.tools.ToolDescriptor;
import org.jkiss.dbeaver.registry.tools.ToolGroupDescriptor;
import org.jkiss.dbeaver.registry.tools.ToolsRegistry;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -197,7 +197,7 @@ public class DataSourceToolsContributor extends DataSourceMenuContributor
objectInput,
editorMeta.getEditorId());
} catch (PartInitException e) {
DBUserInterface.getInstance().showError("Editor open", "Error opening tool editor '" + editorMeta.getEditorId() + "'", e.getStatus());
DBWorkbench.getPlatformUI().showError("Editor open", "Error opening tool editor '" + editorMeta.getEditorId() + "'", e.getStatus());
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceTransactionModeContributor.java
浏览文件 @ c4107cdb
......@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.core.CoreCommands;
import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.DBCTransactionManager;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
......@@ -123,7 +123,7 @@ public class DataSourceTransactionModeContributor extends DataSourceMenuContribu
try {
dataSource.getContainer().setDefaultTransactionsIsolation(level);
} catch (DBException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Transactions Isolation",
"Can't set transaction isolation level to '" + level + "'",
e);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java
浏览文件 @ c4107cdb
......@@ -39,8 +39,8 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.load.DatabaseLoadService;
import org.jkiss.dbeaver.model.struct.DBSWrapper;
import org.jkiss.dbeaver.registry.ObjectManagerRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.dbeaver.ui.navigator.actions.NavigatorHandlerFilterConfig;
import org.jkiss.dbeaver.ui.editors.DatabaseEditorUtils;
......@@ -299,7 +299,7 @@ public class ItemListControl extends NodeListControl
}
}
} catch (Exception e) {
DBUserInterface.getInstance().showError("Error setting property value", "Error setting property '" + property.getId() + "' value", e);
DBWorkbench.getPlatformUI().showError("Error setting property value", "Error setting property '" + property.getId() + "' value", e);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
浏览文件 @ c4107cdb
......@@ -57,7 +57,6 @@ import org.jkiss.dbeaver.ui.editors.sql.syntax.parser.SQLWordPartDetector;
import org.jkiss.dbeaver.model.struct.DBSDataContainer;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.ui.UIServiceSQL;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.dbeaver.ui.controls.StyledTextContentAdapter;
......@@ -723,7 +722,7 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
try {
editControl = createObjectPanel(popup);
} catch (PartInitException e1) {
DBUserInterface.getInstance().showError("Object info", "Error opening object info", e1);
DBWorkbench.getPlatformUI().showError("Object info", "Error opening object info", e1);
popup.dispose();
return;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
浏览文件 @ c4107cdb
......@@ -54,7 +54,6 @@ import org.jkiss.dbeaver.model.runtime.AbstractJob;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.sql.SQLUtils;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.tools.transfer.IDataTransferProducer;
import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer;
import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard;
......@@ -286,7 +285,7 @@ public class ResultSetHandlerMain extends AbstractHandler {
}
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Script generation", "Can't generate changes script", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Script generation", "Can't generate changes script", e.getTargetException());
}
break;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetPersister.java
浏览文件 @ c4107cdb
......@@ -37,8 +37,8 @@ import org.jkiss.dbeaver.model.struct.DBSDataContainer;
import org.jkiss.dbeaver.model.struct.DBSDataManipulator;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.model.struct.rdb.DBSManipulationType;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.GeneralUtils;
import org.jkiss.utils.CommonUtils;
......@@ -463,7 +463,7 @@ class ResultSetPersister {
DataUpdaterJob.this.deleteStats.getRowsUpdated(),
DataUpdaterJob.this.updateStats.getRowsUpdated()}));
} else {
DBUserInterface.getInstance().showError("Data error", "Error synchronizing data with database", error);
DBWorkbench.getPlatformUI().showError("Data error", "Error synchronizing data with database", error);
viewer.setStatus(GeneralUtils.getFirstMessage(error), DBPMessageType.ERROR);
}
}
......@@ -473,7 +473,7 @@ class ResultSetPersister {
this.listener.onUpdate(error == null);
}
} else if (error != null) {
DBUserInterface.getInstance().showError("Data error", "Error generating script", error);
DBWorkbench.getPlatformUI().showError("Data error", "Error generating script", error);
}
return Status.OK_STATUS;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetReferenceMenu.java
浏览文件 @ c4107cdb
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.GeneralUtils;
......@@ -135,7 +135,7 @@ public class ResultSetReferenceMenu
try {
UIUtils.runInProgressService(refCollector);
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Table References", "Error reading referencing tables for '" + singleSource.getName() + "'", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Table References", "Error reading referencing tables for '" + singleSource.getName() + "'", e.getTargetException());
return;
} catch (InterruptedException e) {
return;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @ c4107cdb
......@@ -78,7 +78,6 @@ import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.model.virtual.*;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferNodeDescriptor;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferProcessorDescriptor;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferRegistry;
......@@ -715,7 +714,7 @@ public class ResultSetViewer extends Viewer
}
savePresentationSettings();
} catch (Throwable e1) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Presentation switch",
"Can't switch presentation",
e1);
......@@ -833,7 +832,7 @@ public class ResultSetViewer extends Viewer
try {
panel = panelDescriptor.createInstance();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Can't show panel", "Can't create panel '" + id + "'", e);
DBWorkbench.getPlatformUI().showError("Can't show panel", "Can't create panel '" + id + "'", e);
return false;
}
activePanels.put(id, panel);
......@@ -2398,7 +2397,7 @@ public class ResultSetViewer extends Viewer
DBSEntityAttributeRef refAttr = refAttrs.get(i);
DBDAttributeBinding ownBinding = model.getAttributeBinding(ownAttr.getAttribute());
if (ownBinding == null) {
DBUserInterface.getInstance().showError("Can't navigate", "Attribute " + ownAttr.getAttribute() + " is missing in result set");
DBWorkbench.getPlatformUI().showError("Can't navigate", "Attribute " + ownAttr.getAttribute() + " is missing in result set");
return;
}
......@@ -2705,7 +2704,7 @@ public class ResultSetViewer extends Viewer
dataReceiver.setNextSegmentRead(false);
runDataPump(dataContainer, dataFilter, 0, segmentSize, -1, true, false, finalizer);
} else {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Error executing query",
dataContainer == null ?
"Viewer detached from data source" :
......@@ -2938,7 +2937,7 @@ public class ResultSetViewer extends Viewer
final boolean metadataChanged = model.isMetadataChanged();
if (error != null) {
setStatus(error.getMessage(), DBPMessageType.ERROR);
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Error executing query",
"Query execution failed",
error);
......@@ -3036,7 +3035,7 @@ public class ResultSetViewer extends Viewer
};
return persister.applyChanges(monitor, false, applyListener);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Apply changes error", "Error saving changes in database", e);
DBWorkbench.getPlatformUI().showError("Apply changes error", "Error saving changes in database", e);
return false;
}
}
......@@ -3062,7 +3061,7 @@ public class ResultSetViewer extends Viewer
persister.applyChanges(monitor, true, null);
return persister.getScript();
} catch (DBException e) {
DBUserInterface.getInstance().showError("SQL script generate error", "Error saving changes in database", e);
DBWorkbench.getPlatformUI().showError("SQL script generate error", "Error saving changes in database", e);
return Collections.emptyList();
}
}
......@@ -3920,7 +3919,7 @@ public class ResultSetViewer extends Viewer
vEntity.setColorOverride(attribute, value, null, StringConverter.asString(color));
updateColors(vEntity);
} catch (IllegalStateException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Row color",
"Can't set row color",
e);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ValidateUniqueKeyUsageDialog.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
import org.jkiss.dbeaver.model.virtual.DBVEntityConstraint;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.utils.CommonUtils;
import java.util.ArrayList;
......@@ -99,7 +99,7 @@ class ValidateUniqueKeyUsageDialog extends MessageDialogWithToggle {
super.buttonPressed(IDialogConstants.OK_ID);
}
} catch (DBException e) {
DBUserInterface.getInstance().showError("Virtual key edit", "Error editing virtual key", e);
DBWorkbench.getPlatformUI().showError("Virtual key edit", "Error editing virtual key", e);
}
}
......@@ -115,7 +115,7 @@ class ValidateUniqueKeyUsageDialog extends MessageDialogWithToggle {
}
}
if (uniqueColumns.isEmpty()) {
DBUserInterface.getInstance().showError("Use All Columns", "No valid columns found for unique key");
DBWorkbench.getPlatformUI().showError("Use All Columns", "No valid columns found for unique key");
return false;
}
constraint.setAttributes(uniqueColumns);
......@@ -125,7 +125,7 @@ class ValidateUniqueKeyUsageDialog extends MessageDialogWithToggle {
new VoidProgressMonitor(),
viewer.getModel().getAttributes());
} catch (DBException e) {
DBUserInterface.getInstance().showError("Use All Columns", "Can't reload unique columns", e);
DBWorkbench.getPlatformUI().showError("Use All Columns", "Can't reload unique columns", e);
return false;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingPanel.java
浏览文件 @ c4107cdb
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPEvaluationContext;
import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -85,7 +85,7 @@ public class GroupingPanel implements IResultSetPanel {
try {
resultsContainer.rebuildGrouping();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Grouping error", "Can't refresh grouping query", e);
DBWorkbench.getPlatformUI().showError("Grouping error", "Can't refresh grouping query", e);
}
}
prevQueryText = queryText;
......@@ -182,7 +182,7 @@ public class GroupingPanel implements IResultSetPanel {
try {
resultsContainer.rebuildGrouping();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Grouping error", "Can't change grouping settings", e);
DBWorkbench.getPlatformUI().showError("Grouping error", "Can't change grouping settings", e);
}
}
}
......@@ -207,7 +207,7 @@ public class GroupingPanel implements IResultSetPanel {
try {
resultsContainer.rebuildGrouping();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Grouping error", "Can't change grouping query", e);
DBWorkbench.getPlatformUI().showError("Grouping error", "Can't change grouping query", e);
}
}
}
......@@ -300,7 +300,7 @@ public class GroupingPanel implements IResultSetPanel {
try {
resultsContainer.rebuildGrouping();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Grouping error", "Can't change duplicates presentation", e);
DBWorkbench.getPlatformUI().showError("Grouping error", "Can't change duplicates presentation", e);
}
}
}
......@@ -328,7 +328,7 @@ public class GroupingPanel implements IResultSetPanel {
try {
resultsContainer.rebuildGrouping();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Grouping error", "Can't change duplicates presentation", e);
DBWorkbench.getPlatformUI().showError("Grouping error", "Can't change duplicates presentation", e);
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingResultsDecorator.java
浏览文件 @ c4107cdb
......@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.DBPEvaluationContext;
import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
import org.jkiss.dbeaver.model.sql.SQLDialect;
import org.jkiss.dbeaver.model.sql.SQLUtils;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.controls.lightgrid.LightGrid;
import org.jkiss.dbeaver.ui.controls.resultset.IResultSetDecorator;
import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPresentation;
......@@ -164,7 +164,7 @@ public class GroupingResultsDecorator implements IResultSetDecorator {
try {
container.rebuildGrouping();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Grouping error", "Can't perform grouping query", e);
DBWorkbench.getPlatformUI().showError("Grouping error", "Can't perform grouping query", e);
}
}
});
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewerPanel.java
浏览文件 @ c4107cdb
......@@ -39,7 +39,6 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
import org.jkiss.dbeaver.model.data.DBDValue;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
......@@ -210,7 +209,7 @@ public class ValueViewerPanel implements IResultSetPanel, IAdaptable {
try {
valueEditor = valueManager.createEditor(previewController);
} catch (Throwable e) {
DBUserInterface.getInstance().showError("Value preview", "Can't create value viewer", e);
DBWorkbench.getPlatformUI().showError("Value preview", "Can't create value viewer", e);
return;
}
if (valueEditor != null) {
......@@ -293,7 +292,7 @@ public class ValueViewerPanel implements IResultSetPanel, IAdaptable {
previewController.updateValue(newValue, true);
presentation.updateValueView();
} catch (Exception e) {
DBUserInterface.getInstance().showError("Value apply", "Can't apply edited value", e);
DBWorkbench.getPlatformUI().showError("Value apply", "Can't apply edited value", e);
} finally {
valueSaving = false;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
浏览文件 @ c4107cdb
......@@ -84,8 +84,8 @@ import org.jkiss.dbeaver.model.struct.DBSDataContainer;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.model.struct.DBSEntityAssociation;
import org.jkiss.dbeaver.model.struct.DBSEntityReferrer;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -183,7 +183,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
Object value = activeInlineEditor.extractEditorValue();
valueController.updateValue(value, true);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Error extracting editor value", null, e);
DBWorkbench.getPlatformUI().showError("Error extracting editor value", null, e);
}
}
spreadsheet.cancelInlineEditor();
......@@ -605,7 +605,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
controller.updateEditControls();
}
catch (Exception e) {
DBUserInterface.getInstance().showError("Cannot replace cell value", null, e);
DBWorkbench.getPlatformUI().showError("Cannot replace cell value", null, e);
}
}
......@@ -924,7 +924,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
activeInlineEditor = valueController.getValueManager().createEditor(valueController);
}
catch (Exception e) {
DBUserInterface.getInstance().showError("Cannot edit value", null, e);
DBWorkbench.getPlatformUI().showError("Cannot edit value", null, e);
return null;
}
if (activeInlineEditor != null) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/FilterValueEditDialog.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
import org.jkiss.dbeaver.model.data.DBDDisplayFormat;
import org.jkiss.dbeaver.model.data.DBDLabelValuePair;
import org.jkiss.dbeaver.model.exec.DBCLogicalOperator;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -195,7 +195,7 @@ public class FilterValueEditDialog extends BaseDialog{
Object value = ResultSetUtils.getAttributeValueFromClipboard(handler.attr);
handler.editor.primeEditorValue(value);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Copy from clipboard", "Can't copy value", e);
DBWorkbench.getPlatformUI().showError("Copy from clipboard", "Can't copy value", e);
}
} else {
super.buttonPressed(buttonId);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/PendingTransactionsDialog.java
浏览文件 @ c4107cdb
......@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.qm.QMTransactionState;
import org.jkiss.dbeaver.model.qm.QMUtils;
import org.jkiss.dbeaver.model.struct.DBSInstance;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -201,7 +201,7 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
public static void showDialog(Shell shell) {
IWorkbenchPart activePart = UIUtils.getActiveWorkbenchWindow().getActivePage().getActivePart();
if (activePart == null) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"No active part",
"No active part.");
} else {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionLogDialog.java
浏览文件 @ c4107cdb
......@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
public class TransactionLogDialog extends TransactionInfoDialog {
......@@ -77,11 +77,11 @@ public class TransactionLogDialog extends TransactionInfoDialog {
public static void showDialog(Shell shell, DBCExecutionContext executionContext, boolean showPreviousTxn) {
IEditorPart activeEditor = UIUtils.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if (activeEditor == null) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"No editor",
"Transaction log is not available.\nOpen database editor.");
} else if (executionContext == null) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Not connected",
"Transaction log is not available.\nConnect to a database.");
} else {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
浏览文件 @ c4107cdb
......@@ -49,7 +49,6 @@ import org.jkiss.dbeaver.model.struct.DBSAttributeBase;
import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -311,7 +310,7 @@ public class ComplexObjectEditor extends TreeViewer {
}
}
} catch (DBException e) {
DBUserInterface.getInstance().showError("Cell editor", "Can't open cell editor", e);
DBWorkbench.getPlatformUI().showError("Cell editor", "Can't open cell editor", e);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/dialogs/TextViewDialog.java
浏览文件 @ c4107cdb
......@@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose;
import org.jkiss.dbeaver.model.exec.DBCSession;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.controls.StyledTextUtils;
import org.jkiss.dbeaver.ui.data.IValueController;
......@@ -272,7 +272,7 @@ public class TextViewDialog extends ValueViewDialog {
rawValue,
false);
} catch (Exception e) {
DBUserInterface.getInstance().showError("Extract editor value", "Can't extract editor value", e);
DBWorkbench.getPlatformUI().showError("Extract editor value", "Can't extract editor value", e);
return null;
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/dialogs/ValueViewDialog.java
浏览文件 @ c4107cdb
......@@ -40,7 +40,7 @@ import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.struct.DBSAttributeBase;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.data.*;
import org.jkiss.dbeaver.ui.data.managers.BaseValueManager;
......@@ -321,7 +321,7 @@ public abstract class ValueViewDialog extends Dialog implements IValueEditorStan
super.okPressed();
}
catch (Exception e) {
DBUserInterface.getInstance().showError(CoreMessages.dialog_value_view_dialog_error_updating_title, CoreMessages.dialog_value_view_dialog_error_updating_message, e);
DBWorkbench.getPlatformUI().showError(CoreMessages.dialog_value_view_dialog_error_updating_title, CoreMessages.dialog_value_view_dialog_error_updating_message, e);
super.cancelPressed();
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,6 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.data.IMultiController;
import org.jkiss.dbeaver.ui.data.IValueController;
......@@ -164,7 +163,7 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
if (valueController instanceof IMultiController) {
((IMultiController) valueController).closeInlineEditor();
}
DBUserInterface.getInstance().showError("Value save", "Can't save edited value", e);
DBWorkbench.getPlatformUI().showError("Value save", "Can't save edited value", e);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/ContentPanelEditor.java
浏览文件 @ c4107cdb
......@@ -36,11 +36,10 @@ import org.jkiss.dbeaver.model.data.*;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.impl.data.StringContent;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.runtime.load.AbstractLoadService;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.LoadingJob;
import org.jkiss.dbeaver.ui.UIIcon;
......@@ -166,7 +165,7 @@ public class ContentPanelEditor extends BaseValueEditor<Control> implements IAda
try {
loadStringStreamManagers();
} catch (Throwable e) {
DBUserInterface.getInstance().showError("No string editor", "Can't load string content managers", e);
DBWorkbench.getPlatformUI().showError("No string editor", "Can't load string content managers", e);
}
} else {
//UIUtils.createLabel(editPlaceholder, UIIcon.REFRESH);
......@@ -182,7 +181,7 @@ public class ContentPanelEditor extends BaseValueEditor<Control> implements IAda
try {
streamEditor = curStreamManager.getInstance().createPanelEditor(valueController);
} catch (Throwable e) {
DBUserInterface.getInstance().showError("No stream editor", "Can't create stream editor", e);
DBWorkbench.getPlatformUI().showError("No stream editor", "Can't create stream editor", e);
}
}
if (streamEditor == null) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/ContentValueManager.java
浏览文件 @ c4107cdb
......@@ -36,7 +36,6 @@ import org.jkiss.dbeaver.model.data.DBDContentStorage;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.impl.ExternalContentStorage;
import org.jkiss.dbeaver.model.preferences.DBPPropertyManager;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -88,7 +87,7 @@ public class ContentValueManager extends BaseValueManager {
try {
activeEditor.primeEditorValue(controller.getValue());
} catch (DBException e) {
DBUserInterface.getInstance().showError("Load from file", "Error loading contents from file", e);
DBWorkbench.getPlatformUI().showError("Load from file", "Error loading contents from file", e);
}
}
}
......@@ -184,7 +183,7 @@ public class ContentValueManager extends BaseValueManager {
});
}
catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.model_jdbc_could_not_save_content,
CoreMessages.model_jdbc_could_not_save_content_to_file_ + saveFile.getAbsolutePath() + "'", //$NON-NLS-2$
e.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ClientHomesPanel.java
浏览文件 @ c4107cdb
......@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.connection.DBPNativeClientLocationManager;
import org.jkiss.dbeaver.registry.driver.LocalNativeClientLocation;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.registry.driver.RemoteNativeClientLocation;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -193,7 +193,7 @@ public class ClientHomesPanel extends Composite {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Client download", "Failed to download client files", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Client download", "Failed to download client files", e.getTargetException());
}
}
try {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
浏览文件 @ c4107cdb
......@@ -56,7 +56,7 @@ import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.utils.CommonUtils;
......@@ -143,7 +143,7 @@ class ConnectionPageInitialization extends ConnectionWizardPage implements IData
loadDatabaseSettings(new DefaultProgressMonitor(monitor), dataSource);
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Database info reading", "Error reading information from database", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Database info reading", "Error reading information from database", e.getTargetException());
} catch (InterruptedException e) {
//
}
......@@ -343,7 +343,7 @@ class ConnectionPageInitialization extends ConnectionWizardPage implements IData
try {
loadDatabaseSettings(session.getProgressMonitor(), session.getDataSource());
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Database info reading", "Error reading database settings", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Database info reading", "Error reading database settings", e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
浏览文件 @ c4107cdb
......@@ -42,9 +42,9 @@ import org.jkiss.dbeaver.model.exec.DBCSession;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.jobs.ConnectJob;
import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.ui.IDataSourceConnectionTester;
import org.jkiss.dbeaver.utils.GeneralUtils;
......@@ -180,11 +180,11 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
message);
} catch (InterruptedException ex) {
if (!"cancel".equals(ex.getMessage())) {
DBUserInterface.getInstance().showError(CoreMessages.dialog_connection_wizard_start_dialog_interrupted_title,
DBWorkbench.getPlatformUI().showError(CoreMessages.dialog_connection_wizard_start_dialog_interrupted_title,
CoreMessages.dialog_connection_wizard_start_dialog_interrupted_message);
}
} catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.dialog_connection_wizard_start_dialog_error_title,
null,
GeneralUtils.makeExceptionStatus(ex.getTargetException()));
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/CreateConnectionDialog.java
浏览文件 @ c4107cdb
......@@ -22,7 +22,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchWindow;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
/**
......@@ -77,7 +76,7 @@ public class CreateConnectionDialog extends ActiveWizardDialog
@Override
public int open() {
if (DBWorkbench.getPlatform().getProjectManager().getActiveProject() == null) {
DBUserInterface.getInstance().showError("No active project", "No active project, can't create new connection.\nActivate or create new project.");
DBWorkbench.getPlatformUI().showError("No active project", "No active project, can't create new connection.\nActivate or create new project.");
return IDialogConstants.CANCEL_ID;
}
return super.open();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
浏览文件 @ c4107cdb
......@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceViewDescriptor;
import org.jkiss.dbeaver.registry.DataSourceViewRegistry;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.IActionConstants;
import org.jkiss.dbeaver.ui.ICompositeDialogPage;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -259,7 +259,7 @@ public class EditConnectionWizard extends ConnectionWizard
}
UIUtils.showMessageBox(getShell(), CoreMessages.dialog_connection_edit_wizard_bad_pwd_title, CoreMessages.dialog_connection_edit_wizard_bad_pwd_msg, SWT.ICON_ERROR);
} catch (Throwable e) {
DBUserInterface.getInstance().showError(CoreMessages.dialog_connection_edit_wizard_error_md5_title, CoreMessages.dialog_connection_edit_wizard_error_md5_msg, e);
DBWorkbench.getPlatformUI().showError(CoreMessages.dialog_connection_edit_wizard_error_md5_title, CoreMessages.dialog_connection_edit_wizard_error_md5_msg, e);
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDependenciesTree.java
浏览文件 @ c4107cdb
......@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.connection.DBPDriverDependencies;
import org.jkiss.dbeaver.model.connection.DBPDriverLibrary;
import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
import org.jkiss.dbeaver.registry.driver.DriverDependencies;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.utils.CommonUtils;
......@@ -129,7 +129,7 @@ class DriverDependenciesTree {
} catch (InterruptedException e) {
// User just canceled download
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Resolve libraries", "Error resolving driver libraries", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Resolve libraries", "Error resolving driver libraries", e.getTargetException());
}
filesTree.removeAll();
......@@ -226,7 +226,7 @@ class DriverDependenciesTree {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Versions", "Error reading versions", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Versions", "Error reading versions", e.getTargetException());
return;
} catch (InterruptedException e) {
return;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadAutoPage.java
浏览文件 @ c4107cdb
......@@ -32,8 +32,8 @@ import org.jkiss.dbeaver.model.connection.DBPDriverLibrary;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIConfirmation;
import org.jkiss.dbeaver.ui.UITask;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -143,7 +143,7 @@ class DriverDownloadAutoPage extends DriverDownloadPage {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError(CoreMessages.dialog_driver_download_auto_page_driver_download_error, CoreMessages.dialog_driver_download_auto_page_driver_download_error_msg, e.getTargetException());
DBWorkbench.getPlatformUI().showError(CoreMessages.dialog_driver_download_auto_page_driver_download_error, CoreMessages.dialog_driver_download_auto_page_driver_download_error_msg, e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizard.java
浏览文件 @ c4107cdb
......@@ -28,7 +28,6 @@ import org.eclipse.swt.widgets.Display;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.runtime.DBWorkbench;
......@@ -40,7 +39,6 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.ProgressStreamReader;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.IOUtils;
......@@ -212,7 +210,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject, PROCESS_
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Download native client file(s)", "Error downloading client file(s)", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Download native client file(s)", "Error downloading client file(s)", e.getTargetException());
((WizardPage)getContainer().getCurrentPage()).setErrorMessage("Error downloading native client file(s)");
getContainer().updateMessage();
return false;
......@@ -246,7 +244,7 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject, PROCESS_
return false;
}
catch (InvocationTargetException ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
NLS.bind(CoreMessages.tools_wizard_error_task_error_title, task),
CoreMessages.tools_wizard_error_task_error_message + task,
ex.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java
浏览文件 @ c4107cdb
......@@ -37,7 +37,7 @@ import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.IRefreshablePart;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.resultset.IResultSetContainer;
......@@ -83,7 +83,7 @@ public class ContentEditor extends MultiPageAbstractEditor implements IValueEdit
if (e instanceof InvocationTargetException) {
e = ((InvocationTargetException)e).getTargetException();
}
DBUserInterface.getInstance().showError("Cannot open content editor", null, e);
DBWorkbench.getPlatformUI().showError("Cannot open content editor", null, e);
return null;
}
try {
......@@ -271,7 +271,7 @@ public class ContentEditor extends MultiPageAbstractEditor implements IValueEdit
// Close editor
closeValueEditor();
} catch (Exception e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Can't save content",
"Can't save content to database",
e);
......@@ -298,7 +298,7 @@ public class ContentEditor extends MultiPageAbstractEditor implements IValueEdit
});
}
catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Can't save content",
"Can't save content to file '" + saveFile.getAbsolutePath() + "'",
e.getTargetException());
......@@ -517,7 +517,7 @@ public class ContentEditor extends MultiPageAbstractEditor implements IValueEdit
//valueController.getValueSite().getWorkbenchWindow().run(true, true, initializer);
UIUtils.runInProgressService(initializer);
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Cannot refresh content editor", null, e);
DBWorkbench.getPlatformUI().showError("Cannot refresh content editor", null, e);
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorContributor.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,7 @@ import org.eclipse.ui.*;
import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
import org.jkiss.dbeaver.model.DBIcon;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -256,7 +256,7 @@ public class ContentEditorContributor extends MultiPageEditorActionBarContributo
editor.fireContentChanged();
}
catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Can't load content",
"Can't load content from file '" + loadFile.getAbsolutePath() + "'",
e.getTargetException());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
浏览文件 @ c4107cdb
......@@ -37,7 +37,6 @@ import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverActivator;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.edit.DBECommand;
import org.jkiss.dbeaver.model.edit.DBECommandContext;
......@@ -59,7 +58,6 @@ import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.registry.editor.EntityEditorDescriptor;
import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.dbeaver.ui.controls.ProgressPageControl;
import org.jkiss.dbeaver.ui.controls.PropertyPageStandard;
......@@ -350,7 +348,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
// Show error dialog
UIUtils.asyncExec(() ->
DBUserInterface.getInstance().showError("Can't save '" + getDatabaseObject().getName() + "'", null, vError));
DBWorkbench.getPlatformUI().showError("Can't save '" + getDatabaseObject().getName() + "'", null, vError));
return false;
}
}
......@@ -461,8 +459,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
return IDialogConstants.CANCEL_ID;
} catch (InvocationTargetException e) {
log.error(e);
//UIUtils.syncExec(() -> DBUserInterface.getInstance().showError("Validation", e.getMessage()));
DBeaverUI.getInstance().showError("Script generate error", "Couldn't generate alter script", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Script generate error", "Couldn't generate alter script", e.getTargetException());
} finally {
saveInProgress = false;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageEditor.java
浏览文件 @ c4107cdb
......@@ -32,7 +32,7 @@ import org.eclipse.ui.part.MultiPageEditorSite;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.registry.editor.EntityEditorDescriptor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.dbeaver.ui.INestedEditorSite;
import org.jkiss.dbeaver.ui.controls.folders.TabbedFolderPage;
......@@ -90,7 +90,7 @@ public class TabbedFolderPageEditor extends TabbedFolderPage implements IDatabas
try {
editor.init(nestedEditorSite, editorDescriptor.getNestedEditorInput(mainEditor.getEditorInput()));
} catch (PartInitException e) {
DBUserInterface.getInstance().showError("Create SQL viewer", null, e);
DBWorkbench.getPlatformUI().showError("Create SQL viewer", null, e);
}
editor.createPartControl(parent);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @ c4107cdb
......@@ -86,7 +86,6 @@ import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
import org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob;
import org.jkiss.dbeaver.runtime.sql.SQLQueryListener;
import org.jkiss.dbeaver.runtime.sql.SQLResultsConsumer;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.tools.transfer.IDataTransferProducer;
import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer;
import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard;
......@@ -310,7 +309,7 @@ public class SQLEditor extends SQLEditorBase implements
checkConnected(false, status -> UIUtils.asyncExec(() -> {
if (!status.isOK()) {
DBUserInterface.getInstance().showError("Can't connect to database", "Error connecting to datasource", status);
DBWorkbench.getPlatformUI().showError("Can't connect to database", "Error connecting to datasource", status);
}
setFocus();
}));
......@@ -372,7 +371,7 @@ public class SQLEditor extends SQLEditorBase implements
public void done(IJobChangeEvent event) {
if (job.error != null) {
releaseExecutionContext();
DBUserInterface.getInstance().showError("Open context", "Can't open editor connection", job.error);
DBWorkbench.getPlatformUI().showError("Open context", "Can't open editor connection", job.error);
} else {
if (onSuccess != null) {
onSuccess.run();
......@@ -1246,7 +1245,7 @@ public class SQLEditor extends SQLEditorBase implements
panelInstance = panel.createPanel();
panelControl = panelInstance.createPanel(resultTabs, SQLEditor.this, extraPresentation);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Panel opening error", "Can't create panel " + panel.getLabel(), e);
DBWorkbench.getPlatformUI().showError("Panel opening error", "Can't create panel " + panel.getLabel(), e);
return;
}
extraPresentationPanels.put(panel, panelInstance);
......@@ -1424,7 +1423,7 @@ public class SQLEditor extends SQLEditorBase implements
// 1. Determine whether planner supports plan extraction
DBCQueryPlanner planner = DBUtils.getAdapter(DBCQueryPlanner.class, getDataSource());
if (planner == null) {
DBUserInterface.getInstance().showError("Execution plan", "Execution plan explain isn't supported by current datasource");
DBWorkbench.getPlatformUI().showError("Execution plan", "Execution plan explain isn't supported by current datasource");
return;
}
DBCPlanStyle planStyle = planner.getPlanStyle();
......@@ -1462,7 +1461,7 @@ public class SQLEditor extends SQLEditorBase implements
try {
planView.explainQueryPlan(getExecutionContext(), sqlQuery);
} catch (DBCException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.editors_sql_error_execution_plan_title,
CoreMessages.editors_sql_error_execution_plan_message,
e);
......@@ -1518,7 +1517,7 @@ public class SQLEditor extends SQLEditorBase implements
SQLScriptElement sqlQuery = extractActiveQuery();
if (sqlQuery == null) {
//setStatus(CoreMessages.editors_sql_status_empty_query_string, DBPMessageType.ERROR);
DBUserInterface.getInstance().showError(CoreMessages.editors_sql_status_empty_query_string, CoreMessages.editors_sql_status_empty_query_string);
DBWorkbench.getPlatformUI().showError(CoreMessages.editors_sql_status_empty_query_string, CoreMessages.editors_sql_status_empty_query_string);
return;
} else {
elements = Collections.singletonList(sqlQuery);
......@@ -1545,7 +1544,7 @@ public class SQLEditor extends SQLEditorBase implements
}
}
catch (DBException e) {
DBUserInterface.getInstance().showError("Bad query", "Can't execute query", e);
DBWorkbench.getPlatformUI().showError("Bad query", "Can't execute query", e);
return;
}
processQueries(elements, newTab, false, true, queryListener);
......@@ -1557,7 +1556,7 @@ public class SQLEditor extends SQLEditorBase implements
if (sqlQuery instanceof SQLQuery) {
processQueries(Collections.singletonList(sqlQuery), false, true, true, null);
} else {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Extract data",
"Can't extract data from control command");
}
......@@ -1574,7 +1573,7 @@ public class SQLEditor extends SQLEditorBase implements
try {
DBRProgressListener connectListener = status -> {
if (!status.isOK() || container == null || !container.isConnected()) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.editors_sql_error_cant_obtain_session,
null,
status);
......@@ -1591,7 +1590,7 @@ public class SQLEditor extends SQLEditorBase implements
if (viewer != null) {
viewer.setStatus(ex.getMessage(), DBPMessageType.ERROR);
}
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.editors_sql_error_cant_obtain_session,
ex.getMessage());
return;
......@@ -2017,7 +2016,7 @@ public class SQLEditor extends SQLEditorBase implements
init(getEditorSite(), input);
} catch (CoreException e) {
DBUserInterface.getInstance().showError("File save", "Can't open SQL editor from external file", e);
DBWorkbench.getPlatformUI().showError("File save", "Can't open SQL editor from external file", e);
}
}
......@@ -2242,14 +2241,14 @@ public class SQLEditor extends SQLEditorBase implements
return;
}
if (curJobRunning.get() > 0) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.editors_sql_error_cant_execute_query_title,
CoreMessages.editors_sql_error_cant_execute_query_message);
return;
}
final DBCExecutionContext executionContext = getExecutionContext();
if (executionContext == null) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.editors_sql_error_cant_execute_query_title,
CoreMessages.editors_sql_status_not_connected_to_database);
return;
......@@ -2408,7 +2407,7 @@ public class SQLEditor extends SQLEditorBase implements
try {
sqlView = (SQLResultsView) getSite().getPage().showView(SQLResultsView.VIEW_ID, null, IWorkbenchPage.VIEW_CREATE);
} catch (Throwable e) {
DBUserInterface.getInstance().showError("Detached results", "Can't open results view", e);
DBWorkbench.getPlatformUI().showError("Detached results", "Can't open results view", e);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/dialogs/BaseSQLDialog.java
浏览文件 @ c4107cdb
......@@ -38,7 +38,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect;
import org.jkiss.dbeaver.model.sql.SQLDataSource;
import org.jkiss.dbeaver.model.sql.SQLDialect;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.BaseDialog;
import org.jkiss.dbeaver.ui.editors.StringEditorInput;
......@@ -167,7 +167,7 @@ public abstract class BaseSQLDialog extends BaseDialog {
}
sqlViewer.reloadSyntaxRules();
} catch (PartInitException e) {
DBUserInterface.getInstance().showError(getShell().getText(), null, e);
DBWorkbench.getPlatformUI().showError(getShell().getText(), null, e);
}
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/dialogs/ProcedureParameterBindDialog.java
浏览文件 @ c4107cdb
......@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.DBIcon;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure;
import org.jkiss.dbeaver.model.struct.rdb.DBSProcedureParameter;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.CustomTableEditor;
......@@ -58,7 +58,7 @@ public class ProcedureParameterBindDialog extends StatusDialog {
try {
this.parameters.addAll(procedure.getParameters(new VoidProgressMonitor()));
} catch (DBException e) {
DBUserInterface.getInstance().showError("Can't get parameters", "Error getting procedure papameters", e);
DBWorkbench.getPlatformUI().showError("Can't get parameters", "Error getting procedure papameters", e);
}
this.values = new HashMap<>(values);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/OpenHandler.java
浏览文件 @ c4107cdb
......@@ -46,7 +46,6 @@ import org.jkiss.dbeaver.model.navigator.DBNLocalFolder;
import org.jkiss.dbeaver.model.navigator.DBNResource;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
import org.jkiss.dbeaver.ui.navigator.actions.NavigatorHandlerObjectOpen;
......@@ -81,7 +80,7 @@ public class OpenHandler extends AbstractDataSourceHandler {
break;
}
} catch (CoreException e) {
DBUserInterface.getInstance().showError("Open editor", "Can execute command '" + actionId + "'", e);
DBWorkbench.getPlatformUI().showError("Open editor", "Can execute command '" + actionId + "'", e);
}
return null;
}
......@@ -283,7 +282,7 @@ public class OpenHandler extends AbstractDataSourceHandler {
sqlInput,
SQLEditor.class.getName());
} catch (PartInitException e) {
DBUserInterface.getInstance().showError("Can't open editor", null, e);
DBWorkbench.getPlatformUI().showError("Can't open editor", null, e);
}
return null;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/OpenObjectConsoleHandler.java
浏览文件 @ c4107cdb
......@@ -39,7 +39,6 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithResult;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.editors.sql.SQLEditor;
import org.jkiss.dbeaver.ui.editors.sql.generator.GenerateSQLContributor;
......@@ -81,7 +80,7 @@ public class OpenObjectConsoleHandler extends AbstractHandler {
try {
openConsole(workbenchWindow, generator, ds, title, !entities.isEmpty(), currentSelection);
} catch (Exception e) {
DBUserInterface.getInstance().showError("Open console", "Can open SQL editor", e);
DBWorkbench.getPlatformUI().showError("Open console", "Can open SQL editor", e);
}
return null;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/RenameHandler.java
浏览文件 @ c4107cdb
......@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.actions.AbstractDataSourceHandler;
import org.jkiss.dbeaver.ui.dialogs.EnterNameDialog;
import org.jkiss.dbeaver.ui.editors.EditorUtils;
......@@ -44,7 +44,7 @@ public class RenameHandler extends AbstractDataSourceHandler {
IFile file = EditorUtils.getFileFromInput(editor.getEditorInput());
if (file == null) {
DBUserInterface.getInstance().showError("Rename", "Can't rename - no source file");
DBWorkbench.getPlatformUI().showError("Rename", "Can't rename - no source file");
return null;
}
renameFile(editor, file, "SQL script");
......@@ -73,7 +73,7 @@ public class RenameHandler extends AbstractDataSourceHandler {
try {
file.move(file.getParent().getFullPath().append(newName), true, monitor);
} catch (CoreException e) {
DBUserInterface.getInstance().showError("Rename", "Error renaming file '" + file.getName() + "'", e);
DBWorkbench.getPlatformUI().showError("Rename", "Error renaming file '" + file.getName() + "'", e);
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/RunProcedureConsoleHandler.java
浏览文件 @ c4107cdb
......@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithResult;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.editors.sql.generator.GenerateSQLContributor;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
import org.jkiss.utils.CommonUtils;
......@@ -69,7 +69,7 @@ public class RunProcedureConsoleHandler extends OpenObjectConsoleHandler {
try {
openConsole(workbenchWindow, generator, ds, title, false, currentSelection);
} catch (Exception e) {
DBUserInterface.getInstance().showError("Open console", "Can open SQL editor", e);
DBWorkbench.getPlatformUI().showError("Open console", "Can open SQL editor", e);
}
return null;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
浏览文件 @ c4107cdb
......@@ -46,7 +46,6 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.IActionConstants;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -419,7 +418,7 @@ public class NavigatorUtils {
try {
((DBNNode)curObject).dropNodes(nodesToDrop);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Drop error", "Can't drop node", e);
DBWorkbench.getPlatformUI().showError("Drop error", "Can't drop node", e);
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerCreateFolder.java
浏览文件 @ c4107cdb
......@@ -26,7 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.navigator.DBNResource;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.dialogs.EnterNameDialog;
import org.jkiss.utils.CommonUtils;
......@@ -50,7 +50,7 @@ public class NavigatorHandlerCreateFolder extends NavigatorHandlerObjectBase {
try {
((DBNResource)element).createNewFolder(folderName);
} catch (DBException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.actions_navigator_create_folder_error_title,
NLS.bind(CoreMessages.actions_navigator_create_folder_error_message, folderName),
e);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectCreateBase.java
浏览文件 @ c4107cdb
......@@ -39,7 +39,6 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.ObjectManagerRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.editors.DatabaseNodeEditorInput;
import org.jkiss.dbeaver.ui.editors.IDatabaseEditor;
......@@ -107,7 +106,7 @@ public abstract class NavigatorHandlerObjectCreateBase extends NavigatorHandlerO
}
}
catch (Throwable e) {
DBUserInterface.getInstance().showError("Create object", null, e);
DBWorkbench.getPlatformUI().showError("Create object", null, e);
return false;
}
......@@ -124,7 +123,7 @@ public abstract class NavigatorHandlerObjectCreateBase extends NavigatorHandlerO
try {
UIUtils.runInProgressService(objectCreator);
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("New object", "Error creating new object", e);
DBWorkbench.getPlatformUI().showError("New object", "Error creating new object", e);
return;
} catch (InterruptedException e) {
return;
......@@ -239,7 +238,7 @@ public abstract class NavigatorHandlerObjectCreateBase extends NavigatorHandlerO
throw new DBException("Can't find node corresponding to new object");
}
} catch (Throwable e) {
DBUserInterface.getInstance().showError("Create object", null, e);
DBWorkbench.getPlatformUI().showError("Create object", null, e);
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectCreateCopy.java
浏览文件 @ c4107cdb
......@@ -37,7 +37,7 @@ import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.navigator.DBNResource;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dnd.TreeNodeTransfer;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
......@@ -79,10 +79,10 @@ public class NavigatorHandlerObjectCreateCopy extends NavigatorHandlerObjectCrea
}
}
} else {
DBUserInterface.getInstance().showError("Paste error", "Unsupported clipboard format. File or folder were expected.");
DBWorkbench.getPlatformUI().showError("Paste error", "Unsupported clipboard format. File or folder were expected.");
}
} else {
DBUserInterface.getInstance().showError("Paste error", "Clipboard contains data in unsupported format");
DBWorkbench.getPlatformUI().showError("Paste error", "Clipboard contains data in unsupported format");
}
} finally {
clipboard.dispose();
......@@ -110,7 +110,7 @@ public class NavigatorHandlerObjectCreateCopy extends NavigatorHandlerObjectCrea
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Copy error", "Error copying resource", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Copy error", "Error copying resource", e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......@@ -179,7 +179,7 @@ public class NavigatorHandlerObjectCreateCopy extends NavigatorHandlerObjectCrea
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Copy error", "Error copying resource", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Copy error", "Error copying resource", e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectDelete.java
浏览文件 @ c4107cdb
......@@ -49,8 +49,8 @@ import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.ObjectManagerRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.TasksJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -205,7 +205,7 @@ public class NavigatorHandlerObjectDelete extends NavigatorHandlerObjectBase imp
}
} catch (Throwable e) {
DBUserInterface.getInstance().showError(CoreMessages.actions_navigator_error_dialog_delete_object_title, "Can't delete object '" + node.getNodeName() + "'", e);
DBWorkbench.getPlatformUI().showError(CoreMessages.actions_navigator_error_dialog_delete_object_title, "Can't delete object '" + node.getNodeName() + "'", e);
return false;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectGoto.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.struct.DBSFolder;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSWrapper;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.navigator.dialogs.GotoObjectDialog;
import org.jkiss.dbeaver.ui.navigator.INavigatorModelView;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
......@@ -66,7 +66,7 @@ public class NavigatorHandlerObjectGoto extends NavigatorHandlerObjectBase {
}
}
if (context == null) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Go to object",
"No active datasource");
return null;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectMove.java
浏览文件 @ c4107cdb
......@@ -32,8 +32,8 @@ import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.ObjectManagerRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.TasksJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
import java.util.ArrayList;
......@@ -115,7 +115,7 @@ public class NavigatorHandlerObjectMove extends NavigatorHandlerObjectBase {
}
}
} catch (DBException e) {
DBUserInterface.getInstance().showError("Object move", "Error during object reposition", e);
DBWorkbench.getPlatformUI().showError("Object move", "Error during object reposition", e);
}
return null;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectOpen.java
浏览文件 @ c4107cdb
......@@ -44,7 +44,6 @@ import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.ObjectManagerRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.IRefreshablePart;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.folders.ITabbedFolderContainer;
......@@ -107,7 +106,7 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
handler.openResource(resource);
}
} catch (Exception e) {
DBUserInterface.getInstance().showError(CoreMessages.actions_navigator_error_dialog_open_resource_title, "Can't open resource '" + resource.getName() + "'", e); //$NON-NLS-3$
DBWorkbench.getPlatformUI().showError(CoreMessages.actions_navigator_error_dialog_open_resource_title, "Can't open resource '" + resource.getName() + "'", e); //$NON-NLS-3$
}
}
......@@ -210,7 +209,7 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
editorInput,
EntityEditor.class.getName());
} else {
DBUserInterface.getInstance().showError("No object", "Node has no associated database object");
DBWorkbench.getPlatformUI().showError("No object", "Node has no associated database object");
return null;
}
} else {
......@@ -220,7 +219,7 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
FolderEditor.class.getName());
}
} catch (Exception ex) {
DBUserInterface.getInstance().showError(CoreMessages.actions_navigator_error_dialog_open_entity_title, "Can't open entity '" + selectedNode.getNodeName() + "'", ex);
DBWorkbench.getPlatformUI().showError(CoreMessages.actions_navigator_error_dialog_open_entity_title, "Can't open entity '" + selectedNode.getNodeName() + "'", ex);
return null;
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectRename.java
浏览文件 @ c4107cdb
......@@ -32,8 +32,8 @@ import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.registry.ObjectManagerRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.TasksJob;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.dialogs.EnterNameDialog;
import org.jkiss.utils.CommonUtils;
......@@ -75,7 +75,7 @@ public class NavigatorHandlerObjectRename extends NavigatorHandlerObjectBase {
node.rename(new VoidProgressMonitor(), newName);
return true;
} catch (DBException e) {
DBUserInterface.getInstance().showError("Rename", "Can't rename object '" + oldName + "'", e);
DBWorkbench.getPlatformUI().showError("Rename", "Can't rename object '" + oldName + "'", e);
}
}
if (node instanceof DBNDatabaseNode) {
......@@ -122,7 +122,7 @@ public class NavigatorHandlerObjectRename extends NavigatorHandlerObjectBase {
}
}
} catch (Throwable e) {
DBUserInterface.getInstance().showError("Rename object", "Can't rename object '" + node.getNodeName() + "'", e);
DBWorkbench.getPlatformUI().showError("Rename object", "Can't rename object '" + node.getNodeName() + "'", e);
return false;
}
return false;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerOpenBrowser.java
浏览文件 @ c4107cdb
......@@ -25,7 +25,7 @@ import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.navigator.database.DatabaseBrowserView;
public class NavigatorHandlerOpenBrowser extends NavigatorHandlerObjectBase {
......@@ -46,7 +46,7 @@ public class NavigatorHandlerOpenBrowser extends NavigatorHandlerObjectBase {
try {
workbenchWindow.getActivePage().showView(DatabaseBrowserView.VIEW_ID, nodeId, IWorkbenchPage.VIEW_ACTIVATE);
} catch (PartInitException e) {
DBUserInterface.getInstance().showError("Database browser", "Error opening database browser", e);
DBWorkbench.getPlatformUI().showError("Database browser", "Error opening database browser", e);
}
}
return null;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerProjectRefresh.java
浏览文件 @ c4107cdb
......@@ -23,7 +23,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import java.lang.reflect.InvocationTargetException;
......@@ -41,7 +40,7 @@ public class NavigatorHandlerProjectRefresh extends NavigatorHandlerObjectBase {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Refresh workspace", "Can't refresh workspace", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Refresh workspace", "Can't refresh workspace", e.getTargetException());
} catch (InterruptedException e) {
// do nothing
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerRefresh.java
浏览文件 @ c4107cdb
......@@ -39,7 +39,7 @@ import org.jkiss.dbeaver.model.navigator.DBNEvent;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.runtime.AbstractJob;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.IRefreshablePart;
import org.jkiss.dbeaver.ui.UIConfirmation;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -117,7 +117,7 @@ public class NavigatorHandlerRefresh extends AbstractHandler {
@Override
public void done(IJobChangeEvent event) {
if (error != null) {
DBUserInterface.getInstance().showError("Refresh", "Error refreshing node", error);
DBWorkbench.getPlatformUI().showError("Refresh", "Error refreshing node", error);
}
}
});
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerToggleView.java
浏览文件 @ c4107cdb
......@@ -25,7 +25,7 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.menus.UIElement;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import java.util.Map;
......@@ -43,7 +43,7 @@ public class NavigatorHandlerToggleView extends AbstractHandler implements IElem
try {
workbenchWindow.getActivePage().showView(viewId);
} catch (PartInitException e) {
DBUserInterface.getInstance().showError("Toggle view", "Cannot open view " + viewId, e);
DBWorkbench.getPlatformUI().showError("Toggle view", "Cannot open view " + viewId, e);
}
}
return null;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseBrowserView.java
浏览文件 @ c4107cdb
......@@ -29,7 +29,6 @@ import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.navigator.DBNProject;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.IHelpContextIds;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -57,7 +56,7 @@ public class DatabaseBrowserView extends NavigatorViewBase {
try {
return getNodeFromSecondaryId(secondaryId);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Open database browser", "Can't find database navigator node", e);
DBWorkbench.getPlatformUI().showError("Open database browser", "Can't find database navigator node", e);
}
}
DBNProject projectNode = getModel().getRoot().getProject(DBWorkbench.getPlatform().getProjectManager().getActiveProject());
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorContentProvider.java
浏览文件 @ c4107cdb
......@@ -25,7 +25,6 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
import org.jkiss.dbeaver.ui.navigator.database.load.TreeLoadService;
......@@ -132,7 +131,7 @@ class DatabaseNavigatorContentProvider implements IStructuredContentProvider, IT
}
}
catch (Throwable ex) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Navigator error",
ex.getMessage(),
ex);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/NavigatorViewBase.java
浏览文件 @ c4107cdb
......@@ -35,7 +35,6 @@ import org.jkiss.dbeaver.model.IDataSourceContainerProvider;
import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.navigator.meta.DBXTreeNodeHandler;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler;
import org.jkiss.dbeaver.ui.controls.PropertyPageStandard;
......@@ -154,14 +153,14 @@ public abstract class NavigatorViewBase extends ViewPart implements INavigatorMo
try {
OpenHandler.openRecentScript(getSite().getWorkbenchWindow(), dataSource, null);
} catch (CoreException e) {
DBUserInterface.getInstance().showError("Open SQL editor", "Can't open SQL editor", e);
DBWorkbench.getPlatformUI().showError("Open SQL editor", "Can't open SQL editor", e);
}
break;
case SQL_EDITOR_NEW:
try {
OpenHandler.openNewEditor(getSite().getWorkbenchWindow(), dataSource, null);
} catch (CoreException e) {
DBUserInterface.getInstance().showError("Open new SQL editor", "Can't open new SQL editor", e);
DBWorkbench.getPlatformUI().showError("Open new SQL editor", "Can't open new SQL editor", e);
}
break;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDriversMaven.java
浏览文件 @ c4107cdb
......@@ -31,7 +31,7 @@ import org.eclipse.ui.IWorkbenchPropertyPage;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.registry.maven.MavenRegistry;
import org.jkiss.dbeaver.registry.maven.MavenRepository;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.EnterNameDialog;
import org.jkiss.utils.CommonUtils;
......@@ -99,7 +99,7 @@ public class PrefPageDriversMaven extends AbstractPrefPage implements IWorkbench
item.setText(new String[]{url.getHost(), urlString});
item.setData(repository);
} catch (MalformedURLException e1) {
DBUserInterface.getInstance().showError(CoreMessages.pref_page_drivers_maven_label_bad_url, CoreMessages.pref_page_drivers_maven_label_bad_url_tip, e1);
DBWorkbench.getPlatformUI().showError(CoreMessages.pref_page_drivers_maven_label_bad_url, CoreMessages.pref_page_drivers_maven_label_bad_url_tip, e1);
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/resources/bookmarks/BookmarksHandlerImpl.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,6 @@ import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
import org.jkiss.dbeaver.ui.navigator.actions.NavigatorHandlerObjectOpen;
......@@ -124,7 +123,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
if (status.isOK()) {
UIUtils.syncExec(() -> openNodeByPath(dsNode, (IFile) resource, storage));
} else {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Open bookmark",
"Can't open bookmark",
status);
......@@ -146,7 +145,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
nodeLoader.databaseNode, null, UIUtils.getActiveWorkbenchWindow()));
}
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
CoreMessages.model_project_open_bookmark, CoreMessages.model_project_cant_open_bookmark, e.getTargetException());
} catch (InterruptedException e) {
// do nothing
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/AbstractSearchPage.java
浏览文件 @ c4107cdb
......@@ -29,7 +29,6 @@ import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.utils.CommonUtils;
import java.util.*;
......@@ -76,7 +75,7 @@ public abstract class AbstractSearchPage extends DialogPage implements ISearchPa
saveState(DBWorkbench.getPlatform().getPreferenceStore());
NewSearchUI.runQueryInBackground(createQuery());
} catch (DBException e) {
DBUserInterface.getInstance().showError("Search error", "Can't perform search", e);
DBWorkbench.getPlatformUI().showError("Search error", "Can't perform search", e);
return false;
}
return true;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/SearchDataPage.java
浏览文件 @ c4107cdb
......@@ -32,8 +32,8 @@ import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.navigator.database.DatabaseNavigatorTree;
import org.jkiss.dbeaver.ui.navigator.database.load.TreeNodeSpecial;
......@@ -349,7 +349,7 @@ public class SearchDataPage extends AbstractSearchPage {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Data sources load", "Error loading settings", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Data sources load", "Error loading settings", e.getTargetException());
} catch (InterruptedException e) {
// Ignore
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java
浏览文件 @ c4107cdb
......@@ -39,7 +39,6 @@ import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.navigator.database.DatabaseNavigatorTree;
......@@ -273,7 +272,7 @@ public class SearchMetadataPage extends AbstractSearchPage {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Data sources load", "Error loading settings", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Data sources load", "Error loading settings", e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/session/SessionManagerViewer.java
浏览文件 @ c4107cdb
......@@ -54,9 +54,9 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.load.DatabaseLoadService;
import org.jkiss.dbeaver.model.sql.SQLUtils;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor;
import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.dbeaver.ui.controls.ListContentProvider;
import org.jkiss.dbeaver.ui.controls.autorefresh.AutoRefreshControl;
......@@ -357,7 +357,7 @@ public class SessionManagerViewer<SESSION_TYPE extends DBAServerSession>
try {
sqlViewer.init(subSite, sqlInput);
} catch (PartInitException e) {
DBUserInterface.getInstance().showError(sessionTable.getShell().getText(), null, e);
DBWorkbench.getPlatformUI().showError(sessionTable.getShell().getText(), null, e);
}
} else {
sqlViewer.setInput(sqlInput);
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseConsumerSettings.java
浏览文件 @ c4107cdb
......@@ -34,7 +34,6 @@ import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataContainer;
import org.jkiss.dbeaver.model.struct.DBSDataManipulator;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
import org.jkiss.dbeaver.tools.transfer.IDataTransferSettings;
import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferPipe;
......@@ -241,7 +240,7 @@ public class DatabaseConsumerSettings implements IDataTransferSettings {
runnableContext.run(true, true,
monitor -> containerNode.initializeNode(new DefaultProgressMonitor(monitor), null));
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Init connection", "Error connecting to datasource", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Init connection", "Error connecting to datasource", e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingContainer.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.impl.AbstractExecutionSource;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.utils.CommonUtils;
import java.util.ArrayList;
......@@ -151,7 +151,7 @@ public class DatabaseMappingContainer implements DatabaseMappingObject {
// Do not use runnable context! It changes active focus and locks UI which breakes whole jface editing framework
readAttributes(new VoidProgressMonitor());
} catch (DBException e) {
DBUserInterface.getInstance().showError("Attributes read failed", "Can't get attributes from " + DBUtils.getObjectFullName(source, DBPEvaluationContext.UI), e);
DBWorkbench.getPlatformUI().showError("Attributes read failed", "Can't get attributes from " + DBUtils.getObjectFullName(source, DBPEvaluationContext.UI), e);
}
}
return attributeMappings;
......@@ -162,7 +162,7 @@ public class DatabaseMappingContainer implements DatabaseMappingObject {
try {
readAttributes(monitor);
} catch (DBException e) {
DBUserInterface.getInstance().showError("Attributes read failed", "Can't get attributes from " + DBUtils.getObjectFullName(source, DBPEvaluationContext.UI), e);
DBWorkbench.getPlatformUI().showError("Attributes read failed", "Can't get attributes from " + DBUtils.getObjectFullName(source, DBPEvaluationContext.UI), e);
}
}
return attributeMappings;
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/page/DatabaseConsumerPageMapping.java
浏览文件 @ c4107cdb
......@@ -37,7 +37,6 @@ import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.ui.UIServiceSQL;
import org.jkiss.dbeaver.tools.transfer.database.*;
import org.jkiss.dbeaver.tools.transfer.internal.DTMessages;
......@@ -135,7 +134,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
}
}
}
DBNNode node = DBUserInterface.getInstance().selectObject(
DBNNode node = DBWorkbench.getPlatformUI().selectObject(
getShell(),
DTMessages.data_transfer_db_consumer_choose_container,
rootNode.getDatabases(),
......@@ -276,7 +275,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
}
}
} catch (DBException e1) {
DBUserInterface.getInstance().showError("Error mapping table", "Error mapping target table", e1);
DBWorkbench.getPlatformUI().showError("Error mapping table", "Error mapping target table", e1);
}
}
});
......@@ -409,7 +408,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
updatePageCompletion();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Mapping error", "Error setting target table", e);
DBWorkbench.getPlatformUI().showError("Mapping error", "Error setting target table", e);
}
}
});
......@@ -613,7 +612,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
mapping.refreshMappingType(getWizard().getContainer(), DatabaseMappingType.unspecified);
}
} catch (DBException e) {
DBUserInterface.getInstance().showError("Error mapping table", "Error mapping existing table", e);
DBWorkbench.getPlatformUI().showError("Error mapping table", "Error mapping existing table", e);
}
mappingViewer.refresh();
updatePageCompletion();
......@@ -634,7 +633,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
mappingViewer.refresh();
updatePageCompletion();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Mapping error", "Error mapping new table", e);
DBWorkbench.getPlatformUI().showError("Mapping error", "Error mapping new table", e);
}
}
}
......@@ -680,7 +679,7 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
false);
}
} catch (DBException e) {
DBUserInterface.getInstance().showError("Target DDL", "Error generatiung target DDL", e);
DBWorkbench.getPlatformUI().showError("Target DDL", "Error generatiung target DDL", e);
}
}
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/page/DatabaseProducerPageInputObjects.java
浏览文件 @ c4107cdb
......@@ -35,7 +35,6 @@ import org.jkiss.dbeaver.model.struct.DBSDataContainer;
import org.jkiss.dbeaver.model.struct.DBSDataManipulator;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.tools.transfer.database.DatabaseProducerSettings;
import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferConsumer;
import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer;
......@@ -158,7 +157,7 @@ public class DatabaseProducerPageInputObjects extends ActiveWizardPage<DataTrans
final DBNNode rootNode = DBWorkbench.getPlatform().getLiveProjects().size() == 1 ?
navigatorModel.getRoot().getProject(DBWorkbench.getPlatform().getProjectManager().getActiveProject()) : navigatorModel.getRoot();
boolean chooseConsumer = settings.isConsumerOptional();
DBNNode node = DBUserInterface.getInstance().selectObject(
DBNNode node = DBWorkbench.getPlatformUI().selectObject(
UIUtils.getActiveWorkbenchShell(),
chooseConsumer ?
"Select target entity for '" + pipe.getProducer().getDatabaseObject().getName() + "'" :
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
浏览文件 @ c4107cdb
......@@ -34,7 +34,6 @@ import org.jkiss.dbeaver.model.exec.DBCAttributeMetaData;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.DBCResultSet;
import org.jkiss.dbeaver.model.exec.DBCSession;
import org.jkiss.dbeaver.model.impl.data.DBDValueError;
import org.jkiss.dbeaver.model.runtime.DBRProcessDescriptor;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRShellCommand;
......@@ -42,7 +41,7 @@ import org.jkiss.dbeaver.model.sql.SQLDataSource;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.ContentUtils;
......@@ -348,7 +347,7 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
try {
processDescriptor.execute();
} catch (DBException e) {
DBUserInterface.getInstance().showError("Run process", "Error running process [" + commandLine + "]", e);
DBWorkbench.getPlatformUI().showError("Run process", "Error running process [" + commandLine + "]", e);
}
}
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/page/StreamProducerPagePreview.java
浏览文件 @ c4107cdb
......@@ -39,7 +39,7 @@ import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
import org.jkiss.dbeaver.tools.transfer.IDataTransferProcessor;
import org.jkiss.dbeaver.tools.transfer.IDataTransferSettings;
......@@ -385,7 +385,7 @@ public class StreamProducerPagePreview extends ActiveWizardPage<DataTransferWiza
UIUtils.packColumns(previewTable, false);
if (finalError != null) {
DBUserInterface.getInstance().showError("Load entity meta", "Can't load entity attributes", finalError);
DBWorkbench.getPlatformUI().showError("Load entity meta", "Can't load entity attributes", finalError);
}
});
}
......@@ -437,7 +437,7 @@ public class StreamProducerPagePreview extends ActiveWizardPage<DataTransferWiza
UIUtils.asyncExec(() -> {
UIUtils.packColumns(previewTable, false);
if (finalError != null) {
DBUserInterface.getInstance().showError("OReview data", "Can't load preview data", finalError);
DBWorkbench.getPlatformUI().showError("OReview data", "Can't load preview data", finalError);
}
});
}
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/wizard/DataTransferErrorJob.java
浏览文件 @ c4107cdb
......@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.tools.transfer.wizard;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.AbstractUIJob;
/**
......@@ -38,7 +38,7 @@ public class DataTransferErrorJob extends AbstractUIJob {
@Override
public IStatus runInUIThread(DBRProgressMonitor monitor)
{
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Data export error",
error.getMessage(), error);
return Status.OK_STATUS;
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/wizard/DataTransferSettings.java
浏览文件 @ c4107cdb
......@@ -25,11 +25,11 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferNodeDescriptor;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferPageDescriptor;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferProcessorDescriptor;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferRegistry;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
import org.jkiss.dbeaver.tools.transfer.IDataTransferNode;
import org.jkiss.dbeaver.tools.transfer.IDataTransferProducer;
......@@ -105,7 +105,7 @@ public class DataTransferSettings {
selectProducer(producerDesc);
consumerOptional = true;
} else {
DBUserInterface.getInstance().showError("Can't find producer", "Can't find data propducer descriptor in registry");
DBWorkbench.getPlatformUI().showError("Can't find producer", "Can't find data propducer descriptor in registry");
}
} else if (!ArrayUtils.isEmpty(consumers)) {
// Make pipes
......@@ -120,7 +120,7 @@ public class DataTransferSettings {
selectConsumer(consumerDesc, null, false);
consumerOptional = false;
} else {
DBUserInterface.getInstance().showError("Can't find producer", "Can't find data propducer descriptor in registry");
DBWorkbench.getPlatformUI().showError("Can't find producer", "Can't find data propducer descriptor in registry");
}
producerOptional = true;
} else {
......
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/wizard/DataTransferWizard.java
浏览文件 @ c4107cdb
......@@ -25,7 +25,7 @@ import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
import org.jkiss.dbeaver.tools.transfer.IDataTransferProducer;
import org.jkiss.dbeaver.tools.transfer.IDataTransferSettings;
......@@ -173,7 +173,7 @@ public class DataTransferWizard extends Wizard implements IExportWizard {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Transfer init failed", "Can't start data transfer", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Transfer init failed", "Can't start data transfer", e.getTargetException());
return false;
} catch (InterruptedException e) {
return false;
......
plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseDebugConfigurationTab.java
浏览文件 @ c4107cdb
......@@ -42,8 +42,8 @@ import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.SelectDataSourceCombo;
......@@ -178,7 +178,7 @@ public class DatabaseDebugConfigurationTab extends AbstractLaunchConfigurationTa
} catch (DBException e) {
selectedDebugType = null;
selectedDebugPanel = null;
DBUserInterface.getInstance().showError("Panel create error", "Can't create debugger config panel " + debugPanel.getId(), e);
DBWorkbench.getPlatformUI().showError("Panel create error", "Can't create debugger config panel " + debugPanel.getId(), e);
}
} else {
selectedDebugType = null;
......
plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchShortcut.java
浏览文件 @ c4107cdb
......@@ -42,7 +42,7 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.debug.core.DebugUtils;
import org.jkiss.dbeaver.debug.ui.internal.DebugUIMessages;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.utils.CommonUtils;
......@@ -150,7 +150,7 @@ public abstract class DatabaseLaunchShortcut implements ILaunchShortcut2 {
try {
launch(launchable, mode);
} catch (CoreException e) {
DBUserInterface.getInstance().showError(DebugUIMessages.DatabaseLaunchShortcut_e_launch, "Cannot launch debug", e.getStatus());
DBWorkbench.getPlatformUI().showError(DebugUIMessages.DatabaseLaunchShortcut_e_launch, "Cannot launch debug", e.getStatus());
}
}
}
......
plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseScriptDialog.java
浏览文件 @ c4107cdb
......@@ -12,7 +12,7 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.PartInitException;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.editors.StringEditorInput;
import org.jkiss.dbeaver.ui.editors.SubEditorSite;
......@@ -53,7 +53,7 @@ public class DatabaseScriptDialog extends TitleAreaDialog {
((StyledText) text).setEditable(true);;
}
} catch (PartInitException e) {
DBUserInterface.getInstance().showError(getShell().getText(), null, e);
DBWorkbench.getPlatformUI().showError(getShell().getText(), null, e);
}
Composite panel = UIUtils.createPlaceholder(parent, 1);
panel.setLayoutData(new GridData(GridData.FILL_BOTH));
......
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java
浏览文件 @ c4107cdb
......@@ -61,7 +61,7 @@ import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectSelector;
import org.jkiss.dbeaver.model.struct.DBSStructureAssistant;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UITask;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.utils.CommonUtils;
......@@ -523,7 +523,7 @@ public class DB2DataSource extends JDBCDataSource implements DBSObjectSelector,
// NO Usable Tablespace found: End of the game..
if (listTablespaces.isEmpty()) {
DBUserInterface.getInstance().showError(DB2Messages.dialog_explain_no_tablespace_found_title,
DBWorkbench.getPlatformUI().showError(DB2Messages.dialog_explain_no_tablespace_found_title,
DB2Messages.dialog_explain_no_tablespace_found_title);
return null;
}
......
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/tools/DB2ToolShowErrorDialog.java
浏览文件 @ c4107cdb
......@@ -31,7 +31,7 @@ import org.eclipse.ui.IWorkbenchWindow;
import org.jkiss.dbeaver.ext.db2.DB2Messages;
import org.jkiss.dbeaver.ext.db2.DB2Utils;
import org.jkiss.dbeaver.ext.db2.model.DB2DataSource;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
/**
......@@ -93,7 +93,7 @@ class DB2ToolShowErrorDialog extends Dialog {
try {
sqlIntegerCode = Integer.valueOf(textSqlErrorCode.getText());
} catch (NumberFormatException nfe) {
DBUserInterface.getInstance().showError(DB2Messages.dialog_tools_mes_error_code_title,
DBWorkbench.getPlatformUI().showError(DB2Messages.dialog_tools_mes_error_code_title,
DB2Messages.dialog_tools_mes_error_code);
return;
}
......
plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/tools/maintenance/DB2ReorgTableDialog.java
浏览文件 @ c4107cdb
......@@ -37,7 +37,7 @@ import org.jkiss.dbeaver.ext.db2.model.dict.DB2TablespaceDataType;
import org.jkiss.dbeaver.model.DBPEvaluationContext;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import java.lang.reflect.InvocationTargetException;
......@@ -107,7 +107,7 @@ public class DB2ReorgTableDialog extends DB2BaseTableToolDialog {
}
});
} catch (InvocationTargetException e) {
DBUserInterface.getInstance().showError("Error", "Can't read system info", e.getTargetException());
DBWorkbench.getPlatformUI().showError("Error", "Can't read system info", e.getTargetException());
} catch (InterruptedException e) {
// ignore
}
......
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/command/EntityAddCommand.java
浏览文件 @ c4107cdb
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntity;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.navigator.NavigatorUtils;
......@@ -72,7 +72,7 @@ public class EntityAddCommand extends Command
DBSObject selectedObject = DBUtils.getSelectedObject(entity.getDataSource(), true);
DBNDatabaseNode dsNode = NavigatorUtils.getNodeByObject(selectedObject != null ? selectedObject : entity.getDataSource().getContainer());
if (dsNode != null) {
DBNNode tableNode = DBUserInterface.getInstance().selectObject(
DBNNode tableNode = DBWorkbench.getPlatformUI().selectObject(
UIUtils.getActiveWorkbenchShell(),
"Select a table",
dsNode,
......
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
浏览文件 @ c4107cdb
......@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.load.DatabaseLoadService;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.IActiveWorkbenchPart;
import org.jkiss.dbeaver.ui.LoadingJob;
import org.jkiss.dbeaver.ui.editors.IDatabaseEditor;
......@@ -211,7 +211,7 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
}
});
} catch (DBException e) {
DBUserInterface.getInstance().showError("Cache database model", "Error caching database model", e);
DBWorkbench.getPlatformUI().showError("Cache database model", "Error caching database model", e);
}
boolean showViews = ERDActivator.getDefault().getPreferenceStore().getBoolean(ERDConstants.PREF_DIAGRAM_SHOW_VIEWS);
Collection<? extends DBSObject> entities = objectContainer.getChildren(monitor);
......
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
浏览文件 @ c4107cdb
......@@ -80,7 +80,7 @@ import org.jkiss.dbeaver.ext.erd.model.EntityDiagram;
import org.jkiss.dbeaver.ext.erd.part.DiagramPart;
import org.jkiss.dbeaver.model.DBPDataSourceTask;
import org.jkiss.dbeaver.model.DBPNamedObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.*;
import org.jkiss.dbeaver.ui.controls.ProgressPageControl;
import org.jkiss.dbeaver.ui.controls.itemlist.ObjectSearcher;
......@@ -642,7 +642,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
int divPos = filePath.lastIndexOf('.');
if (divPos == -1) {
DBUserInterface.getInstance().showError("ERD export", "No file extension was specified");
DBWorkbench.getPlatformUI().showError("ERD export", "No file extension was specified");
return;
}
String ext = filePath.substring(divPos + 1);
......@@ -654,7 +654,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
}
}
if (targetFormat == null) {
DBUserInterface.getInstance().showError("ERD export", "No export format correspond to file extension '" + ext + "'");
DBWorkbench.getPlatformUI().showError("ERD export", "No export format correspond to file extension '" + ext + "'");
return;
}
......@@ -665,7 +665,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
formatHandler.exportDiagram(getDiagram(), figure, getDiagramPart(), outFile);
} catch (DBException e) {
DBUserInterface.getInstance().showError("ERD export failed", null, e);
DBWorkbench.getPlatformUI().showError("ERD export failed", null, e);
}
}
......@@ -995,7 +995,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
}
MultiStatus status = new MultiStatus(DBeaverCore.getCorePluginID(), 0, messageStatuses.toArray(new IStatus[messageStatuses.size()]), null, null);
DBUserInterface.getInstance().showError(
DBWorkbench.getPlatformUI().showError(
"Diagram loading errors",
"Error(s) occurred during diagram loading. If these errors are recoverable then fix errors and then refresh/reopen diagram",
status);
......
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorStandalone.java
浏览文件 @ c4107cdb
......@@ -17,7 +17,6 @@
package org.jkiss.dbeaver.ext.erd.editor;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
......@@ -39,7 +38,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.load.AbstractLoadService;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.LoadingJob;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.editors.EditorUtils;
......@@ -104,7 +103,7 @@ public class ERDEditorStandalone extends ERDEditorPart implements DBPContextProv
getCommandStack().markSaveLocation();
} catch (Exception e) {
DBUserInterface.getInstance().showError("Save diagram", null, e);
DBWorkbench.getPlatformUI().showError("Save diagram", null, e);
}
}
......
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/export/ERDExportGraphML.java
浏览文件 @ c4107cdb
......@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.ext.erd.model.*;
import org.jkiss.dbeaver.ext.erd.part.AssociationPart;
import org.jkiss.dbeaver.ext.erd.part.DiagramPart;
import org.jkiss.dbeaver.ext.erd.part.EntityPart;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.GeneralUtils;
import org.jkiss.utils.xml.XMLBuilder;
......@@ -265,7 +265,7 @@ public class ERDExportGraphML implements ERDExportFormatHandler
}
UIUtils.launchProgram(targetFile.getAbsolutePath());
} catch (Exception e) {
DBUserInterface.getInstance().showError("Save ERD as GraphML", null, e);
DBWorkbench.getPlatformUI().showError("Save ERD as GraphML", null, e);
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或