[jbosstools-commits] JBoss Tools SVN: r27001 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 10:21:37 -0500 (Mon, 29 Nov 2010)
New Revision: 27001
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
JBIDE-7019 - regression fix
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-11-29
14:53:24 UTC (rev 27000)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-11-29
15:21:37 UTC (rev 27001)
@@ -54,8 +54,9 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.IProgressService;
import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
@@ -103,8 +104,11 @@
};
combo.getCombo().addModifyListener(comboMListener);
- IServer original = callback.getServer().getOriginal();
- if( original != null && ServerConverter.getJBossServer(original) != null ) {
+ IServerWorkingCopy cServer = callback.getServer();
+ JBossServer jbs = cServer.getOriginal() == null ?
+ ServerConverter.getJBossServer(cServer) :
+ ServerConverter.getJBossServer(cServer.getOriginal());
+ if( jbs != null ) {
Label serverHomeLabel = new Label(this, SWT.NONE);
serverHomeLabel.setText("Remote Server Home: ");