Author: fbricon Date: 2011-11-30 05:53:58 -0500 (Wed, 30 Nov 2011) New Revision: 36772 Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/ trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/new_wiz.png Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java Log: JBIDE-9776 : Fixed package selection in page 1 updating the groupId in page 2. The advanced section is displayed if specific maven profiles are set changed the wizard icon Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2011-11-30 10:53:58 UTC (rev 36772) @@ -8,4 +8,6 @@ about.ini,\ about.mappings,\ about.properties,\ - jboss_about.png + jboss_about.png,\ + icons/ +src.includes = src/ Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/new_wiz.png =================================================================== (Binary files differ) Property changes on: trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/new_wiz.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -9,6 +9,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.project.MavenProjectInfo; @@ -102,4 +104,8 @@ } return projectName; } + + public static ImageDescriptor getNewWizardImageDescriptor() { + return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, "icons/new_wiz.png"); + } } Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -70,7 +70,7 @@ public ArchetypeExamplesWizard(File location, Project projectDescription) { super(); setWindowTitle("New JBoss project"); - setDefaultPageImageDescriptor(MavenImages.WIZ_NEW_PROJECT); + setDefaultPageImageDescriptor(MavenProjectExamplesActivator.getNewWizardImageDescriptor()); setNeedsProgressMonitor(true); this.projectDescription = projectDescription; } Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -76,12 +76,15 @@ private ModifyListener projectNameModifyListener; private ModifyListener packageNameModifyListener; private ModifyListener propertyModifyListener; + private final Project projectDescription; public ArchetypeExamplesWizardFirstPage( ProjectImportConfiguration configuration, Project projectDescription, List<IWorkingSet> workingSet) { super(configuration, projectDescription.getShortDescription(),Messages.ArchetypeExamplesWizardFirstPage_Title, workingSet); + this.projectDescription = projectDescription; setPageComplete(false); + } @Override @@ -136,6 +139,11 @@ emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1)); + + /* + projectNameCombo.setText(projectDescription.getArchetypeModel().getArtifactId()); + packageCombo.setText(projectDescription.getArchetypeModel().getJavaPackage()); + */ } @Override Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -123,6 +123,8 @@ groupIdCombo.setText(groupId); versionCombo.setText(version); packageCombo.setText(javaPackage); + + resolverConfigurationComponent.setExpanded(!resolverConfigurationComponent.getResolverConfiguration().getActiveProfileList().isEmpty()); } @Override @@ -140,9 +142,6 @@ //TODO delete that code warningLink = new Composite(parent, SWT.NONE); -// Display display = Display.getCurrent(); -// Color color = display.getSystemColor(SWT.COLOR_BLUE); -// warningLink.setBackground(color); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).span(3, 1) .applyTo(warningLink); GridLayoutFactory.fillDefaults().numColumns(2).applyTo(warningLink); @@ -166,7 +165,6 @@ } } }); - //link.setBackground(display.getSystemColor(SWT.COLOR_RED)); warningLink.setVisible(false); } @@ -284,7 +282,7 @@ if (!packageCombo.getText().equals(packageName)){ packageCombo.setText(packageName); } - if (groupIdCombo.getText().equals(packageName)){ + if (!groupIdCombo.getText().equals(packageName)){ groupIdCombo.setText(packageName); } }