[jbosstools-commits] JBoss Tools SVN: r41512 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: utils and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-05-29 09:31:05 -0400 (Tue, 29 May 2012)
New Revision: 41512

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java
Log:
[JBIDE-12034] avoiding NPE if embedded cartridge has no url. Furthermore not rendering the link if no url is present

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java	2012-05-29 12:53:02 UTC (rev 41511)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java	2012-05-29 13:31:05 UTC (rev 41512)
@@ -22,6 +22,7 @@
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.jboss.tools.common.ui.BrowserUtil;
 import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
 import org.jboss.tools.openshift.express.internal.ui.utils.TreeUtils;
 
 /**
@@ -41,6 +42,9 @@
 	}
 
 	protected void createLink(IProperty property, final ViewerCell cell) {
+		if (StringUtils.isEmpty(property.getValue())) {
+			return;
+		}
 		final Hyperlink link = new Hyperlink((Tree) cell.getControl(),SWT.NONE); //SWT.NO_BACKGROUND
 		link.setBackground(cell.getBackground());
 		link.setForeground(JFaceResources.getColorRegistry().get(JFacePreferences.ACTIVE_HYPERLINK_COLOR));

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java	2012-05-29 12:53:02 UTC (rev 41511)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java	2012-05-29 13:31:05 UTC (rev 41512)
@@ -26,6 +26,13 @@
 		return "";
 	}
 
+	public static String toStringOrNull(Object value) {
+		if (value == null) {
+			return null;
+		}
+		return String.valueOf(value);
+	}
+	
 	public static boolean isEmpty(String value) {
 		return value == null
 				|| value.length() == 0;

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java	2012-05-29 12:53:02 UTC (rev 41511)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java	2012-05-29 13:31:05 UTC (rev 41512)
@@ -3,6 +3,9 @@
  */
 package org.jboss.tools.openshift.express.internal.ui.wizard;
 
+import static org.jboss.tools.openshift.express.internal.ui.utils.StringUtils.null2emptyString;
+import static org.jboss.tools.openshift.express.internal.ui.utils.StringUtils.toStringOrNull;
+
 import java.net.SocketTimeoutException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -57,7 +60,7 @@
 		for (IEmbeddedCartridge cartridge : application.getEmbeddedCartridges()) {
 			cartridgesContainer.add(
 					new StringElement(
-							cartridge.getName(), String.valueOf(cartridge.getUrl()), true, cartridgesContainer));
+							cartridge.getName(), null2emptyString(toStringOrNull(cartridge.getUrl())), true, cartridgesContainer));
 		}
 		return cartridgesContainer;
 	}