提交 dd3e953e 编写于 作者: J jurgen

Runtime refactoring

上级 d34bf42f
......@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.DBIcon;
import org.jkiss.dbeaver.model.DBIconComposite;
import org.jkiss.dbeaver.model.DBPEvent;
import org.jkiss.dbeaver.model.DBPImage;
import org.jkiss.dbeaver.model.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
import org.jkiss.dbeaver.model.struct.DBSObject;
......@@ -122,7 +122,7 @@ public class DBNDataSource extends DBNDatabaseNode implements IAdaptable
}
@Override
public boolean initializeNode(@Nullable DBRProgressMonitor monitor, DBRProcessListener onFinish)
public boolean initializeNode(@Nullable DBRProgressMonitor monitor, DBRProgressListener onFinish)
{
if (dataSource == null) {
return false;
......@@ -132,7 +132,7 @@ public class DBNDataSource extends DBNDatabaseNode implements IAdaptable
//dataSource.connect(monitor);
} else {
if (onFinish != null) {
onFinish.onProcessFinish(Status.OK_STATUS);
onFinish.onTaskFinished(Status.OK_STATUS);
}
}
return dataSource.isConnected();
......
......@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
......@@ -224,10 +224,10 @@ public abstract class DBNDatabaseNode extends DBNNode implements DBSWrapper, DBP
return locked || super.isLocked();
}
public boolean initializeNode(DBRProgressMonitor monitor, DBRProcessListener onFinish)
public boolean initializeNode(DBRProgressMonitor monitor, DBRProgressListener onFinish)
{
if (onFinish != null) {
onFinish.onProcessFinish(Status.OK_STATUS);
onFinish.onTaskFinished(Status.OK_STATUS);
}
return true;
}
......
......@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IStatus;
/**
* Process execution listener
*/
public interface DBRProcessListener {
public interface DBRProgressListener {
void onProcessFinish(IStatus status);
void onTaskFinished(IStatus status);
}
......@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.DBPPropertyDescriptor;
import org.jkiss.dbeaver.model.DBPSystemObject;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
......@@ -48,7 +48,7 @@ public class CompareObjectsExecutor {
private final List<DBNDatabaseNode> rootNodes;
private final Map<DBPDataSource, DataSourcePropertyFilter> dataSourceFilters = new IdentityHashMap<DBPDataSource, DataSourcePropertyFilter>();
private final DBRProcessListener initializeFinisher;
private final DBRProgressListener initializeFinisher;
private final ILazyPropertyLoadListener lazyPropertyLoadListener;
private volatile int initializedCount = 0;
......@@ -121,9 +121,9 @@ public class CompareObjectsExecutor {
this.settings = settings;
this.rootNodes = settings.getNodes();
initializeFinisher = new DBRProcessListener() {
initializeFinisher = new DBRProgressListener() {
@Override
public void onProcessFinish(IStatus status)
public void onTaskFinished(IStatus status)
{
if (!status.isOK()) {
initializeError = status;
......
......@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBPEvent;
import org.jkiss.dbeaver.model.access.DBAAuthInfo;
import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
import org.jkiss.dbeaver.model.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
......@@ -51,7 +51,7 @@ public class DataSourceConnectHandler extends DataSourceHandler
public static void execute(
@Nullable DBRProgressMonitor monitor,
@NotNull DBSDataSourceContainer dataSourceContainer,
@Nullable final DBRProcessListener onFinish)
@Nullable final DBRProgressListener onFinish)
{
if (dataSourceContainer instanceof DataSourceDescriptor && !dataSourceContainer.isConnected()) {
final DataSourceDescriptor dataSourceDescriptor = (DataSourceDescriptor)dataSourceContainer;
......@@ -95,7 +95,7 @@ public class DataSourceConnectHandler extends DataSourceHandler
}
}
if (onFinish != null) {
onFinish.onProcessFinish(result);
onFinish.onTaskFinished(result);
} else if (!result.isOK()) {
DBUserInterface.getInstance().showError(
connectJob.getName(),
......
......@@ -33,7 +33,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
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.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithResult;
import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
......@@ -112,9 +112,9 @@ public class DatabaseEditorInputFactory implements IElementFactory
try {
dsNode = (DBNDataSource)DBeaverCore.getInstance().getNavigatorModel().getNodeByObject(dsObject);
if (dsNode != null) {
dsNode.initializeNode(monitor, new DBRProcessListener() {
dsNode.initializeNode(monitor, new DBRProgressListener() {
@Override
public void onProcessFinish(IStatus status)
public void onTaskFinished(IStatus status)
{
if (!status.isOK()) {
errorStatus = status;
......
......@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.ui.resources.AbstractResourceHandler;
import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
......@@ -110,9 +110,9 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
if (dsNode == null) {
throw new DBException("Can't find datasource node for '" + dataSourceContainer.getName() + "'"); //$NON-NLS-2$
}
dsNode.initializeNode(null, new DBRProcessListener() {
dsNode.initializeNode(null, new DBRProgressListener() {
@Override
public void onProcessFinish(IStatus status)
public void onTaskFinished(IStatus status)
{
if (status.isOK()) {
UIUtils.runInUI(null, new Runnable() {
......
......@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPPreferenceStore;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.runtime.DBRProcessListener;
import org.jkiss.dbeaver.model.runtime.DBRProgressListener;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIUtils;
......@@ -155,9 +155,9 @@ public class SearchMetadataPage extends AbstractSearchPage {
for (DBNNode node = (DBNNode)object; node != null; node = node.getParentNode()) {
if (node instanceof DBNDataSource) {
DBNDataSource dsNode = (DBNDataSource) node;
dsNode.initializeNode(null, new DBRProcessListener() {
dsNode.initializeNode(null, new DBRProgressListener() {
@Override
public void onProcessFinish(IStatus status)
public void onTaskFinished(IStatus status)
{
if (status.isOK()) {
Display.getDefault().asyncExec(new Runnable() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册