Author: rob.stryker(a)jboss.com Date: 2011-12-15 07:08:14 -0500 (Thu, 15 Dec 2011) New Revision: 37348 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java Log: RSE ui for eap6 and as7.1 was not correct 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 2011-12-15 11:01:44 UTC (rev 37347) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-12-15 12:08:14 UTC (rev 37348) @@ -64,6 +64,7 @@ import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; import org.jboss.ide.eclipse.as.rse.core.RSEUtils; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; @@ -124,15 +125,14 @@ JBossServer jbs = cServer.getOriginal() == null ? ServerConverter.getJBossServer(cServer) : ServerConverter.getJBossServer(cServer.getOriginal()); - if( jbs != null && !cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ) { + if( jbs == null ) + composite = new DeployOnlyRSEPrefComposite(parent, SWT.NONE, callback); + else if( !ServerUtil.isJBoss7(cServer.getServerType())) composite = new JBossRSEDeploymentPrefComposite(parent, SWT.NONE, callback); - } else if( cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ){ + else if( ServerUtil.isJBoss7(cServer.getServerType())){ composite = new JBoss7RSEDeploymentPrefComposite(parent, SWT.NONE, callback); - // TODO add for jboss 7 - } else { - composite = new DeployOnlyRSEPrefComposite(parent, SWT.NONE, callback); } - //return composite; + // NEW_SERVER_ADAPTER potential location for new server details } public static abstract class RSEDeploymentPreferenceComposite extends Composite implements PropertyChangeListener {