Author: rob.stryker(a)jboss.com Date: 2009-08-07 18:36:26 -0400 (Fri, 07 Aug 2009) New Revision: 17025 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif 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/JBossRuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java Log: JBIDE-4709 new logo Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif =================================================================== (Binary files differ) Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif =================================================================== (Binary files differ) 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 2009-08-07 22:07:58 UTC (rev 17024) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-08-07 22:36:26 UTC (rev 17025) @@ -39,14 +39,7 @@ public static final String IMG_JBOSS = "jboss"; //$NON-NLS-1$ public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS51_LOGO = "jboss5.1logo"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS_EAP_LOGO_43 = "jbossEAPlogo43"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS_EAP_LOGO_50 = "jbossEAPlogo50"; //$NON-NLS-1$ - public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo"; //$NON-NLS-1$ + public static final String WIZBAN_JBOSS_LOGO = "jbossLogo"; //$NON-NLS-1$ public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; //$NON-NLS-1$ public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE"; //$NON-NLS-1$ public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE"; //$NON-NLS-1$ @@ -73,14 +66,7 @@ descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle, "/icons/jboss.gif")); //$NON-NLS-1$ descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle, "/icons/jboss-configuration.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS51_LOGO, createImageDescriptor(pluginBundle, "/icons/logo51.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS_EAP_LOGO_43, createImageDescriptor(pluginBundle, "/icons/logoEAP43.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_JBOSS_EAP_LOGO_50, createImageDescriptor(pluginBundle, "/icons/logoEAP50.gif")); //$NON-NLS-1$ - descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif")); //$NON-NLS-1$ + descriptors.put(WIZBAN_JBOSS_LOGO, createImageDescriptor(pluginBundle, "/icons/JBoss_byRH_logo_rgb.png")); //$NON-NLS-1$ descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif")); //$NON-NLS-1$ descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif")); //$NON-NLS-1$ descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif")); //$NON-NLS-1$ 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-08-07 22:07:58 UTC (rev 17024) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025) @@ -81,7 +81,6 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.IConstants; -import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.JBossServerType; import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader; import org.jboss.ide.eclipse.as.ui.IPreferenceKeys; @@ -160,24 +159,7 @@ } protected ImageDescriptor getImageDescriptor() { - IRuntime rt = (IRuntime) getTaskModel().getObject( - TaskModel.TASK_RUNTIME); - String id = rt.getRuntimeType().getId(); - String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; - if (id.equals(IJBossToolingConstants.AS_32)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO; - else if (id.equals(IJBossToolingConstants.AS_40)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO; - else if (id.equals(IJBossToolingConstants.AS_42)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; - else if (id.equals(IJBossToolingConstants.AS_50)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO; - else if (id.equals(IJBossToolingConstants.AS_51)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO; - else if (id.equals(IJBossToolingConstants.EAP_43)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43; - else if (id.equals(IJBossToolingConstants.EAP_50)) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50; + String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO; return JBossServerUISharedImages.getImageDescriptor(imageKey); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:07:58 UTC (rev 17024) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025) @@ -44,7 +44,6 @@ import org.jboss.ide.eclipse.as.core.server.IDeployableServer; 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.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; @@ -96,17 +95,7 @@ } public ImageDescriptor getImageDescriptor() { - IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME); - String id = rt.getRuntimeType().getId(); - String imageKey = ""; //$NON-NLS-1$ - if( id.equals(IConstants.AS_32)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO; - else if( id.equals(IConstants.AS_40)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO; - else if( id.equals(IConstants.AS_42)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; - else if( id.equals(IConstants.AS_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO; - else if( id.equals(IConstants.AS_51)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO; - else if( id.equals(IConstants.EAP_43)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43; - else if( id.equals(IConstants.EAP_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50; - + String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO; return JBossServerUISharedImages.getImageDescriptor(imageKey); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:07:58 UTC (rev 17024) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025) @@ -172,7 +172,7 @@ tempDeployText.addModifyListener(ml); nameText.addModifyListener(ml); nameText.setText(getDefaultNameText()); - handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_DEPLOY_ONLY_LOGO)); + handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS_LOGO)); return main; }