--- a/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF Wed Jun 23 15:04:33 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF Wed Jun 23 15:28:44 2010 -0500
@@ -15,7 +15,8 @@
org.eclipse.equinox.p2.core;bundle-version="2.0.0",
org.eclipse.equinox.p2.metadata;bundle-version="2.0.0",
org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
- org.eclipse.equinox.p2.engine;bundle-version="2.0.0"
+ org.eclipse.equinox.p2.engine;bundle-version="2.0.0",
+ com.nokia.cpp.utils.ui;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Nokia
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java Wed Jun 23 15:04:33 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java Wed Jun 23 15:28:44 2010 -0500
@@ -25,6 +25,7 @@
import org.eclipse.equinox.internal.p2.discovery.compatibility.RemoteBundleDiscoveryStrategy;
import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem;
import org.eclipse.equinox.internal.p2.ui.discovery.DiscoveryUi;
+import org.eclipse.equinox.internal.p2.ui.discovery.util.WorkbenchUtil;
import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogConfiguration;
import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogViewer;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
@@ -54,6 +55,7 @@
import com.nokia.carbide.discovery.ui.Activator;
import com.nokia.carbide.discovery.ui.Messages;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
@SuppressWarnings("restriction")
public class DiscoveryView extends ViewPart {
@@ -103,12 +105,14 @@
"com.nokia.carbide.discovery.ui.view.DiscoveryView.catalogviewer"); //$NON-NLS-1$
makeActions();
contributeToActionBars();
- getSite().getShell().getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- viewer.updateCatalog();
- }
- });
+ if (!WorkbenchUtils.isJUnitRunning()) { // do not initialize the catalog if JUnit is running
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ viewer.updateCatalog();
+ }
+ });
+ }
}
private CatalogConfiguration getConfiguration() {