Author: rob.stryker(a)jboss.com Date: 2009-08-07 18:42:48 -0400 (Fri, 07 Aug 2009) New Revision: 17026 Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java Log: JBIDE-4709 - icons in branch Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java =================================================================== --- branches/jbosstools-3.0.x/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) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-08-07 22:42:48 UTC (rev 17026) @@ -39,14 +39,7 @@ public static final String IMG_JBOSS = "jboss"; public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration"; - public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo"; - public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo"; - public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo"; - public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo"; - public static final String WIZBAN_JBOSS51_LOGO = "jboss5.1logo"; //$NON-NLS-1$ - public static final String WIZBAN_JBOSS_EAP_LOGO_43 = "jbossEAPlogo43"; - public static final String WIZBAN_JBOSS_EAP_LOGO_50 = "jbossEAPlogo50"; - public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo"; + public static final String WIZBAN_JBOSS_LOGO = "jbossLogo"; //$NON-NLS-1$ public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE"; public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE"; @@ -73,14 +66,7 @@ descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle, "/icons/jboss.gif")); descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle, "/icons/jboss-configuration.gif")); - 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(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif")); - descriptors.put(WIZBAN_JBOSS51_LOGO, createImageDescriptor(pluginBundle, "/icons/logo51.gif")); - descriptors.put(WIZBAN_JBOSS_EAP_LOGO_43, createImageDescriptor(pluginBundle, "/icons/logoEAP43.gif")); - descriptors.put(WIZBAN_JBOSS_EAP_LOGO_50, createImageDescriptor(pluginBundle, "/icons/logoEAP50.gif")); - descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif")); + descriptors.put(WIZBAN_JBOSS_LOGO, createImageDescriptor(pluginBundle, "/icons/JBoss_byRH_logo_rgb.png")); 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: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- branches/jbosstools-3.0.x/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) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:42:48 UTC (rev 17026) @@ -139,24 +139,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("org.jboss.ide.eclipse.as.runtime.32")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO; - else if (id.equals("org.jboss.ide.eclipse.as.runtime.40")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO; - else if (id.equals("org.jboss.ide.eclipse.as.runtime.42")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; - else if (id.equals("org.jboss.ide.eclipse.as.runtime.50")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO; - else if (id.equals("org.jboss.ide.eclipse.as.runtime.51")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.50")) - imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50; + String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO; return JBossServerUISharedImages.getImageDescriptor(imageKey); } Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java =================================================================== --- branches/jbosstools-3.0.x/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) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:42:48 UTC (rev 17026) @@ -100,17 +100,7 @@ } public ImageDescriptor getImageDescriptor() { - IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME); - String id = rt.getRuntimeType().getId(); - String imageKey = ""; - if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.51")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43; - else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50; - + String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO; return JBossServerUISharedImages.getImageDescriptor(imageKey); } Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java =================================================================== --- branches/jbosstools-3.0.x/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) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:42:48 UTC (rev 17026) @@ -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; }