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

[jbosstools-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2012-06-01 16:55:18 -0400 (Fri, 01 Jun 2012)
New Revision: 41645

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java
Log:
JBIDE-12079 actually report an error without NPE when magic deployments folder does not exist

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java	2012-06-01 20:53:04 UTC (rev 41644)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java	2012-06-01 20:55:18 UTC (rev 41645)
@@ -66,9 +66,17 @@
 		String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
 		IContainer destFolder = "".equals(destinationFolder) ? magicProject : (IContainer)magicProject.findMember(new Path(destinationFolder));
 		if( destFolder == null || !destFolder.isAccessible()) {
+			StringBuffer missingPath = new StringBuffer("");
+			if(destFolder==null) {
+				missingPath.append(magicProject.getName());
+				missingPath.append("/");
+				missingPath.append(destinationFolder);
+			} else {
+				missingPath.append(destFolder.getName());
+			}
 			throw new CoreException(new Status(IStatus.ERROR, 
 					OpenShiftUIActivator.PLUGIN_ID, 
-					NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), destFolder.getProjectRelativePath())));
+					NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
 		}
 	}
 

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java	2012-06-01 20:53:04 UTC (rev 41644)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java	2012-06-01 20:55:18 UTC (rev 41645)
@@ -94,5 +94,6 @@
 				dialog.open();
 			}
 		});
+		
 	}
 }