[jbosstools-commits] JBoss Tools SVN: r9506 - in trunk/portlet/plugins/org.jboss.tools.portlet.ui: src/org/jboss/tools/portlet/operations and 2 other directories.

Author: snjeza Date: 2008-08-04 20:52:07 -0400 (Mon, 04 Aug 2008) New Revision: 9506 Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewSeamPortletWizard.java Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddPortletWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java Log: JBIDE-2234 JBoss Seam Portlet - created the Seam Portlet Wizard Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-08-05 00:52:07 UTC (rev 9506) @@ -42,6 +42,15 @@ <description>Create a new JBoss JSF Portlet</description> <selection class="org.eclipse.core.resources.IResource" /> </wizard> + <wizard + id="org.jboss.tools.portlet.ui.wizard.NewSeamPortletWizard" + name="JBoss Seam Portlet" + class="org.jboss.tools.portlet.ui.internal.wizard.NewSeamPortletWizard" + category="org.jboss.tools.jst.web/org.jboss.tools.portlet" + icon="icons/portlet_wiz.gif"> + <description>Create a new JBoss Seam Portlet</description> + <selection class="org.eclipse.core.resources.IResource" /> + </wizard> </extension> </plugin> Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -12,12 +12,14 @@ import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INSTANCE_NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.JBOSS_APP; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_REGION; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PARENT_PORTAL; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PORTLET_HEIGHT; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INITIAL_WINDOW_STATE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.TITLE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.VIEW_MODE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.WINDOW_NAME; @@ -96,7 +98,9 @@ @Override protected NewJavaEEArtifactClassOperation getNewClassOperation() { boolean isJSFPortlet = model.getBooleanProperty(IS_JSF_PORTLET); - if (!isJSFPortlet) { + boolean isSeamPortlet = model.getBooleanProperty(IS_SEAM_PORTLET); + + if (!isJSFPortlet && !isSeamPortlet) { return new NewPortletClassOperation(getDataModel()); } NewJavaEEArtifactClassOperation op = new NewJavaEEArtifactClassOperation(getDataModel()) { @@ -275,6 +279,7 @@ String parent = model.getStringProperty(PARENT_PORTAL);; String region = model.getStringProperty(PAGE_REGION); String height = model.getStringProperty(PORTLET_HEIGHT); + String initialWindowState = model.getStringProperty(INITIAL_WINDOW_STATE); IProject project = getTargetProject(); IVirtualComponent component = ComponentCore.createComponent(project); @@ -318,6 +323,7 @@ addNode(document,window,"instance-ref",instanceId); addNode(document,window,"region",region); addNode(document,window,"height",height); + addNode(document,window,"initial-window-state",initialWindowState); domModel.save(); } catch (Exception e) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -41,6 +41,8 @@ static final String PORTLET_HEIGHT = "NewPortletClassDataModel.PORTLET_HEIGHT"; + static final String INITIAL_WINDOW_STATE = "NewPortletClassDataModel.INITIAL_WINDOW_STATE"; + static final String IF_EXISTS = "NewPortletClassDataModel.IF_EXISTS"; static final String ADD_PORTLET = "NewPortletClassDataModel.ADD_PORTLET"; @@ -53,5 +55,7 @@ static final String IS_JSF_PORTLET = "NewPortletClassDataModel.IS_JSF_PORTLET"; + static final String IS_SEAM_PORTLET = "NewPortletClassDataModel.IS_SEAM_PORTLET"; + static final String COPY_JSF_TEMPLATES = "NewPortletClassDataModel.COPY_JSF_TEMPLATES"; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -59,12 +59,16 @@ static final String PARENT_PORTAL_LABEL = "Parent Reference:"; static final String PAGE_REGION_LABEL = "Region:"; static final String PORTLET_HEIGHT_LABEL = "Height:"; + static final String INITIAL_WINDOW_STATE_LABEL = "Initial Window State:"; static final String IF_EXISTS_LABEL = "If Exists:"; static final String NEW_JBOSS_JSF_PORTLET_WIZARD_PAGE_DESC = "Specify class file information"; static final String JBOSS_JSF_PORTLET_CLASS = "javax.portlet.faces.GenericFacesPortlet"; static final String JBOSS_JSF_PORTLET_NAME = "riPortlet"; + static final String JBOSS_SEAM_PORTLET_NAME = "seamPortlet"; static final String JBOSS_JSF_DISPLAY_PORTLET_NAME = "JBoss JSF Portlet"; static final String JBOSS_JSF_PORTLET_TITLE = "JBoss JSF Portlet"; + static final String JBOSS_SEAM_DISPLAY_PORTLET_NAME = "JBoss Seam Portlet"; + static final String JBOSS_SEAM_PORTLET_TITLE = "JBoss Seam Portlet"; static final String JBOSS_APP_LABEL = "JBoss Application Name:"; static final String ADD_JBOSS_APP_LABEL = "Create JBoss Application"; static final String ADD_JBOSS_PORTLET_LABEL = "Add the jboss-portlet.xml file"; Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -19,6 +19,7 @@ import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE; import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.TITLE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INSTANCE_NAME; @@ -31,6 +32,7 @@ import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_REGION; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PARENT_PORTAL; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PORTLET_HEIGHT; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INITIAL_WINDOW_STATE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.JBOSS_APP; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; @@ -41,6 +43,7 @@ import static org.jboss.tools.portlet.ui.IPortletUIConstants.PAGE_REGION_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PARENT_PORTAL_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PORTLET_HEIGHT_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.INITIAL_WINDOW_STATE_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.JBOSS_APP_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_APP_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_PORTLET_LABEL; @@ -137,7 +140,7 @@ Label ifExistsLabel = new Label(composite, SWT.LEFT); ifExistsLabel.setText(IF_EXISTS_LABEL); ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Combo ifExistsCombo = new Combo(composite,SWT.NONE); + final Combo ifExistsCombo = new Combo(composite,SWT.READ_ONLY); ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); ifExistsCombo.setItems(new String[] {"overwrite","keep"}); synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); @@ -190,6 +193,15 @@ heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(heightText, PORTLET_HEIGHT, null); + // initial window state + Label initialWindowStateLabel = new Label(composite, SWT.LEFT); + initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); + initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); + final Combo initialWindowStateCombo = new Combo(composite,SWT.READ_ONLY); + initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + initialWindowStateCombo.setItems(new String[] {"maximized","minimized","normal"}); + synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, null); + addPortlet.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -203,7 +215,7 @@ } }); - if (isJSFPortlet()) { + if (isJSFPortlet() || isSeamPortlet()) { final Button addJBossApp = new Button(composite, SWT.CHECK); addJBossApp.setText(ADD_JBOSS_APP_LABEL); gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); @@ -258,4 +270,8 @@ protected boolean isJSFPortlet() { return model.getBooleanProperty(IS_JSF_PORTLET); } + + protected boolean isSeamPortlet() { + return model.getBooleanProperty(IS_SEAM_PORTLET); + } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddPortletWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddPortletWizardPage.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddPortletWizardPage.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -24,6 +24,7 @@ import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.TITLE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.Dialog; @@ -118,6 +119,17 @@ initSection.setInput(initParamList); } + if (isSeamPortlet()) { + List<String[]> initParamList = new ArrayList<String[]>(); + String[] arrayString = new String[3]; + arrayString[0]="javax.portlet.faces.defaultViewId.view"; + arrayString[1]="/home.xhtml"; + arrayString[2]=""; + initParamList.add(arrayString); + + initSection.setInput(initParamList); + + } String text = nameText.getText(); @@ -174,6 +186,9 @@ if (isJSFPortlet()) { nameText.setText(IPortletUIConstants.JBOSS_JSF_PORTLET_NAME); } + if (isSeamPortlet()) { + nameText.setText(IPortletUIConstants.JBOSS_SEAM_PORTLET_NAME); + } // display name Label displayNameLabel = new Label(composite, SWT.LEFT); @@ -185,6 +200,10 @@ if (isJSFPortlet()) { displayNameText.setText(IPortletUIConstants.JBOSS_JSF_DISPLAY_PORTLET_NAME); } + if (isSeamPortlet()) { + displayNameText.setText(IPortletUIConstants.JBOSS_SEAM_DISPLAY_PORTLET_NAME); + } + // title Label titleLabel = new Label(composite, SWT.LEFT); titleLabel.setText(IPortletUIConstants.TITLE_LABEL); @@ -195,6 +214,10 @@ if (isJSFPortlet()) { titleText.setText(IPortletUIConstants.JBOSS_JSF_PORTLET_TITLE); } + if (isSeamPortlet()) { + titleText.setText(IPortletUIConstants.JBOSS_SEAM_PORTLET_TITLE); + } + // description Label descLabel = new Label(composite, SWT.LEFT); descLabel.setText(DESCRIPTION_LABEL); @@ -222,4 +245,8 @@ protected boolean isJSFPortlet() { return model.getBooleanProperty(IS_JSF_PORTLET); } + + protected boolean isSeamPortlet() { + return model.getBooleanProperty(IS_SEAM_PORTLET); + } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -6,6 +6,9 @@ import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.BROWSE_BUTTON_LABEL; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLASS_NAME_LABEL; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; + import java.util.ArrayList; import java.util.List; @@ -117,13 +120,19 @@ getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT)); IProject project = (IProject) model.getProperty(PROJECT); IVirtualComponent component = ComponentCore.createComponent(project); - MultiSelectFilteredFileSelectionDialog ms = new MultiSelectFilteredFileSelectionDialog( - getShell(), - "New JSF Portlet", - "Choose a JSF portlet class:", - new String[0], - false, - project); + MultiSelectFilteredFileSelectionDialog ms = null; + if (model.getBooleanProperty(IS_JSF_PORTLET)) { + ms = new MultiSelectFilteredFileSelectionDialog( + getShell(), "New JSF Portlet", + "Choose a JSF portlet class:", new String[0], false, + project); + } + if (model.getBooleanProperty(IS_SEAM_PORTLET)) { + ms = new MultiSelectFilteredFileSelectionDialog( + getShell(), "New Seam Portlet", + "Choose a Seam portlet class:", new String[0], false, + project); + } IContainer root = component.getRootFolder().getUnderlyingFolder(); ms.setInput(root); ms.open(); @@ -244,6 +253,13 @@ return result; try { result = FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.JSFPORTLET_FACET_ID); + if (!result) { + return result; + } + boolean isSeamProject = model.getBooleanProperty(IS_SEAM_PORTLET); + if (isSeamProject) { + result = FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.SEAMPORTLET_FACET_ID); + } } catch (CoreException ce) { result = false; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -79,7 +79,7 @@ @Override protected IDataModelProvider getDefaultProvider() { - return new NewPortletClassDataModelProvider(true); + return new NewPortletClassDataModelProvider(true,false); } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2008-08-04 20:42:10 UTC (rev 9505) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -49,12 +49,15 @@ private boolean isJSFPortlet; - public NewPortletClassDataModelProvider(boolean isJSFPortlet) { + private boolean isSeamPortlet; + + public NewPortletClassDataModelProvider(boolean isJSFPortlet, boolean isSeamPortlet) { this.isJSFPortlet = isJSFPortlet; + this.isSeamPortlet = isSeamPortlet; } public NewPortletClassDataModelProvider() { - this(false); + this(false,false); } /** @@ -107,12 +110,14 @@ propertyNames.add(PARENT_PORTAL); propertyNames.add(PAGE_REGION); propertyNames.add(PORTLET_HEIGHT); + propertyNames.add(INITIAL_WINDOW_STATE); propertyNames.add(IF_EXISTS); propertyNames.add(ADD_PORTLET); propertyNames.add(ADD_JBOSS_APP); propertyNames.add(ADD_JBOSS_PORTLET); propertyNames.add(JBOSS_APP); propertyNames.add(IS_JSF_PORTLET); + propertyNames.add(IS_SEAM_PORTLET); propertyNames.add(COPY_JSF_TEMPLATES); return propertyNames; @@ -148,6 +153,11 @@ return Boolean.TRUE; return Boolean.FALSE; } + if (propertyName.equals(IS_SEAM_PORTLET)) { + if (isSeamPortlet) + return Boolean.TRUE; + return Boolean.FALSE; + } if (propertyName.equals(COPY_JSF_TEMPLATES)) { return Boolean.FALSE; } @@ -209,24 +219,42 @@ return Boolean.FALSE; if (propertyName.equals(INSTANCE_NAME)) { - return getDefaultProperty(NAME) + "Instance"; + return getPortletPrefix() + "Instance"; } if (propertyName.equals(WINDOW_NAME)) { - return getDefaultProperty(NAME) + "Window"; + return getPortletPrefix() + "Window"; } if (propertyName.equals(PAGE_NAME)) { + if (isSeamPortlet) { + return "SeamPortlet"; + } + if (isJSFPortlet) { + return "JSFPortlet"; + } return ""; } if (propertyName.equals(PORTLET_HEIGHT)) { return "1"; } + if (propertyName.equals(INITIAL_WINDOW_STATE)) { + return "maximized"; + } if (propertyName.equals(JBOSS_APP)) { - return "riPortletApp"; + if (isSeamPortlet) { + return "seamPortletApp"; + } + if (isJSFPortlet) { + return "riPortletApp"; + } + return "portletApp"; } if (propertyName.equals(PAGE_REGION)) { return "center"; } if (propertyName.equals(PARENT_PORTAL)) { + if (isSeamPortlet || isJSFPortlet) { + return "default"; + } return "default.default"; } if (propertyName.equals(IF_EXISTS)) { @@ -237,13 +265,25 @@ return super.getDefaultProperty(propertyName); } + private String getPortletPrefix() { + String prefix = null; + if (isSeamPortlet) { + prefix = "SeamPortlet"; + } else if (isJSFPortlet) { + prefix = "JSFPortlet"; + } else { + prefix = (String) getDefaultProperty(NAME); + } + return prefix; + } + @Override public IStatus validate(String propertyName) { // Validate super class if (propertyName.equals(SUPERCLASS)) return validateSuperClassName(getStringProperty(propertyName)); - if (isJSFPortlet && propertyName.equals(CLASS_NAME)) { + if ((isJSFPortlet || isSeamPortlet) && propertyName.equals(CLASS_NAME)) { if (getStringProperty(propertyName).length()!=0) { return Status.OK_STATUS; } Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewSeamPortletWizard.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewSeamPortletWizard.java (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewSeamPortletWizard.java 2008-08-05 00:52:07 UTC (rev 9506) @@ -0,0 +1,76 @@ +package org.jboss.tools.portlet.ui.internal.wizard; + +import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jst.servlet.ui.IWebUIContextIds; +import org.eclipse.jst.servlet.ui.internal.wizard.NewServletClassOptionsWizardPage; +import org.eclipse.jst.servlet.ui.internal.wizard.NewWebArtifactWizard; +import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties; +import org.jboss.tools.portlet.ui.IPortletUIConstants; +import org.jboss.tools.portlet.ui.PortletUIActivator; + +/** + * New portlet wizard + */ +public class NewSeamPortletWizard extends NewWebArtifactWizard { + + public NewSeamPortletWizard() { + this(null); + } + + public NewSeamPortletWizard(IDataModel model) { + super(model); + } + + @Override + protected String getTitle() { + return IPortletUIConstants.NEW_PORTLET_WIZARD_PAGE_TITLE; + } + + @Override + protected ImageDescriptor getImage() { + return PortletUIActivator.imageDescriptorFromPlugin(PortletUIActivator.PLUGIN_ID, "/icons/portlet_wiz.gif"); + } + + @Override + public void doAddPages() { + NewJSFPortletClassWizardPage page1 = new NewJSFPortletClassWizardPage( + getDataModel(), + PAGE_ONE,NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC, + IPortletUIConstants.NEW_PORTLET_WIZARD_PAGE_TITLE, IModuleConstants.JST_WEB_MODULE); + //page1.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1); + addPage(page1); + AddPortletWizardPage page2 = new AddPortletWizardPage(getDataModel(), PAGE_TWO); + //page2.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2); + addPage(page2); + AddJBossPortletWizardPage page3 = new AddJBossPortletWizardPage(getDataModel(), PAGE_THREE); + addPage(page3); + } + + @Override + protected void postPerformFinish() throws InvocationTargetException { + // open the portlet.xml file + IProject project = (IProject) getDataModel().getProperty(PROJECT); + IFile portletFile = PortletUIActivator.getPortletXmlFile(project); + if (portletFile == null) { + return; + } + openEditor(portletFile); + } + + @Override + protected IDataModelProvider getDefaultProvider() { + return new NewPortletClassDataModelProvider(false,true); + } + +}