Author: fbricon Date: 2011-12-19 12:26:08 -0500 (Mon, 19 Dec 2011) New Revision: 37435 Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.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/ArchetypeExamplesWizardPage.java Log: JBIDE-10504 : fix selecting a package from the previous history to enable the Finish Button Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-12-19 16:45:49 UTC (rev 37434) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-12-19 17:26:08 UTC (rev 37435) @@ -19,13 +19,9 @@ import java.util.List; import java.util.Set; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.m2e.core.MavenPlugin; @@ -33,7 +29,6 @@ import org.eclipse.m2e.core.project.LocalProjectScanner; import org.eclipse.m2e.core.project.MavenProjectInfo; import org.eclipse.m2e.core.project.ProjectImportConfiguration; -import org.eclipse.m2e.core.ui.internal.UpdateConfigurationJob; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.maven.project.examples.wizard.ArchetypeExamplesWizard; 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-12-19 16:45:49 UTC (rev 37434) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-12-19 17:26:08 UTC (rev 37435) @@ -20,13 +20,11 @@ import org.apache.maven.model.Model; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -35,7 +33,6 @@ import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.core.project.ProjectImportConfiguration; -import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil; import org.eclipse.osgi.util.NLS; @@ -43,11 +40,9 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkingSet; -import org.jboss.tools.maven.project.examples.ImportMavenArchetypeProjectExample; import org.jboss.tools.maven.project.examples.MavenProjectExamplesActivator; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.Project; @@ -180,15 +175,17 @@ @Override public void modifyText(ModifyEvent e) { wizardPage.setArtifactId(simplePage.getProjectName()); + ArchetypeExamplesWizard.this.getContainer().updateButtons(); } }); simplePage.setPackageNameModifyListener(new ModifyListener() { - + @Override public void modifyText(ModifyEvent e) { String packageName = ((Combo)e.getSource()).getText(); wizardPage.setPackageName(packageName); + ArchetypeExamplesWizard.this.getContainer().updateButtons(); } }); @@ -201,11 +198,7 @@ }); } - @Override - public boolean canFinish() { - // TODO Auto-generated method stub - return super.canFinish(); - } + public String getProjectName() { return projectName; } 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-12-19 16:45:49 UTC (rev 37434) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2011-12-19 17:26:08 UTC (rev 37435) @@ -33,7 +33,6 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.viewers.ViewerColumn; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.internal.MavenPluginActivator;