Author: rob.stryker(a)jboss.com Date: 2007-05-31 13:04:33 -0400 (Thu, 31 May 2007) New Revision: 2081 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossRuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss42RuntimeWizardFragment.java Log: JBIDE-477 (default directory) and EXIN-172 (4.2 icon) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2007-05-31 05:01:45 UTC (rev 2080) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2007-05-31 17:04:33 UTC (rev 2081) @@ -41,6 +41,7 @@ public static final String WIZBAN_JBOSS32_LOGO = "jboss32logo"; public static final String WIZBAN_JBOSS40_LOGO = "jboss40logo"; + public static final String WIZBAN_JBOSS42_LOGO = "jboss42logo"; public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE"; @@ -65,7 +66,8 @@ descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif")); descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif")); - + descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif")); + descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif")); descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif")); descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif")); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossRuntimeWizardFragment.java 2007-05-31 05:01:45 UTC (rev 2080) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossRuntimeWizardFragment.java 2007-05-31 17:04:33 UTC (rev 2081) @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.IVMInstallType; import org.eclipse.jdt.launching.JavaRuntime; @@ -164,7 +165,9 @@ private void setWidgetDefaults() { nameText.setText(generateNewRuntimeName()); - homeDirText.setText("c:/program files/jboss-" + getRuntimeVersionId() + ".x"); + homeDirText.setText( Platform.getOS() == Platform.WS_WIN32 ? + "c:/program files/jboss-" + getRuntimeVersionId() + ".x" : + "/usr/bin/jboss-" + getRuntimeVersionId() + ".x"); } private String generateNewRuntimeName() { String base = "JBoss-runtime"; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss42RuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss42RuntimeWizardFragment.java 2007-05-31 05:01:45 UTC (rev 2080) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss42RuntimeWizardFragment.java 2007-05-31 17:04:33 UTC (rev 2081) @@ -7,7 +7,7 @@ AbstractJBossRuntimeWizardFragment { protected ImageDescriptor getImageDescriptor() { - return JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO); + return JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO); } }