Attachment #116970 for bug #230469

Lines 689-695 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (+4 lines)
689	ContentPage_fprovider = Fragment P&rovider:	689	ContentPage_fprovider = Fragment P&rovider:
690	ContentPage_generate = &Generate an activator, a Java class that controls the plug-in's life cycle	690	ContentPage_generate = &Generate an activator, a Java class that controls the plug-in's life cycle
691	ContentPage_classname = Ac&tivator:	691	ContentPage_classname = Ac&tivator:
		692	ContentPage_createTestFragment=Create a test fragment
692	ContentPage_uicontribution = T&his plug-in will make contributions to the UI	693	ContentPage_uicontribution = T&his plug-in will make contributions to the UI
		694	ContentPage_useJUnit3=Use JUnit 3
		695	ContentPage_useJUnit4=Use JUnit 4
693	FragmentContentPage_pid = &Plug-in ID:	696	FragmentContentPage_pid = &Plug-in ID:
694	FragmentContentPage_pversion = Pl&ug-in Version:	697	FragmentContentPage_pversion = Pl&ug-in Version:
695	ContentPage_browse = Bro&wse...	698	ContentPage_browse = Bro&wse...
Lines 746-751 Link Here
746	CompCSDetails_Name=Name*:	749	CompCSDetails_Name=Name*:
747	ContentSection_open=Open	750	ContentSection_open=Open
748	ContentPage_illegalCharactersInID = Project name contained characters which are not legal for the id, they have been converted to underscores.	751	ContentPage_illegalCharactersInID = Project name contained characters which are not legal for the id, they have been converted to underscores.
		752	ContentPage_optionsGroup=Options
749	ContentSection_targetContentDesc=Select the plug-ins and features that make up this target.	753	ContentSection_targetContentDesc=Select the plug-ins and features that make up this target.
750	ContentSection_includeOptional=Include optional dependencies when computing required plug-ins	754	ContentSection_includeOptional=Include optional dependencies when computing required plug-ins
751	ContentSection_addDialogButtonLabel=Show &workspace plug-ins	755	ContentSection_addDialogButtonLabel=Show &workspace plug-ins





package org.eclipse.pde.internal.ui.wizards.plugin;

import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;

import java.util.TreeSet;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jdt.launching.IVMInstall;

