Author: dgolovin Date: 2007-07-13 04:47:45 -0400 (Fri, 13 Jul 2007) New Revision: 2423 Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationVizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFofrmWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java Log: http://jira.jboss.org/jira/browse/EXIN-222 Fields were added to wizard http://jira.jboss.org/jira/browse/EXIN-223 Fields were added to wizard Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -24,5 +24,5 @@ public static String SEAM_METHOD_NAME = "seam.method.name"; public static String SEAM_PAGE_NAME = "seam.page.name"; public static String SEAM_MASTER_PAGE_NAME = "seam.master.page.name"; - + public static String SEAM_ENTITY_CLASS_NAME = "seam.entity.class.name"; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -24,10 +24,9 @@ public SeamActionWizard() { super(CREATE_SEAM_ACTION); - setWindowTitle("Create New Action"); + setWindowTitle("New Seam Action"); //setDefaultPageImageDescriptor(); addPage(new SeamActionWizardPage1()); - } // TODO move operations to core plugin Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -10,41 +10,20 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.PlatformUI; -import org.jboss.tools.seam.ui.internal.project.facet.SwtFieldEditorFactory; -import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory; -import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; - /** * @author eskimo * */ public class SeamActionWizardPage1 extends SeamBaseWizardPage { - - public SeamActionWizardPage1(String pageName, String title, - ImageDescriptor titleImage) { - super(pageName, title, titleImage); - } - - public SeamActionWizardPage1(String pageName) { - super(pageName); - } - /** * @param pageName * @param title * @param titleImage */ public SeamActionWizardPage1() { - super("Create New Action", "Create a new Java interface and SLSB with key Seam/EJB annotations.", null); - addEditors(SeamWizardFactory.createDefaultWizardEditors(SeamWizardUtils.getSelectedProjectName())); + super("seam.new.action.page1", "Seam Action", null); + setMessage("Select the name of the new Seam Conversation. A new Java interface and SLSB " + + "with key Seam/EJB annotations will be created."); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -24,7 +24,6 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.wst.common.frameworks.internal.ui.RunnableWithProgressWrapper; import org.jboss.tools.seam.core.SeamCorePlugin; /** @@ -78,6 +77,7 @@ * @return */ public IUndoableOperation getOperation() { + if(operation!=null) return operation; throw new IllegalStateException("Operation is not defined for wizard"); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -39,6 +39,7 @@ public SeamBaseWizardPage(String pageName, String title, ImageDescriptor titleImage) { super(pageName, title, titleImage); + createEditors(); } /** @@ -46,9 +47,13 @@ */ protected SeamBaseWizardPage(String pageName) { super(pageName); + createEditors(); + } + protected void createEditors() { + addEditors(SeamWizardFactory.createDefaultWizardEditors(SeamWizardUtils.getSelectedProjectName())); } - + Map<String,IFieldEditor> editorRegistry = new HashMap<String,IFieldEditor>(); List<IFieldEditor> editorOrder = new ArrayList<IFieldEditor>(); @@ -105,6 +110,10 @@ columnNumber=fieldEditor.getNumberOfControls(); } GridLayout gl = new GridLayout(columnNumber,false); + gl.verticalSpacing = 5; + gl.marginTop = 3; + gl.marginLeft = 3; + gl.marginRight = 3; setLayout(gl); for (IFieldEditor fieldEditor2 : editorOrder) { fieldEditor2.doFillIntoGrid(this); Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationVizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationVizardPage1.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationVizardPage1.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.seam.ui.wizard; + +/** + * @author eskimo + * + */ +public class SeamConversationVizardPage1 extends SeamBaseWizardPage { + + public SeamConversationVizardPage1() { + super("seam.new.conversation.page1","Seam Conversation",null); + setMessage("Select the name of the new Seam Conversation. A set of classes " + + "managing a coversation will be created."); + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -18,17 +18,14 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; public class SeamConversationWizard extends SeamBaseWizard implements INewWizard { public SeamConversationWizard() { super(CREATE_SEAM_CONVERSATION); setWindowTitle("reate New Conversation"); - addPage(new SeamActionWizardPage1()); + addPage(new SeamConversationVizardPage1()); } public static final IUndoableOperation CREATE_SEAM_CONVERSATION = new SeamBaseOperation("Action creating operation"){ Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -10,39 +10,43 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.Wizard; +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; /** * @author eskimo * */ -public class SeamEntityWizard extends Wizard implements INewWizard { +public class SeamEntityWizard extends SeamBaseWizard implements INewWizard { /** * */ public SeamEntityWizard() { - // TODO Auto-generated constructor stub + super(CREATE_SEAM_ENTITY); + setWindowTitle("New Seam Entity"); + addPage(new SeamEntityWizardPage1()); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - // TODO Auto-generated method stub - return false; - } + + // TODO move operations to core plugin + public static final IUndoableOperation CREATE_SEAM_ENTITY = new SeamBaseOperation("Action creating operation"){ - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - // TODO Auto-generated method stub + @Override + public IStatus execute(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + Map params = (Map)info.getAdapter(Map.class); + + return Status.OK_STATUS; + } + + }; - } - } Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.seam.ui.wizard; + +/** + * @author eskimo + * + */ +public class SeamEntityWizardPage1 extends SeamBaseWizardPage { + + /** + * + */ + public SeamEntityWizardPage1() { + super("seam.new.entity.page1","Seam Entity", null); + setMessage("Select the name of the new Seam Entity. A new Seam Entity Bean with key Seam/EJB3 " + + "annotations and wxample attributes will be created."); + } + + /** + * + */ + protected void createEditors() { + addEditor(SeamWizardFactory.createSeamProjctSelectionFieldEditor(SeamWizardUtils.getSelectedProjectName())); + addEditor(SeamWizardFactory.createSeamEntityClasNameFieldEditor()); + addEditor(SeamWizardFactory.createSeamMasterPageNameFieldEditor()); + addEditor(SeamWizardFactory.createSeamPageNameFieldEditor()); + } +} Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFofrmWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFofrmWizard.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFofrmWizard.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -10,31 +10,39 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.Wizard; +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; /** * * @author eskimo * */ -public class SeamFofrmWizard extends Wizard implements INewWizard { +public class SeamFofrmWizard extends SeamBaseWizard implements INewWizard { public SeamFofrmWizard() { - // TODO Auto-generated constructor stub + super(CREATE_SEAM_FORM); + setWindowTitle("New Seam Form"); + addPage(new SeamFormWizardPage1()); } - @Override - public boolean performFinish() { - // TODO Auto-generated method stub - return false; - } + private static IUndoableOperation CREATE_SEAM_FORM = new SeamBaseOperation("Action creating operation"){ - public void init(IWorkbench workbench, IStructuredSelection selection) { - // TODO Auto-generated method stub - - } - + @Override + public IStatus execute(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + Map params = (Map)info.getAdapter(Map.class); + + return Status.OK_STATUS; + } + + }; + } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -10,45 +10,19 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; -import java.util.Arrays; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; -import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory; - /** * @author eskimo * */ -public class SeamFormWizardPage1 extends WizardPage { +public class SeamFormWizardPage1 extends SeamBaseWizardPage { /** * @param pageName */ - public SeamFormWizardPage1(String pageName) { - super(pageName); - // TODO Auto-generated constructor stub + public SeamFormWizardPage1() { + super("seam.new.form.page1","Seam Form",null); + setMessage("Select the name of the new Seam Form. A new Seam Form with a single input field and related " + + "Java Interface, SLSB and key Seam/EJB3 annotations will be created."); } - - /** - * @param pageName - * @param title - * @param titleImage - */ - public SeamFormWizardPage1(String pageName, String title, - ImageDescriptor titleImage) { - super(pageName, title, titleImage); - // TODO Auto-generated constructor stub - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.IDialogPage; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardPage; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -11,11 +11,9 @@ package org.jboss.tools.seam.ui.wizard; -import org.eclipse.core.resources.IProject; import org.jboss.tools.seam.ui.internal.project.facet.SwtFieldEditorFactory; import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; -import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor.ButtonPressedAction; /** * @author eskimo @@ -81,4 +79,12 @@ SeamWizardFactory.createSeamPageNameFieldEditor() }; } + + /** + * @return + */ + public static IFieldEditor createSeamEntityClasNameFieldEditor() { + return SwtFieldEditorFactory.INSTANCE.createTextEditor( + IParameter.SEAM_ENTITY_CLASS_NAME, "Seam entity class name:", ""); + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java 2007-07-13 08:30:53 UTC (rev 2422) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java 2007-07-13 08:47:45 UTC (rev 2423) @@ -13,12 +13,9 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.ListDialog; -import org.eclipse.ui.model.WorkbenchLabelProvider; import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor; public class SelectSeamProjectAction extends ButtonFieldEditor.ButtonPressedAction {