[jbosstools-commits] JBoss Tools SVN: r40556 - in trunk: central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards and 1 other directories.

Author: fbricon Date: 2012-04-27 06:15:56 -0400 (Fri, 27 Apr 2012) New Revision: 40556 Added: trunk/central/plugins/org.jboss.tools.central/icons/ear_background.gif trunk/central/plugins/org.jboss.tools.central/icons/gwt_background.png trunk/central/plugins/org.jboss.tools.central/icons/html5_background.png trunk/central/plugins/org.jboss.tools.central/icons/richfaces_background.png trunk/central/plugins/org.jboss.tools.central/icons/spring_background.png trunk/central/plugins/org.jboss.tools.central/icons/web_background.gif Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewGwtProjectWizard.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewHtml5ProjectWizard.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeEarProjectWizard.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeWarProjectWizard.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewRichfacesProjectWizard.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewSpringMvcProjectWizard.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesLocationPage.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java Log: JBIDE-10692 : use contextual background image for wizards in Central Removed imagedescriptor from individual pages as it prevents them to inherit image from the wizard. Added: trunk/central/plugins/org.jboss.tools.central/icons/ear_background.gif =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/ear_background.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central/icons/gwt_background.png =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/gwt_background.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central/icons/html5_background.png =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/html5_background.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central/icons/richfaces_background.png =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/richfaces_background.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central/icons/spring_background.png =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/spring_background.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/central/plugins/org.jboss.tools.central/icons/web_background.gif =================================================================== (Binary files differ) Property changes on: trunk/central/plugins/org.jboss.tools.central/icons/web_background.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -17,8 +17,13 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.tools.central.JBossCentralActivator; import org.jboss.tools.central.jobs.RefreshTutorialsJob; +import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard2; @@ -98,5 +103,15 @@ } } + protected void initializeDefaultPageImageDescriptor() { + String imagePath = getWizardBackgroundImagePath(); + ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(JBossCentralActivator.PLUGIN_ID, + imagePath); + setDefaultPageImageDescriptor(desc); + } + protected String getWizardBackgroundImagePath() { + return "icons/new_wiz.gif"; + } + } Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewGwtProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewGwtProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewGwtProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -15,4 +15,8 @@ public NewGwtProjectWizard() { super("gwt-webapp"); } + + protected String getWizardBackgroundImagePath() { + return "icons/gwt_background.png"; + } } Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewHtml5ProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewHtml5ProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewHtml5ProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -15,4 +15,8 @@ public NewHtml5ProjectWizard() { super("jboss-javaee6-poh5-archetype"); } + + protected String getWizardBackgroundImagePath() { + return "icons/html5_background.png"; + } } Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeEarProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeEarProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeEarProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -15,4 +15,8 @@ public NewJavaeeEarProjectWizard() { super("multi-javaee6-archetype"); } + + protected String getWizardBackgroundImagePath() { + return "icons/ear_background.gif"; + } } Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeWarProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeWarProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewJavaeeWarProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -15,4 +15,8 @@ public NewJavaeeWarProjectWizard() { super("jboss-javaee6-webapp"); } + + protected String getWizardBackgroundImagePath() { + return "icons/web_background.gif"; + } } Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewRichfacesProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewRichfacesProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewRichfacesProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -15,4 +15,8 @@ public NewRichfacesProjectWizard() { super("richfaces-archetype-simpleapp"); } + + protected String getWizardBackgroundImagePath() { + return "icons/richfaces_background.png"; + } } Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewSpringMvcProjectWizard.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewSpringMvcProjectWizard.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/NewSpringMvcProjectWizard.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -15,4 +15,8 @@ public NewSpringMvcProjectWizard() { super("spring-mvc-webapp"); } + + protected String getWizardBackgroundImagePath() { + return "icons/spring_background.png"; + } } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesLocationPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesLocationPage.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesLocationPage.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -49,7 +49,6 @@ super("org.jboss.tools.project.examples.location"); //$NON-NLS-1$ setTitle( "Location" ); setDescription( "Project Example Location and Workspace" ); - setImageDescriptor( ProjectExamplesActivator.imageDescriptorFromPlugin(ProjectExamplesActivator.PLUGIN_ID, "icons/new_wiz.gif")); //$NON-NLS-1$ fWorkingSetGroup= new WorkingSetGroup(); setWorkingSets(new IWorkingSet[0]); } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -82,7 +82,6 @@ super("org.jboss.tools.project.examples.main"); //$NON-NLS-1$ setTitle( Messages.NewProjectExamplesWizardPage_Project_Example ); setDescription( Messages.NewProjectExamplesWizardPage_Import_Project_Example ); - setImageDescriptor( ProjectExamplesActivator.imageDescriptorFromPlugin(ProjectExamplesActivator.PLUGIN_ID, "icons/new_wiz.gif")); //$NON-NLS-1$ this.requirementsPage = requirementsPage; //this.readyPage = readyPage; this.pages = pages; Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -28,7 +28,6 @@ public NewProjectExamplesReadyPage(List<ProjectExample> projectExamples) { super("org.jboss.tools.project.examples.ready"); //$NON-NLS-1$ - setImageDescriptor( ProjectExamplesActivator.imageDescriptorFromPlugin(ProjectExamplesActivator.PLUGIN_ID, "icons/new_wiz.gif")); //$NON-NLS-1$ this.projectExamples = projectExamples; } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-04-27 09:50:16 UTC (rev 40555) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-04-27 10:15:56 UTC (rev 40556) @@ -107,7 +107,6 @@ protected NewProjectExamplesRequirementsPage() { super(PAGE_NAME); setTitleAndDescription(null); - setImageDescriptor( ProjectExamplesActivator.imageDescriptorFromPlugin(ProjectExamplesActivator.PLUGIN_ID, "icons/new_wiz.gif")); //$NON-NLS-1$ checkboxOn = RuntimeUIActivator.imageDescriptorFromPlugin(RuntimeUIActivator.PLUGIN_ID, "/icons/xpl/complete_tsk.gif").createImage(); checkboxOff = RuntimeUIActivator.imageDescriptorFromPlugin(RuntimeUIActivator.PLUGIN_ID, "/icons/xpl/incomplete_tsk.gif").createImage(); }