Attachment 125788 Details for Bug 212327 – patch

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

[patch] patch

212327_patch.txt (text/plain), 6.98 KB, created by Kaloyan Raev

on 2009-02-16 08:51:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2009-02-16 08:51:50 EST

Size: 6.98 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.2
>diff -u -r1.2 EarJavaEEFacetInstallPage.java
>--- src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java	16 Feb 2009 10:59:24 -0000	1.2
>+++ src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java	16 Feb 2009 13:53:36 -0000
>@@ -11,6 +11,8 @@
>  **************************************************************************************************/
> 
> import org.eclipse.jst.j2ee.internal.J2EEConstants;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
> 
>@@ -25,7 +27,12 @@
> 
> 	protected Composite createTopLevelComposite(Composite parent) {
> 		Composite composite = super.createTopLevelComposite(parent);
>-		createGenerateDescriptorControl(composite, J2EEConstants.APPLICATION_DD_SHORT_NAME);
>+		
>+		Composite holder = new Composite(composite, SWT.NONE);
>+		holder.setLayout(new GridLayout());
>+		holder.setLayoutData(gdhfill());
>+		createGenerateDescriptorControl(holder, J2EEConstants.APPLICATION_DD_SHORT_NAME);
>+		
> 		return composite;
> 	}
> 	
>#P org.eclipse.jst.j2ee.ui
>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.16
>diff -u -r1.16 EarFacetInstallPage.java
>--- j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java	16 Feb 2009 10:59:33 -0000	1.16
>+++ j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java	16 Feb 2009 13:53:40 -0000
>@@ -88,27 +88,17 @@
> 	}
> 
> 	protected Composite createTopLevelComposite(Composite parent) {
>-		Composite modulesGroup = new Composite(parent, SWT.NONE);
>-		GridLayout layout = new GridLayout();
>-		modulesGroup.setLayout(layout);
> 		setInfopopID(IJ2EEUIContextIds.NEW_EAR_ADD_MODULES_PAGE);
>-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
>-		modulesGroup.setLayoutData(gridData);
>-		createModuleProjectOptions(modulesGroup);
>-		createButtonsGroup(modulesGroup);
> 		
>-		final Composite composite = new Composite(modulesGroup, SWT.NONE);
>-		composite.setLayout(new GridLayout(1, false));
>-
>-		this.contentDirLabel = new Label(composite, SWT.NONE);
>-		this.contentDirLabel.setText(Resources.contentDirLabel);
>-		this.contentDirLabel.setLayoutData(gdhfill());
>-
>-		this.contentDir = new Text(composite, SWT.BORDER);
>-		this.contentDir.setLayoutData(gdhfill());
>-		synchHelper.synchText(contentDir, CONTENT_DIR, null);
>+		Composite composite = new Composite(parent, SWT.NONE);
>+		composite.setLayout(new GridLayout());
>+		composite.setLayoutData(gdhfill());
>+		
>+		createModuleProjectOptions(composite);
>+		createContentDirGroup(composite);
>+		
> 	    Dialog.applyDialogFont(parent);
>-		return modulesGroup;
>+		return composite;
> 	}
> 
> 	protected int getJ2EEVersion() {
>@@ -117,14 +107,20 @@
> 	}
> 	
> 	/**
>-	 * @param modulesGroup
>+	 * @param parent
> 	 */
>-	private void createModuleProjectOptions(Composite modulesGroup) {
>-		moduleProjectsLabel = new Label(modulesGroup, SWT.NONE);
>+	private void createModuleProjectOptions(Composite parent) {
>+		Composite composite = new Composite(parent, SWT.NONE);
>+		composite.setLayout(new GridLayout(2, false));
>+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
>+		
>+		moduleProjectsLabel = new Label(composite, SWT.NONE);
> 		moduleProjectsLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_MODULE_DEPENDENCIES_LABEL));
>-		moduleProjectsLabel.setLayoutData(gdhfill());
>+		GridData gd = gdhfill();
>+		gd.horizontalSpan = 2;
>+		moduleProjectsLabel.setLayoutData(gd);
> 		
>-		moduleProjectsViewer = CheckboxTableViewer.newCheckList(modulesGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
>+		moduleProjectsViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
> 		GridData gData = new GridData(GridData.FILL_BOTH);
> 		gData.widthHint = 200;
> 		gData.heightHint = 80;
>@@ -148,6 +144,8 @@
> 		moduleProjectsViewer.getTable().setHeaderVisible(false);
> 		moduleProjectsViewer.getTable().setLinesVisible(false);
> 		moduleProjectsViewer.setSorter(null);
>+		
>+		createButtonsGroup(composite);
> 	}
> 
> 	/**
>@@ -214,30 +212,42 @@
> 	}
> 	
> 	
>-	protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
>+	protected void createButtonsGroup(Composite parent) {
> 		Composite buttonGroup = new Composite(parent, SWT.NONE);
>-		GridLayout layout = new GridLayout();
>-		layout.numColumns = 4;
>-		buttonGroup.setLayout(layout);
>-		buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
>+		buttonGroup.setLayout(new GridLayout());
>+		buttonGroup.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
>+		
> 		selectAllButton = new Button(buttonGroup, SWT.PUSH);
> 		selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_SELECT));
> 		selectAllButton.addListener(SWT.Selection, this);
>-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
>-		gd.widthHint = SWT.DEFAULT;
>-		selectAllButton.setLayoutData(gd);
>+		selectAllButton.setLayoutData(gdhfill());
>+		
> 		deselectAllButton = new Button(buttonGroup, SWT.PUSH);
> 		deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_DESELECT));
> 		deselectAllButton.addListener(SWT.Selection, this);
>-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
>-		gd.widthHint = SWT.DEFAULT;
>-		deselectAllButton.setLayoutData(gd);
>+		deselectAllButton.setLayoutData(gdhfill());
>+		
>+		new Label(buttonGroup, SWT.NONE); // pad
>+		
> 		newModuleButton = new Button(buttonGroup, SWT.PUSH);
> 		newModuleButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_NEW));
> 		newModuleButton.addListener(SWT.Selection, this);
>-		gd = new GridData(GridData.GRAB_HORIZONTAL);
>-		gd.minimumWidth = SWT.DEFAULT;
>-		newModuleButton.setLayoutData(gd);
>+		newModuleButton.setLayoutData(gdhfill());
>+	}
>+	
>+	private void createContentDirGroup(Composite modulesGroup) {
>+		final Composite composite = new Composite(modulesGroup, SWT.NONE);
>+		composite.setLayout(new GridLayout(2, false));
>+		composite.setLayoutData(gdhfill());
>+
>+		this.contentDirLabel = new Label(composite, SWT.NONE);
>+		this.contentDirLabel.setText(Resources.contentDirLabel);
>+		this.contentDirLabel.setLayoutData(new GridData());
>+
>+		this.contentDir = new Text(composite, SWT.BORDER);
>+		this.contentDir.setLayoutData(gdhfill());
>+		
>+		synchHelper.synchText(contentDir, CONTENT_DIR, null);
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 212327: 84808 | 125788