Attachment #82649 for bug #209220

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 209220
Collapse All | Expand All




		public Control createControl(Composite composite) {
			fGroup= new Group(composite, SWT.NONE);
			fGroup.setFont(composite.getFont());
			fGroup.setLayout(initGridLayout(new GridLayout(2, false), true));
			fGroup.setText(NewWizardMessages.NewJavaProjectWizardPageOne_JREGroup_title);

			fUseDefaultJRE.doFillIntoGrid(fGroup, 1);

			fPreferenceLink= new Link(fGroup, SWT.NONE);
			fPreferenceLink.setFont(fGroup.getFont());

			fPreferenceLink.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
			fPreferenceLink.addSelectionListener(this);

			Composite nonDefaultJREComposite= new Composite(fGroup, SWT.NONE);
			nonDefaultJREComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
			GridLayout layout= new GridLayout(2, false);
			layout.marginHeight= 0;
			layout.marginWidth= 0;
			nonDefaultJREComposite.setLayout(layout);

			fUseProjectJRE.doFillIntoGrid(nonDefaultJREComposite, 1);
			comboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); // make sure column 2 is grabbing (but no fill)
			comboControl.setVisibleItemCount(30);

			Combo comboControl= fJRECombo.getComboControl(nonDefaultJREComposite);
			comboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
			comboControl.setVisibleItemCount(30);

			fUseEEJRE.doFillIntoGrid(nonDefaultJREComposite, 1);

			Combo eeComboControl= fEECombo.getComboControl(nonDefaultJREComposite);
			eeComboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
			eeComboControl.setVisibleItemCount(30);

			DialogField.createEmptySpace(fGroup);

			updateEnableState();
			return fGroup;
		}

Return to bug 209220

Lines 455-464 Link Here

(-)ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java (-12 / +15 lines)
455	public Control createControl(Composite composite) {	455	public Control createControl(Composite composite) {
456	fGroup= new Group(composite, SWT.NONE);	456	fGroup= new Group(composite, SWT.NONE);
457	fGroup.setFont(composite.getFont());	457	fGroup.setFont(composite.getFont());
458	fGroup.setLayout(initGridLayout(new GridLayout(3, false), true));	458	fGroup.setLayout(initGridLayout(new GridLayout(2, false), true));
459	fGroup.setText(NewWizardMessages.NewJavaProjectWizardPageOne_JREGroup_title);	459	fGroup.setText(NewWizardMessages.NewJavaProjectWizardPageOne_JREGroup_title);
460		460
461	fUseDefaultJRE.doFillIntoGrid(fGroup, 2);	461	fUseDefaultJRE.doFillIntoGrid(fGroup, 1);
462		462
463	fPreferenceLink= new Link(fGroup, SWT.NONE);	463	fPreferenceLink= new Link(fGroup, SWT.NONE);
464	fPreferenceLink.setFont(fGroup.getFont());	464	fPreferenceLink.setFont(fGroup.getFont());
Lines 466-487 Link Here
466	fPreferenceLink.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));	466	fPreferenceLink.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
467	fPreferenceLink.addSelectionListener(this);	467	fPreferenceLink.addSelectionListener(this);
468		468
469	fUseProjectJRE.doFillIntoGrid(fGroup, 1);	469	Composite nonDefaultJREComposite= new Composite(fGroup, SWT.NONE);
		470	nonDefaultJREComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
		471	GridLayout layout= new GridLayout(2, false);
		472	layout.marginHeight= 0;
		473	layout.marginWidth= 0;
		474	nonDefaultJREComposite.setLayout(layout);
470		475
471	Combo comboControl= fJRECombo.getComboControl(fGroup);	476	fUseProjectJRE.doFillIntoGrid(nonDefaultJREComposite, 1);
472	comboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); // make sure column 2 is grabbing (but no fill)
473	comboControl.setVisibleItemCount(30);
474		477
475	DialogField.createEmptySpace(fGroup);	478	Combo comboControl= fJRECombo.getComboControl(nonDefaultJREComposite);
		479	comboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
		480	comboControl.setVisibleItemCount(30);
476		481
477	fUseEEJRE.doFillIntoGrid(fGroup, 1);	482	fUseEEJRE.doFillIntoGrid(nonDefaultJREComposite, 1);
478		483
479	Combo eeComboControl= fEECombo.getComboControl(fGroup);	484	Combo eeComboControl= fEECombo.getComboControl(nonDefaultJREComposite);
480	eeComboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); // make sure column 2 is grabbing (but no fill)	485	eeComboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
481	eeComboControl.setVisibleItemCount(30);	486	eeComboControl.setVisibleItemCount(30);
482		487
483	DialogField.createEmptySpace(fGroup);
484
485	updateEnableState();	488	updateEnableState();
486	return fGroup;	489	return fGroup;
487	}	490	}