Attachment 125771 Details for Bug 264992 – patch

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

[patch] patch

264992_patch.txt (text/plain), 11.65 KB, created by Kaloyan Raev

on 2009-02-16 05:55:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2009-02-16 05:55:04 EST

Size: 11.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jee.ui
>Index: src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 EarJavaEEFacetInstallPage.java
>--- src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java	25 Apr 2007 22:07:32 -0000	1.1
>+++ src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java	16 Feb 2009 10:58:18 -0000
>@@ -10,11 +10,9 @@
>  * Contributors: IBM Corporation - initial API and implementation
>  **************************************************************************************************/
> 
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.layout.GridData;
>+import org.eclipse.jst.j2ee.internal.J2EEConstants;
> 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 {
>@@ -27,17 +25,8 @@
> 
> 	protected Composite createTopLevelComposite(Composite parent) {
> 		Composite composite = super.createTopLevelComposite(parent);
>-		createDDSection(composite);
>+		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);
>-    }
> }
>#P org.eclipse.jst.ejb.ui
>Index: ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java,v
>retrieving revision 1.13
>diff -u -r1.13 EjbFacetInstallPage.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java	16 Feb 2009 10:07:47 -0000	1.13
>+++ ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbFacetInstallPage.java	16 Feb 2009 10:58:20 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
> import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
>+import org.eclipse.jst.j2ee.internal.J2EEConstants;
> import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
> import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
>@@ -62,7 +63,7 @@
> 		
> 		new Label(composite, SWT.NONE); // pad
> 		
>-        createGenerateDescriptorControl( composite );
>+        createGenerateDescriptorControl(composite, J2EEConstants.EJBJAR_DD_SHORT_NAME);
>         registerFacetVersionChangeListener();
>         
> 	    Dialog.applyDialogFont(parent);
>#P org.eclipse.jst.j2ee.ui
>Index: j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties,v
>retrieving revision 1.1
>diff -u -r1.1 J2EEModuleFacetInstallPage.properties
>--- j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties	10 Nov 2007 00:27:27 -0000	1.1
>+++ j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties	16 Feb 2009 10:58:21 -0000
>@@ -1 +1,2 @@
> generateDeploymentDescriptor = Generate deployment descriptor
>+generateDeploymentDescriptorWithFileName = Generate {0} deployment descriptor
>Index: j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java,v
>retrieving revision 1.11
>diff -u -r1.11 J2EEModuleFacetInstallPage.java
>--- j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java	4 Mar 2008 19:33:15 -0000	1.11
>+++ j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java	16 Feb 2009 10:58:21 -0000
>@@ -33,6 +33,9 @@
> 		super(pageName);
> 	}
> 
>+	/**
>+	 * @deprecated This member should not be used any more. The EAR Panel is moved to the first wizard page. 
>+	 */
> 	protected EarSelectionPanel earPanel;
> 
> 	public void dispose() {
>@@ -43,6 +46,9 @@
> 		super.dispose();
> 	}
> 
>+	/**
>+	 * @deprecated This method should not be called any more. The EAR Panel is moved to the first wizard page. 
>+	 */
> 	protected void setupEarControl(final Composite parent) {
> 		Composite c = new Composite(parent, SWT.NONE);
> 		c.setLayoutData(gdhfill());
>@@ -53,10 +59,17 @@
> 		this.earPanel = new EarSelectionPanel(model, c);
> 	}
> 	
>-	protected void createGenerateDescriptorControl( final Composite parent )
>-	{
>+	protected void createGenerateDescriptorControl(Composite parent) {
>+		createGenerateDescriptorControl(parent, null);
>+	}
>+	
>+	protected void createGenerateDescriptorControl(Composite parent, String ddFileName)	{
>         this.addDD = new Button(parent, SWT.CHECK);
>-        this.addDD.setText(Resources.generateDeploymentDescriptor);
>+        if (ddFileName == null) {
>+        	this.addDD.setText(Resources.generateDeploymentDescriptor);
>+        } else {
>+        	this.addDD.setText(NLS.bind(Resources.generateDeploymentDescriptorWithFileName, ddFileName));
>+        }
>         //synchHelper.synchCheckbox(addDD, GENERATE_DD, null); bug 215284 - see enter()
>         GridData gd = new GridData(GridData.FILL_HORIZONTAL);
>         gd.horizontalSpan = 2;
>@@ -100,7 +113,7 @@
> 
>     private static final class Resources extends NLS {
>         public static String generateDeploymentDescriptor;
>-
>+        public static String generateDeploymentDescriptorWithFileName;
> 
>         static {
>             initializeMessages(J2EEModuleFacetInstallPage.class.getName(), Resources.class);
>Index: j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java,v
>retrieving revision 1.10
>diff -u -r1.10 AppClientFacetInstallPage.java
>--- j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java	2 Feb 2009 20:14:21 -0000	1.10
>+++ j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java	16 Feb 2009 10:58:21 -0000
>@@ -12,6 +12,7 @@
> package org.eclipse.jst.j2ee.ui.project.facet.appclient;
> 
> import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jst.j2ee.internal.J2EEConstants;
> import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
> import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
>@@ -45,7 +46,7 @@
> 		createMainClass.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_CREATE_MAIN));
> 		synchHelper.synchCheckbox(createMainClass, CREATE_DEFAULT_MAIN_CLASS, null);
> 		
>-        createGenerateDescriptorControl( composite );
>+        createGenerateDescriptorControl(composite, J2EEConstants.APP_CLIENT_DD_SHORT_NAME);
>         registerFacetVersionChangeListener();
>         
> 	    Dialog.applyDialogFont(parent);
>Index: j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java,v
>retrieving revision 1.15
>diff -u -r1.15 EarFacetInstallPage.java
>--- j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java	17 Apr 2008 17:09:45 -0000	1.15
>+++ j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java	16 Feb 2009 10:58:21 -0000
>@@ -28,17 +28,18 @@
> 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;
>@@ -56,13 +57,12 @@
> 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 DataModelFacetInstallPage implements IEarFacetInstallDataModelProperties {
>+public class EarFacetInstallPage extends J2EEModuleFacetInstallPage implements IEarFacetInstallDataModelProperties {
> 	
> 	private Button selectAllButton;
> 	private Button deselectAllButton;
>#P org.eclipse.jst.servlet.ui
>Index: servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java,v
>retrieving revision 1.17
>diff -u -r1.17 WebFacetInstallPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java	2 Feb 2009 20:14:14 -0000	1.17
>+++ servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java	16 Feb 2009 10:58:24 -0000
>@@ -13,6 +13,7 @@
> package org.eclipse.jst.servlet.ui.project.facet;
> 
> import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jst.j2ee.internal.J2EEConstants;
> import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
> import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
> import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
>@@ -64,7 +65,7 @@
> 		this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
> 		synchHelper.synchText(contentDir, CONFIG_FOLDER, null);
> 		
>-		createGenerateDescriptorControl( composite );
>+		createGenerateDescriptorControl(composite, J2EEConstants.WEBAPP_DD_SHORT_NAME);
> 		registerFacetVersionChangeListener();
> 		
> 		Dialog.applyDialogFont(parent);

Actions: View | Diff

Attachments on bug 264992: 125771