### Eclipse Workspace Patch 1.0 #P org.eclipse.pde.ui Index: src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java,v retrieving revision 1.25 diff -u -r1.25 ProductExportWizardPage.java --- src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java 26 Oct 2008 18:24:02 -0000 1.25 +++ src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java 3 Nov 2008 14:45:46 -0000 @@ -62,10 +62,7 @@ initialize(); pageChanged(); - if (getErrorMessage() != null) { - setMessage(getErrorMessage()); - setErrorMessage(null); - } + setControl(container); hookHelpContext(container); Dialog.applyDialogFont(container); Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v retrieving revision 1.387 diff -u -r1.387 PDEUIMessages.java --- src/org/eclipse/pde/internal/ui/PDEUIMessages.java 26 Oct 2008 18:24:03 -0000 1.387 +++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java 3 Nov 2008 14:45:45 -0000 @@ -1344,6 +1344,12 @@ public static String ContentPage_fragment; public static String ContentPage_plugin; public static String ContentPage_illegalCharactersInID; + public static String ContentPage_junit3; + + public static String ContentPage_junit4; + + public static String ContentPage_junitGroup; + public static String WizardListSelectionPage_title; public static String WizardListSelectionPage_desc; public static String WizardListSelectionPage_label; Index: src/org/eclipse/pde/internal/ui/pderesources.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v retrieving revision 1.1010 diff -u -r1.1010 pderesources.properties --- src/org/eclipse/pde/internal/ui/pderesources.properties 26 Oct 2008 18:24:02 -0000 1.1010 +++ src/org/eclipse/pde/internal/ui/pderesources.properties 3 Nov 2008 14:45:46 -0000 @@ -746,6 +746,9 @@ CompCSDetails_Name=Name*: ContentSection_open=Open ContentPage_illegalCharactersInID = Project name contained characters which are not legal for the id, they have been converted to underscores. +ContentPage_junit3=Use JUnit 3 +ContentPage_junit4=Use JUnit 4 +ContentPage_junitGroup=JUnit Options ContentSection_targetContentDesc=Select the plug-ins and features that make up this target. ContentSection_includeOptional=Include optional dependencies when computing required plug-ins ContentSection_addDialogButtonLabel=Show &workspace plug-ins Index: src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java,v retrieving revision 1.29 diff -u -r1.29 FragmentContentPage.java --- src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java 19 Oct 2008 19:43:03 -0000 1.29 +++ src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java 3 Nov 2008 14:45:46 -0000 @@ -12,8 +12,6 @@ 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; @@ -22,10 +20,10 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.window.Window; import org.eclipse.pde.core.plugin.*; -import org.eclipse.pde.internal.core.util.VMUtil; 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; @@ -82,6 +80,7 @@ createFragmentPropertiesGroup(container); createParentPluginGroup(container); + createJunitOptionsGroup(container); Dialog.applyDialogFont(container); setControl(container); @@ -132,6 +131,19 @@ } + 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_junitGroup); + + Button junti3Radio = new Button(junitGroup, SWT.RADIO); + junti3Radio.setText(PDEUIMessages.ContentPage_junit3); + + Button junti4Radio = new Button(junitGroup, SWT.RADIO); + junti4Radio.setText(PDEUIMessages.ContentPage_junit4); + } + private Composite createNewVersionComp(Composite notebook) { Composite comp = new Composite(notebook, SWT.NONE); GridLayout layout = new GridLayout(3, false);