Attachment #125771 for bug #264992

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 264992
Collapse All | Expand All




 * Contributors: IBM Corporation - initial API and implementation
 **************************************************************************************************/

import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;

public class EarJavaEEFacetInstallPage extends
		org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage {


	protected Composite createTopLevelComposite(Composite parent) {
		Composite composite = super.createTopLevelComposite(parent);
		createGenerateDescriptorControl(composite, J2EEConstants.APPLICATION_DD_SHORT_NAME);
		return composite;
	}
	
	private void createDDSection(Composite parent) {
		new Label(parent, SWT.NONE);
		addDD = new Button(parent, SWT.CHECK);
		addDD.setText(Messages.EarJavaEEFacetInstallPage_0);
		synchHelper.synchCheckbox(addDD, GENERATE_DD, null);
		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 2;
		addDD.setLayoutData(gd);
    }
}

Lines 13-18 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java (-1 / +2 lines)
13	import org.eclipse.jface.dialogs.Dialog;	13	import org.eclipse.jface.dialogs.Dialog;
14	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;	14	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
15	import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;	15	import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
		16	import org.eclipse.jst.j2ee.internal.J2EEConstants;
16	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;	17	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
17	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;	18	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
18	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;	19	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
Lines 62-68 Link Here
62		63
63	new Label(composite, SWT.NONE); // pad	64	new Label(composite, SWT.NONE); // pad
64		65
65	createGenerateDescriptorControl( composite );	66	createGenerateDescriptorControl(composite, J2EEConstants.EJBJAR_DD_SHORT_NAME);
66	registerFacetVersionChangeListener();	67	registerFacetVersionChangeListener();
67		68
68	Dialog.applyDialogFont(parent);	69	Dialog.applyDialogFont(parent);

Line 1 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties (+1 lines)
1	generateDeploymentDescriptor = Generate deployment descriptor	1	generateDeploymentDescriptor = Generate deployment descriptor
		2	generateDeploymentDescriptorWithFileName = Generate {0} deployment descriptor

Lines 33-38 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java (-4 / +17 lines)
33	super(pageName);	33	super(pageName);
34	}	34	}
35		35
		36	/**
		37	* @deprecated This member should not be used any more. The EAR Panel is moved to the first wizard page.
		38	*/
36	protected EarSelectionPanel earPanel;	39	protected EarSelectionPanel earPanel;
37		40
38	public void dispose() {	41	public void dispose() {
Lines 43-48 Link Here
43	super.dispose();	46	super.dispose();
44	}	47	}
45		48
		49	/**
		50	* @deprecated This method should not be called any more. The EAR Panel is moved to the first wizard page.
		51	*/
