Author: rob.stryker(a)jboss.com Date: 2009-06-08 01:56:25 -0400 (Mon, 08 Jun 2009) New Revision: 15765 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-4428 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2009-06-08 05:46:44 UTC (rev 15764) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2009-06-08 05:56:25 UTC (rev 15765) @@ -41,7 +41,12 @@ private String getNextRuntimeName() { String version = getRuntime().getRuntimeType().getVersion(); - String base = Messages.jboss + " " + version + " " + Messages.runtime; //$NON-NLS-1$//$NON-NLS-2$ + String base = null; + if( getRuntime().getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.")) { //$NON-NLS-1$ + base = Messages.jboss + " EAP " + version + " " + Messages.runtime; //$NON-NLS-1$ //$NON-NLS-2$ + } else { + base = Messages.jboss + " " + version + " " + Messages.runtime; //$NON-NLS-1$//$NON-NLS-2$ + } return getNextRuntimeName(base); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-06-08 05:46:44 UTC (rev 15764) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-06-08 05:56:25 UTC (rev 15765) @@ -225,16 +225,6 @@ homeDirText.setEditable(canEdit); homeDirButton.setEnabled(canEdit); configurations.getTable().setVisible(canEdit); - } else { - // STUPID ECLIPSE BUG https://bugs.eclipse.org/bugs/show_bug.cgi?id=263928 - IRuntime r = (IRuntime) getTaskModel() - .getObject(TaskModel.TASK_RUNTIME); - String oldName = r.getName(); - if( r.isWorkingCopy() ) { - String newName = oldName.replace("Enterprise Application Platform", "EAP"); //$NON-NLS-1$ //$NON-NLS-2$ - newName = LocalJBossServerRuntime.getNextRuntimeName(newName); - ((IRuntimeWorkingCopy)r).setName(newName); - } } }