# HG changeset patch
# User dadubrow
# Date 1280844903 18000
# Node ID 48b623de4c8e726185b9f29a315c5042de0854cb
# Parent  4efebb37741079f1afbbaafc33ab20cfb1277b97
Fix possible NPE, report better error, tweaks

diff -r 4efebb377410 -r 48b623de4c8e core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Mon Aug 02 08:45:13 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Tue Aug 03 09:15:03 2010 -0500
@@ -72,11 +72,11 @@
 	public void start(BundleContext context) throws Exception {
 		plugin = this;
 		super.start(context);
-		Job j = new Job("Getting proxy info") {
+		Job j = new Job(Messages.Activator_GetProxyInfoJobTitle) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					IProxyData proxyData = ProxyUtils.getProxyData(new URI("http://www.yahoo.com"));
+					IProxyData proxyData = ProxyUtils.getProxyData(new URI("http://www.yahoo.com")); //$NON-NLS-1$
 					if (proxyData != null) {
 						System.setProperty(PROPERTY_PROXYHOST, proxyData.getHost());
 						System.setProperty(PROPERTY_PROXYPORT, String.valueOf(proxyData.getPort()));
@@ -101,7 +101,7 @@
 	}
 
 	public static void runInUIThreadWhenProxyDataSet(final Control control, final Runnable r) {
-		Job j = new Job("") {
+		Job j = new Job("") { //$NON-NLS-1$
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				setBusyCursor(control, true);
@@ -123,6 +123,8 @@
 	}
 	
 	public static void setBusyCursor(final Control control, final boolean isBusy) {
+		if (control == null)
+			return;
 		final Display display = control.getDisplay();
 		display.syncExec(new Runnable() {
 			@Override
diff -r 4efebb377410 -r 48b623de4c8e core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java	Mon Aug 02 08:45:13 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java	Tue Aug 03 09:15:03 2010 -0500
@@ -25,6 +25,7 @@
 	public static String AbstractBrowserPortalPage_RefreshLabel;
 	public static String AbstractBrowserPortalPage_StopLabel;
 	public static String AbstractBrowserPortalPageLayer_BadURLError;
+	public static String AbstractBrowserPortalPageLayer_BrowserCreateError;
 	public static String AbstractBrowserPortalPageLayer_ForwardLabel;
 	public static String AbstractBrowserPortalPageLayer_InvalidURLError;
 	public static String AbstractBrowserPortalPageLayer_OpenLocationLabel;
@@ -43,6 +44,7 @@
 	public static String AbstractDiscoveryPortalPageLayer_UncheckAllActionLabel;
 	public static String AbstractRSSPortalPageLayer_ReturnToFeedLabel;
 	public static String AbstractRSSPortalPageLayer_RSSReadError;
+	public static String Activator_GetProxyInfoJobTitle;
 	public static String Activator_MissingConfigURLError;
 	public static String PortalEditor_BadCommandBarFactoryError;
 	public static String PortalEditor_Name;
diff -r 4efebb377410 -r 48b623de4c8e core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties	Mon Aug 02 08:45:13 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties	Tue Aug 03 09:15:03 2010 -0500
@@ -3,6 +3,7 @@
 AbstractBrowserPortalPage_RefreshLabel=Refresh page
 AbstractBrowserPortalPage_StopLabel=Stop loading
 AbstractBrowserPortalPageLayer_BadURLError=Could not load page due to bad URL
+AbstractBrowserPortalPageLayer_BrowserCreateError=Could not create browser
 AbstractBrowserPortalPageLayer_ForwardLabel=Forward
 AbstractBrowserPortalPageLayer_InvalidURLError=Invalid URL
 AbstractBrowserPortalPageLayer_OpenLocationLabel=Open location
@@ -21,6 +22,7 @@
 AbstractDiscoveryPortalPageLayer_UncheckAllActionLabel=Check none
 AbstractRSSPortalPageLayer_ReturnToFeedLabel=Return to RSS
 AbstractRSSPortalPageLayer_RSSReadError=Could not read RSS from: {0}
+Activator_GetProxyInfoJobTitle=Getting proxy info
 Activator_MissingConfigURLError=Could not find URL in configuration/server.properties file for key={0}
 PortalEditor_BadCommandBarFactoryError=Command bar factory class could not be created for id: {0
 PortalEditor_Name=Carbide Portal
diff -r 4efebb377410 -r 48b623de4c8e core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java	Mon Aug 02 08:45:13 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java	Tue Aug 03 09:15:03 2010 -0500
@@ -137,7 +137,7 @@
 		try {
 			browser = new Browser(composite, SWT.MOZILLA);
 		} catch (SWTError e) {
-			e.printStackTrace();
+			Activator.logError(Messages.AbstractBrowserPortalPageLayer_BrowserCreateError, e);
 		}
 		
 		return composite;
diff -r 4efebb377410 -r 48b623de4c8e core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/PulsarPageLayer.java
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/PulsarPageLayer.java	Mon Aug 02 08:45:13 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/PulsarPageLayer.java	Tue Aug 03 09:15:03 2010 -0500
@@ -20,10 +20,4 @@
 
 
 public class PulsarPageLayer extends AbstractDiscoveryPortalPageLayer {
-
-	@Override
-	protected String getDirectoryURL() {
-		return "http://tools.ext.nokia.com/pulsar/directory.xml"; //$NON-NLS-1$
-	}
-	
 }