Author: rob.stryker(a)jboss.com Date: 2011-11-08 21:55:04 -0500 (Tue, 08 Nov 2011) New Revision: 36234 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java Log: JBIDE-10117 - remove NPEs in the event an improperly configured server is set to openshift Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java 2011-11-09 01:06:56 UTC (rev 36233) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java 2011-11-09 02:55:04 UTC (rev 36234) @@ -31,6 +31,9 @@ private Text userText, passText; private Combo modeCombo; + private String safeString(String s) { + return s == null ? "" : s; + } private void createWidgets(Composite parent, IServerModeUICallback callback) { // TODO Auto-generated method stub parent.setLayout(new FillLayout()); @@ -52,8 +55,8 @@ Label modeLabel = new Label(composite, SWT.NONE); modeLabel.setText("Mode: " + ExpressServerUtils.getExpressModeAsString(callback.getServer())); - userText.setText(ExpressServerUtils.getExpressUsername(callback.getServer())); - passText.setText(ExpressServerUtils.getExpressPassword(callback.getServer())); + userText.setText(safeString(ExpressServerUtils.getExpressUsername(callback.getServer()))); + passText.setText(safeString(ExpressServerUtils.getExpressPassword(callback.getServer()))); userText.setEnabled(false); passText.setEnabled(false); // Maybe just make this a label ??