46	protected void setupEarControl(final Composite parent) {	52	protected void setupEarControl(final Composite parent) {
47	Composite c = new Composite(parent, SWT.NONE);	53	Composite c = new Composite(parent, SWT.NONE);
48	c.setLayoutData(gdhfill());	54	c.setLayoutData(gdhfill());
Lines 53-62 Link Here
53	this.earPanel = new EarSelectionPanel(model, c);	59	this.earPanel = new EarSelectionPanel(model, c);
54	}	60	}
55		61
56	protected void createGenerateDescriptorControl( final Composite parent )	62	protected void createGenerateDescriptorControl(Composite parent) {
57	{	63	createGenerateDescriptorControl(parent, null);
		64	}
		65
		66	protected void createGenerateDescriptorControl(Composite parent, String ddFileName) {
58	this.addDD = new Button(parent, SWT.CHECK);	67	this.addDD = new Button(parent, SWT.CHECK);
59	this.addDD.setText(Resources.generateDeploymentDescriptor);	68	if (ddFileName == null) {
		69	this.addDD.setText(Resources.generateDeploymentDescriptor);
		70	} else {
		71	this.addDD.setText(NLS.bind(Resources.generateDeploymentDescriptorWithFileName, ddFileName));
		72	}
60	//synchHelper.synchCheckbox(addDD, GENERATE_DD, null); bug 215284 - see enter()	73	//synchHelper.synchCheckbox(addDD, GENERATE_DD, null); bug 215284 - see enter()
61	GridData gd = new GridData(GridData.FILL_HORIZONTAL);	74	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
62	gd.horizontalSpan = 2;	75	gd.horizontalSpan = 2;
Lines 100-106 Link Here
100		113
101	private static final class Resources extends NLS {	114	private static final class Resources extends NLS {
102	public static String generateDeploymentDescriptor;	115	public static String generateDeploymentDescriptor;
103		116	public static String generateDeploymentDescriptorWithFileName;
104		117
105	static {	118	static {
106	initializeMessages(J2EEModuleFacetInstallPage.class.getName(), Resources.class);	119	initializeMessages(J2EEModuleFacetInstallPage.class.getName(), Resources.class);

Lines 12-17 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java (-1 / +2 lines)
12	package org.eclipse.jst.j2ee.ui.project.facet.appclient;	12	package org.eclipse.jst.j2ee.ui.project.facet.appclient;
13		13
14	import org.eclipse.jface.dialogs.Dialog;	14	import org.eclipse.jface.dialogs.Dialog;
		15	import org.eclipse.jst.j2ee.internal.J2EEConstants;
15	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;	16	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
16	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;	17	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
17	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;	18	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
Lines 45-51 Link Here
45	createMainClass.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_CREATE_MAIN));	46	createMainClass.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_CREATE_MAIN));
46	synchHelper.synchCheckbox(createMainClass, CREATE_DEFAULT_MAIN_CLASS, null);	47	synchHelper.synchCheckbox(createMainClass, CREATE_DEFAULT_MAIN_CLASS, null);
47		48
48	createGenerateDescriptorControl( composite );	49	createGenerateDescriptorControl(composite, J2EEConstants.APP_CLIENT_DD_SHORT_NAME);
49	registerFacetVersionChangeListener();	50	registerFacetVersionChangeListener();
50		51
51	Dialog.applyDialogFont(parent);	52	Dialog.applyDialogFont(parent);




import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.internal.AvailableJ2EEComponentsForEARContentProvider;
import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
import org.eclipse.jst.j2ee.internal.wizard.DefaultJ2EEComponentCreationWizard;
import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentLabelProvider;
import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;

import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectWorkingCopy;
import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;

/**
 * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
 */

public class EarFacetInstallPage extends J2EEModuleFacetInstallPage implements IEarFacetInstallDataModelProperties {
	
	private Button selectAllButton;
	private Button deselectAllButton;

Lines 13-18 Link Here

(-)servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java (-1 / +2 lines)
13	package org.eclipse.jst.servlet.ui.project.facet;	13	package org.eclipse.jst.servlet.ui.project.facet;
14		14
15	import org.eclipse.jface.dialogs.Dialog;	15	import org.eclipse.jface.dialogs.Dialog;
		16	import org.eclipse.jst.j2ee.internal.J2EEConstants;
16	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;	17	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
17	import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;	18	import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
18	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;	19	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
Lines 64-70 Link Here
64	this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$	65	this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
65	synchHelper.synchText(contentDir, CONFIG_FOLDER, null);	66	synchHelper.synchText(contentDir, CONFIG_FOLDER, null);
66		67
67	createGenerateDescriptorControl( composite );	68	createGenerateDescriptorControl(composite, J2EEConstants.WEBAPP_DD_SHORT_NAME);
68	registerFacetVersionChangeListener();	69	registerFacetVersionChangeListener();
69		70
70	Dialog.applyDialogFont(parent);	71	Dialog.applyDialogFont(parent);

Return to bug 264992

Lines 10-20 Link Here

(-)src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java (-13 / +2 lines)
10	* Contributors: IBM Corporation - initial API and implementation	10	* Contributors: IBM Corporation - initial API and implementation
11	**************************************************************************************************/	11	**************************************************************************************************/
12		12
13	import org.eclipse.swt.SWT;	13	import org.eclipse.jst.j2ee.internal.J2EEConstants;
14	import org.eclipse.swt.layout.GridData;
15	import org.eclipse.swt.widgets.Button;	14	import org.eclipse.swt.widgets.Button;
16	import org.eclipse.swt.widgets.Composite;	15	import org.eclipse.swt.widgets.Composite;
17	import org.eclipse.swt.widgets.Label;
18		16
19	public class EarJavaEEFacetInstallPage extends	17	public class EarJavaEEFacetInstallPage extends
20	org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage {	18	org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage {
Lines 27-43 Link Here
27		25
28	protected Composite createTopLevelComposite(Composite parent) {	26	protected Composite createTopLevelComposite(Composite parent) {
29	Composite composite = super.createTopLevelComposite(parent);	27	Composite composite = super.createTopLevelComposite(parent);
30	createDDSection(composite);	28	createGenerateDescriptorControl(composite, J2EEConstants.APPLICATION_DD_SHORT_NAME);
31	return composite;	29	return composite;
32	}	30	}
33		31
34	private void createDDSection(Composite parent) {
35	new Label(parent, SWT.NONE);
36	addDD = new Button(parent, SWT.CHECK);
37	addDD.setText(Messages.EarJavaEEFacetInstallPage_0);
38	synchHelper.synchCheckbox(addDD, GENERATE_DD, null);
39	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
40	gd.horizontalSpan = 2;
41	addDD.setLayoutData(gd);
42	}
43	}	32	}

Lines 28-44 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java (-3 / +3 lines)
28	import org.eclipse.jface.viewers.ICheckStateListener;	28	import org.eclipse.jface.viewers.ICheckStateListener;
29	import org.eclipse.jface.viewers.TableLayout;	29	import org.eclipse.jface.viewers.TableLayout;
30	import org.eclipse.jface.wizard.WizardDialog;	30	import org.eclipse.jface.wizard.WizardDialog;
		31	import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
31	import org.eclipse.jst.j2ee.internal.AvailableJ2EEComponentsForEARContentProvider;	32	import org.eclipse.jst.j2ee.internal.AvailableJ2EEComponentsForEARContentProvider;
32	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;	33	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
33	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;	34	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
34	import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;	35	import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
35	import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;	36	import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
36	import org.eclipse.jst.j2ee.internal.earcreation.IEarFacetInstallDataModelProperties;
37	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;	37	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
38	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;	38	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
39	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;	39	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
40	import org.eclipse.jst.j2ee.internal.wizard.DefaultJ2EEComponentCreationWizard;	40	import org.eclipse.jst.j2ee.internal.wizard.DefaultJ2EEComponentCreationWizard;
41	import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentLabelProvider;	41	import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentLabelProvider;
		42	import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
42	import org.eclipse.osgi.util.NLS;	43	import org.eclipse.osgi.util.NLS;
43	import org.eclipse.swt.SWT;	44	import org.eclipse.swt.SWT;
44	import org.eclipse.swt.layout.GridData;	45	import org.eclipse.swt.layout.GridData;
Lines 56-68 Link Here
56	import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;	57	import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
57	import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectWorkingCopy;	58	import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectWorkingCopy;
58	import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;	59	import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
59	import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
60		60
61	/**	61	/**
62	* @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>	62	* @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
63	*/	63	*/
64		64
65	public class EarFacetInstallPage extends DataModelFacetInstallPage implements IEarFacetInstallDataModelProperties {	65	public class EarFacetInstallPage extends J2EEModuleFacetInstallPage implements IEarFacetInstallDataModelProperties {
66		66
67	private Button selectAllButton;	67	private Button selectAllButton;
68	private Button deselectAllButton;	68	private Button deselectAllButton;