提交 30af92e1 编写于 作者: S serge-rider

Explicit Eclipse proxy service activation


Former-commit-id: 85639847
上级 db616787
...@@ -103,6 +103,7 @@ Require-Bundle: org.eclipse.core.runtime, ...@@ -103,6 +103,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.filesystem, org.eclipse.core.filesystem,
org.eclipse.core.resources, org.eclipse.core.resources,
org.eclipse.core.expressions, org.eclipse.core.expressions,
org.eclipse.core.net,
org.eclipse.equinox.security, org.eclipse.equinox.security,
org.eclipse.ui, org.eclipse.ui,
org.eclipse.ui.editors, org.eclipse.ui.editors,
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.jkiss.dbeaver.core; package org.jkiss.dbeaver.core;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
...@@ -24,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; ...@@ -24,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.jkiss.code.NotNull; import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences; import org.jkiss.dbeaver.DBeaverPreferences;
...@@ -61,6 +63,7 @@ import org.jkiss.dbeaver.utils.RuntimeUtils; ...@@ -61,6 +63,7 @@ import org.jkiss.dbeaver.utils.RuntimeUtils;
import org.jkiss.utils.CommonUtils; import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.StandardConstants; import org.jkiss.utils.StandardConstants;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import java.io.*; import java.io.*;
import java.net.Authenticator; import java.net.Authenticator;
...@@ -231,6 +234,9 @@ public class DBeaverCore implements DBPPlatform { ...@@ -231,6 +234,9 @@ public class DBeaverCore implements DBPPlatform {
this.navigatorModel = new DBNModel(this); this.navigatorModel = new DBNModel(this);
this.navigatorModel.initialize(); this.navigatorModel.initialize();
// Activate proxy service
activateProxyService();
// Activate plugin services // Activate plugin services
for (IPluginService pluginService : PluginServiceRegistry.getInstance().getServices()) { for (IPluginService pluginService : PluginServiceRegistry.getInstance().getServices()) {
try { try {
...@@ -247,6 +253,14 @@ public class DBeaverCore implements DBPPlatform { ...@@ -247,6 +253,14 @@ public class DBeaverCore implements DBPPlatform {
log.debug("Core initialized (" + (System.currentTimeMillis() - startTime) + "ms)"); log.debug("Core initialized (" + (System.currentTimeMillis() - startTime) + "ms)");
} }
private void activateProxyService() {
try {
log.debug("Proxy service '" + IProxyService.class.getName() + "' loaded");
} catch (Throwable e) {
log.debug("Proxy service not found");
}
}
private void initializeProjects() { private void initializeProjects() {
final IProgressMonitor monitor = new NullProgressMonitor(); final IProgressMonitor monitor = new NullProgressMonitor();
try { try {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册