[jbosstools-commits] JBoss Tools SVN: r23700 - in workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2010-07-23 08:40:16 -0400 (Fri, 23 Jul 2010)
New Revision: 23700

Modified:
   workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
   workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
Log:
Slight changes and a bit of javadoc for a method that cna return null JBIDE-6580

Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java	2010-07-23 12:15:09 UTC (rev 23699)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java	2010-07-23 12:40:16 UTC (rev 23700)
@@ -35,7 +35,7 @@
 import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
 import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
 import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
 import org.jboss.ide.eclipse.as.core.server.xpl.ModulePackager;
 import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
 import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
@@ -43,6 +43,7 @@
 import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentTypePrefs;
 import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
 import org.jboss.ide.eclipse.as.core.util.IWTPConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
 import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
 
 public class PublishUtil {
@@ -83,8 +84,9 @@
 	
 	public static String getDeployRootFolder(IModule[] moduleTree, 
 			IDeployableServer server, String defaultFolder, String moduleProperty) {
-		IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server.getServer());
-		return getDeployRootFolder(moduleTree, type.getId(), 
+		DeployableServerBehavior behavior = ServerConverter.getDeployableServerBehavior(server.getServer());
+		String typeId = behavior.createPublishMethod().getPublishMethodType().getId();
+		return getDeployRootFolder(moduleTree, typeId, 
 				server, defaultFolder, moduleProperty);
 	}
 	

Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java	2010-07-23 12:15:09 UTC (rev 23699)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java	2010-07-23 12:40:16 UTC (rev 23700)
@@ -32,6 +32,16 @@
 	public static final String DEPLOYMENT_PREFERENCES_KEY = "org.jboss.ide.eclipse.as.core.util.deploymentPreferenceKey"; //$NON-NLS-1$
 	public static final String CURRENT_METHOD_PROPERTY = "publishMethod"; //$NON-NLS-1$	
 	
+	/**
+	 * This method can return null and is only meant to show what deployment method
+	 * is currently stored in a server's deployment preferences.
+	 * 
+	 * To get a more accurate version (with a default) please use
+	 * DeployableServerBehavior.createPublishMethod().getPublishMethodType()
+	 * 
+	 * @param server
+	 * @return
+	 */
 	public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server) {
 		DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
 		String type = prefs.getProperty(DeploymentPreferenceLoader.CURRENT_METHOD_PROPERTY);