[jbosstools-commits] JBoss Tools SVN: r1969 - in trunk/core/plugins/org.jboss.ide.eclipse.firstrun: src/main/org/jboss/ide/eclipse/firstrun and 2 other directories.

Author: mculpepper(a)jboss.com Date: 2007-04-30 18:30:13 -0400 (Mon, 30 Apr 2007) New Revision: 1969 Added: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/icons/rhds_wiz.png Removed: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/icons/jbosside-logo.png Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunMessages.properties trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunPlugin.java trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunFinalPage.java trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunInfoPage.java trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunFinalPage20.java trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunInfoPage20.java Log: updated messaging and icon to reflect RHDS branding rather than old JBossIDE branding Deleted: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/icons/jbosside-logo.png =================================================================== (Binary files differ) Added: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/icons/rhds_wiz.png =================================================================== (Binary files differ) Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/icons/rhds_wiz.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunMessages.properties =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunMessages.properties 2007-04-30 20:26:05 UTC (rev 1968) +++ trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunMessages.properties 2007-04-30 22:30:13 UTC (rev 1969) @@ -29,22 +29,22 @@ InfoPage20.title=Welcome InfoPage20.info=\ -Welcome to JBossIDE 2.0 for Eclipse!\n\n\ -This wizard is here to aid in the conversion of current users of JBossIDE 1.5/1.6 to JBossIDE 2.0.\n\ +Welcome to Red Hat Developer Studio!\n\n\ +This wizard is here to aid in the conversion of current users of JBossIDE 1.5/1.6 to Red Hat Developer Studio.\n\ It is recommended that all JBossIDE users perform this conversion, as both JBossAS support and\n\ Packaging have been radically changed. When you are ready to continue on with the wizard, \n\ go ahead and press "Next >"\n\n\ If you have already run this wizard previously, or think that you can safely skip this wizard,\n\ just press "Cancel". InfoPage20.welcomeOnly=\ -Welcome to JBossIDE 2.0 for Eclipse!\n\n\ -This wizard is here solely to welcome you to your new version of JBoss IDE. \n\ +Welcome to Red Hat Developer Studio!\n\n\ +This wizard is here solely to welcome you to your new version of Red Hat Developer Studio. \n\ Hopefully all is to your liking! FinalPage20.title=Finished FinalPage20.info=\ Any changes you made will be completed as soon as you press "Finish"\n\n\n\ -Thanks for installing JBossIDE 2.0 for Eclipse! +Thanks for installing Red Hat Developer Studio! -ProgressMonitor.TaskName=Upgrading JBossIDE Workspace +ProgressMonitor.TaskName=Upgrading Workspace Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunPlugin.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunPlugin.java 2007-04-30 20:26:05 UTC (rev 1968) +++ trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/FirstRunPlugin.java 2007-04-30 22:30:13 UTC (rev 1969) @@ -49,7 +49,7 @@ "org.jboss.ide.eclipse.firstrun.version"; - public static final String ICON_JBOSSIDE_LOGO = "icons/jbosside-logo.png"; + public static final String ICON_RHDS_LOGO = "icons/rhds_wiz.png"; /** * The constructor. Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunFinalPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunFinalPage.java 2007-04-30 20:26:05 UTC (rev 1968) +++ trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunFinalPage.java 2007-04-30 22:30:13 UTC (rev 1969) @@ -33,7 +33,7 @@ public FirstRunFinalPage() { super(FirstRunMessages.getString("FinalPage.title"), FirstRunMessages.getString("FirstRunWizard.title"), - FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_JBOSSIDE_LOGO)); + FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_RHDS_LOGO)); } public void createControl(Composite parent) { Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunInfoPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunInfoPage.java 2007-04-30 20:26:05 UTC (rev 1968) +++ trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/FirstRunInfoPage.java 2007-04-30 22:30:13 UTC (rev 1969) @@ -34,7 +34,7 @@ public FirstRunInfoPage() { super(FirstRunMessages.getString("InfoPage.title"), FirstRunMessages.getString("FirstRunWizard.title"), - FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_JBOSSIDE_LOGO)); + FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_RHDS_LOGO)); } public void createControl(Composite parent) Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunFinalPage20.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunFinalPage20.java 2007-04-30 20:26:05 UTC (rev 1968) +++ trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunFinalPage20.java 2007-04-30 22:30:13 UTC (rev 1969) @@ -35,7 +35,7 @@ public FirstRunFinalPage20() { super(FirstRunMessages.getString("FinalPage20.title"), FirstRunMessages.getString("FirstRunWizard.title"), - FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_JBOSSIDE_LOGO)); + FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_RHDS_LOGO)); } public void createControl(Composite parent) Modified: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunInfoPage20.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunInfoPage20.java 2007-04-30 20:26:05 UTC (rev 1968) +++ trunk/core/plugins/org.jboss.ide.eclipse.firstrun/src/main/org/jboss/ide/eclipse/firstrun/wizard/pages/upgrade20/FirstRunInfoPage20.java 2007-04-30 22:30:13 UTC (rev 1969) @@ -23,7 +23,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.jboss.ide.eclipse.firstrun.FirstRunMessages; @@ -36,7 +37,7 @@ public FirstRunInfoPage20() { super(FirstRunMessages.getString("InfoPage20.title"), FirstRunMessages.getString("FirstRunWizard.title"), - FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_JBOSSIDE_LOGO)); + FirstRunPlugin.getImageDescriptor(FirstRunPlugin.ICON_RHDS_LOGO)); } public void createControl(Composite parent) @@ -44,15 +45,16 @@ setTitle(FirstRunMessages.getString("InfoPage20.title")); Composite main = new Composite(parent, SWT.NONE); - main.setLayout(new FillLayout()); + main.setLayout(new GridLayout(1, false)); Label label = new Label(main, SWT.WRAP); - + label.setLayoutData(new GridData(GridData.FILL_BOTH)); + if( ((FirstRunWizard)getWizard()).getNumPagesWithChanges() != 0 ) label.setText(FirstRunMessages.getString("InfoPage20.info")); else label.setText(FirstRunMessages.getString("InfoPage20.welcomeOnly")); - + setControl(main); }