import org.eclipse.pde.internal.core.util.VersionUtil;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
import org.eclipse.pde.internal.ui.parts.PluginVersionPart;
import org.eclipse.pde.internal.ui.util.SWTUtil;
import org.eclipse.pde.internal.ui.wizards.IProjectProvider;

	private Button fExeEnvButton;
	private Combo fEEChoice;
	private final static String NO_EXECUTION_ENVIRONMENT = PDEUIMessages.PluginContentPage_noEE;
	private Button junit3Radio;
	private Button junit4Radio;
	private boolean createTestFragment = false;

	protected ModifyListener listener = new ModifyListener() {
		public void modifyText(ModifyEvent e) {


		createFragmentPropertiesGroup(container);
		createParentPluginGroup(container);
		createJunitOptionsGroup(container);

		Dialog.applyDialogFont(container);
		setControl(container);


	}

	private void createJunitOptionsGroup(Composite container) {
		Group junitGroup = new Group(container, SWT.NONE);
		junitGroup.setLayout(new GridLayout(2, false));
		junitGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		junitGroup.setText(PDEUIMessages.ContentPage_optionsGroup);

		Button testFragmentCheck = new Button(junitGroup, SWT.CHECK);
		testFragmentCheck.setText(PDEUIMessages.ContentPage_createTestFragment);
		GridData gd = new GridData(GridData.FILL_BOTH);
		gd.horizontalSpan = 2;
		testFragmentCheck.setLayoutData(gd);
		testFragmentCheck.setSelection(createTestFragment);

		testFragmentCheck.addSelectionListener(new SelectionListener() {

			public void widgetDefaultSelected(SelectionEvent e) {
				// TODO Auto-generated method stub

			}

			public void widgetSelected(SelectionEvent e) {
				createTestFragment = !createTestFragment;
				if (createTestFragment == true) {
					junit3Radio.setEnabled(true);
					junit4Radio.setEnabled(true);
				} else {
					junit3Radio.setEnabled(false);
					junit4Radio.setEnabled(false);
				}

			}

		});

		junit3Radio = new Button(junitGroup, SWT.RADIO);
		junit3Radio.setText(PDEUIMessages.ContentPage_useJUnit3);
		junit3Radio.setSelection(true);
		junit3Radio.setEnabled(false);

		junit4Radio = new Button(junitGroup, SWT.RADIO);
		junit4Radio.setText(PDEUIMessages.ContentPage_useJUnit4);
		junit4Radio.setSelection(false);
		junit4Radio.setEnabled(false);

	}

	private Composite createNewVersionComp(Composite notebook) {
		Composite comp = new Composite(notebook, SWT.NONE);
		GridLayout layout = new GridLayout(3, false);

Return to bug 230469

Lines 1330-1336 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+8 lines)
1330	public static String ContentPage_fprovider;	1330	public static String ContentPage_fprovider;
1331	public static String ContentPage_generate;	1331	public static String ContentPage_generate;
1332	public static String ContentPage_classname;	1332	public static String ContentPage_classname;
		1333
		1334	public static String ContentPage_createTestFragment;
1333	public static String ContentPage_uicontribution;	1335	public static String ContentPage_uicontribution;
		1336
		1337	public static String ContentPage_useJUnit3;
		1338
		1339	public static String ContentPage_useJUnit4;
1334	public static String FragmentContentPage_pid;	1340	public static String FragmentContentPage_pid;
1335	public static String FragmentContentPage_pversion;	1341	public static String FragmentContentPage_pversion;
1336	public static String ContentPage_browse;	1342	public static String ContentPage_browse;
Lines 1344-1349 Link Here
1344	public static String ContentPage_fragment;	1350	public static String ContentPage_fragment;
1345	public static String ContentPage_plugin;	1351	public static String ContentPage_plugin;
1346	public static String ContentPage_illegalCharactersInID;	1352	public static String ContentPage_illegalCharactersInID;
		1353
		1354	public static String ContentPage_optionsGroup;
1347	public static String WizardListSelectionPage_title;	1355	public static String WizardListSelectionPage_title;
1348	public static String WizardListSelectionPage_desc;	1356	public static String WizardListSelectionPage_desc;
1349	public static String WizardListSelectionPage_label;	1357	public static String WizardListSelectionPage_label;

Lines 12-19 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java (-2 / +51 lines)
12		12
13	package org.eclipse.pde.internal.ui.wizards.plugin;	13	package org.eclipse.pde.internal.ui.wizards.plugin;
14		14
15	import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
16
17	import java.util.TreeSet;	15	import java.util.TreeSet;
18	import org.eclipse.core.runtime.IStatus;	16	import org.eclipse.core.runtime.IStatus;
19	import org.eclipse.jdt.launching.IVMInstall;	17	import org.eclipse.jdt.launching.IVMInstall;
Lines 26-31 Link Here
26	import org.eclipse.pde.internal.core.util.VersionUtil;	24	import org.eclipse.pde.internal.core.util.VersionUtil;
27	import org.eclipse.pde.internal.ui.IHelpContextIds;	25	import org.eclipse.pde.internal.ui.IHelpContextIds;
28	import org.eclipse.pde.internal.ui.PDEUIMessages;	26	import org.eclipse.pde.internal.ui.PDEUIMessages;
		27	import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
29	import org.eclipse.pde.internal.ui.parts.PluginVersionPart;	28	import org.eclipse.pde.internal.ui.parts.PluginVersionPart;
30	import org.eclipse.pde.internal.ui.util.SWTUtil;	29	import org.eclipse.pde.internal.ui.util.SWTUtil;
31	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;	30	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
Lines 56-61 Link Here
56	private Button fExeEnvButton;	55	private Button fExeEnvButton;
57	private Combo fEEChoice;	56	private Combo fEEChoice;
58	private final static String NO_EXECUTION_ENVIRONMENT = PDEUIMessages.PluginContentPage_noEE;	57	private final static String NO_EXECUTION_ENVIRONMENT = PDEUIMessages.PluginContentPage_noEE;
		58	private Button junit3Radio;
		59	private Button junit4Radio;
		60	private boolean createTestFragment = false;
59		61
60	protected ModifyListener listener = new ModifyListener() {	62	protected ModifyListener listener = new ModifyListener() {
61	public void modifyText(ModifyEvent e) {	63	public void modifyText(ModifyEvent e) {
Lines 82-87 Link Here
82		84
83	createFragmentPropertiesGroup(container);	85	createFragmentPropertiesGroup(container);
84	createParentPluginGroup(container);	86	createParentPluginGroup(container);
		87	createJunitOptionsGroup(container);
85		88
86	Dialog.applyDialogFont(container);	89	Dialog.applyDialogFont(container);
87	setControl(container);	90	setControl(container);
Lines 132-137 Link Here
132		135
133	}	136	}
134		137
		138	private void createJunitOptionsGroup(Composite container) {
		139	Group junitGroup = new Group(container, SWT.NONE);
		140	junitGroup.setLayout(new GridLayout(2, false));
		141	junitGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		142	junitGroup.setText(PDEUIMessages.ContentPage_optionsGroup);
		143
		144	Button testFragmentCheck = new Button(junitGroup, SWT.CHECK);
		145	testFragmentCheck.setText(PDEUIMessages.ContentPage_createTestFragment);
		146	GridData gd = new GridData(GridData.FILL_BOTH);
		147	gd.horizontalSpan = 2;
		148	testFragmentCheck.setLayoutData(gd);
		149	testFragmentCheck.setSelection(createTestFragment);
		150
		151	testFragmentCheck.addSelectionListener(new SelectionListener() {
		152
		153	public void widgetDefaultSelected(SelectionEvent e) {
		154	// TODO Auto-generated method stub
		155
		156	}
		157
		158	public void widgetSelected(SelectionEvent e) {
		159	createTestFragment = !createTestFragment;
		160	if (createTestFragment == true) {
		161	junit3Radio.setEnabled(true);
		162	junit4Radio.setEnabled(true);
		163	} else {
		164	junit3Radio.setEnabled(false);
		165	junit4Radio.setEnabled(false);
		166	}
		167
		168	}
		169
		170	});
		171
		172	junit3Radio = new Button(junitGroup, SWT.RADIO);
		173	junit3Radio.setText(PDEUIMessages.ContentPage_useJUnit3);
		174	junit3Radio.setSelection(true);
		175	junit3Radio.setEnabled(false);
		176
		177	junit4Radio = new Button(junitGroup, SWT.RADIO);
		178	junit4Radio.setText(PDEUIMessages.ContentPage_useJUnit4);
		179	junit4Radio.setSelection(false);
		180	junit4Radio.setEnabled(false);
		181
		182	}
		183
135	private Composite createNewVersionComp(Composite notebook) {	184	private Composite createNewVersionComp(Composite notebook) {
136	Composite comp = new Composite(notebook, SWT.NONE);	185	Composite comp = new Composite(notebook, SWT.NONE);
137	GridLayout layout = new GridLayout(3, false);	186	GridLayout layout = new GridLayout(3, false);