Attachment 85475 Details for Bug 213269 – Patch for review

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

[patch] Patch for review

213269NewPluginWizardIsHumongous.patch (text/plain), 15.65 KB, created by Curtis Windatt

on 2007-12-18 12:25:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2007-12-18 12:25:31 EST

Size: 15.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java,v
>retrieving revision 1.42
>diff -u -r1.42 NewProjectCreationPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java	13 Nov 2007 05:12:29 -0000	1.42
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java	18 Dec 2007 17:22:36 -0000
>@@ -11,16 +11,11 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.wizards.plugin;
> 
>-import java.util.TreeSet;
>-
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IWorkspace;
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.jdt.launching.IVMInstall;
>-import org.eclipse.jdt.launching.JavaRuntime;
>-import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
> import org.eclipse.jdt.ui.PreferenceConstants;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IDialogSettings;
>@@ -31,7 +26,6 @@
> import org.eclipse.pde.internal.core.TargetPlatformHelper;
> import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
>-import org.eclipse.pde.internal.ui.launcher.VMHelper;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
>@@ -42,13 +36,10 @@
> import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Event;
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
>-import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.PlatformUI;
>-import org.eclipse.ui.dialogs.PreferencesUtil;
> import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
> 
> 
>@@ -65,8 +56,6 @@
> 	private Combo fOSGiCombo;
> 	private Button fOSGIButton;
> 	private IStructuredSelection fSelection;
>-	private Button fExeEnvButton;
>-	private Combo fEEChoice;
> 	
> 	private static final String S_OSGI_PROJECT = "osgiProject"; //$NON-NLS-1$
> 	private static final String S_TARGET_NAME = "targetName"; //$NON-NLS-1$
>@@ -86,7 +75,6 @@
> 
> 		createProjectTypeGroup(control);
> 		createFormatGroup(control);
>-		createExecutionEnvironmentGroup(control);
> 		createWorkingSetGroup(
> 				control,
> 				fSelection,
>@@ -103,56 +91,6 @@
> 		setControl(control);
> 	}
> 	
>-	private void createExecutionEnvironmentGroup(Composite container) {
>-		Group group = new Group(container, SWT.NONE);
>-		group.setText(PDEUIMessages.NewProjectCreationPage_targetEnvironment);
>-		GridLayout layout = new GridLayout();
>-		layout.numColumns = 3;
>-		group.setLayout(layout);
>-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-		
>-		// Create label
>-		Label envs = new Label(group, SWT.NONE);	
>-		envs.setText(PDEUIMessages.NewProjectCreationPage_executionEnvironments_label);
>-
>-		// Create combo
>-		fEEChoice = new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
>-		fEEChoice.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-		
>-		// Gather EEs 
>-		IExecutionEnvironment[] exeEnvs = VMHelper.getExecutionEnvironments();
>-		TreeSet availableEEs = new TreeSet();		
>-		for (int i = 0; i < exeEnvs.length; i++) {
>-			availableEEs.add(exeEnvs[i].getId());		
>-		}
>-		
>-		// Set data 
>-		fEEChoice.setItems((String[]) availableEEs.toArray(new String[availableEEs.size()-1]));
>-		
>-		// Set default EE based on strict match to default VM
>-		IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
>-		String[] EEChoices = fEEChoice.getItems();
>-		for (int i = 0; i < EEChoices.length; i++) {			
>-			if(VMHelper.getExecutionEnvironment(EEChoices[i]).isStrictlyCompatible(defaultVM)) {
>-					fEEChoice.select(i);
>-					break;							
>-			}
>-		}		
>-		
>-		// Create button
>-		fExeEnvButton = createButton(group, SWT.PUSH, 1, 0);
>-		fExeEnvButton.setText(PDEUIMessages.NewProjectCreationPage_environmentsButton);		
>-		fExeEnvButton.addListener(SWT.Selection, new Listener() {
>-			public void handleEvent(Event event) {
>-				PreferencesUtil.createPreferenceDialogOn(
>-						getShell(), 
>-						"org.eclipse.jdt.debug.ui.jreProfiles", //$NON-NLS-1$
>-						new String[] { "org.eclipse.jdt.debug.ui.jreProfiles" }, null).open(); //$NON-NLS-1$ 
>-			}
>-		});
>-		updateExecEnvSection();
>-	}
>-	
> 	private void createProjectTypeGroup(Composite container) {
> 		Group group = new Group(container, SWT.NONE);
> 		group.setText(PDEUIMessages.ProjectStructurePage_settings); 
>@@ -171,7 +109,6 @@
> 				fSourceText.setEnabled(enabled);
> 				fOutputlabel.setEnabled(enabled);
> 				fOutputText.setEnabled(enabled);
>-				updateExecEnvSection();
> 				setPageComplete(validatePage());
> 			}
> 		});
>@@ -228,11 +165,6 @@
> 			else
> 				fTargetCombo.setText(ICoreConstants.TARGET33);
> 		}
>-		fTargetCombo.addSelectionListener(new SelectionAdapter(){
>-			public void widgetSelected(SelectionEvent e) {
>-				updateExecEnvSection();
>-			}
>-		});
> 		
> 	    fOSGIButton = createButton(group, SWT.RADIO, 1, 30);
>     	fOSGIButton.setText(PDEUIMessages.NewProjectCreationPage_pPureOSGi); 	   
>@@ -252,16 +184,6 @@
> 		
> 	}
> 	
>-	private void updateExecEnvSection() {
>-		if (fTargetCombo.getText().equals(ICoreConstants.TARGET30) || !fJavaButton.getSelection()){
>-			fEEChoice.setEnabled(false);
>-			fExeEnvButton.setEnabled(false);
>-		} else {
>-			fEEChoice.setEnabled(true);
>-			fExeEnvButton.setEnabled(true);
>-		}
>-	}
>-	
> 	private void updateRuntimeDependency() {
> 		boolean depends = fEclipseButton.getSelection();
> 		fTargetCombo.setEnabled(depends);
>@@ -308,8 +230,6 @@
> 		fData.setHasBundleStructure(fOSGIButton.getSelection() || Double.parseDouble(fTargetCombo.getText()) >= 3.1);	
> 		fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
> 		fData.setWorkingSets(getSelectedWorkingSets());
>-		if(fJavaButton.getSelection())
>-			fData.setExecutionEnvironment(fEEChoice.getText().trim());
> 	}
> 	
>     protected boolean validatePage() {
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java,v
>retrieving revision 1.38
>diff -u -r1.38 ContentPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java	8 Jun 2007 16:37:10 -0000	1.38
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java	18 Dec 2007 17:22:36 -0000
>@@ -71,6 +71,15 @@
> 		return text;
> 	}
> 	
>+	protected Text createText(Composite parent, ModifyListener listener, int horizSpan){
>+		Text text = new Text(parent, SWT.BORDER | SWT.SINGLE);
>+		GridData data = new GridData(GridData.FILL_HORIZONTAL);
>+		data.horizontalSpan = horizSpan;
>+		text.setLayoutData(data);
>+		text.addModifyListener(listener);
>+		return text;
>+	}
>+	
> 	protected abstract void validatePage();
> 
> 	protected String validateProperties() {
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java,v
>retrieving revision 1.35
>diff -u -r1.35 PluginContentPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java	16 May 2007 22:05:17 -0000	1.35
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java	18 Dec 2007 17:22:36 -0000
>@@ -12,9 +12,13 @@
> package org.eclipse.pde.internal.ui.wizards.plugin;
> 
> import java.util.Locale;
>+import java.util.TreeSet;
> 
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.jdt.core.JavaConventions;
>+import org.eclipse.jdt.launching.IVMInstall;
>+import org.eclipse.jdt.launching.JavaRuntime;
>+import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.dialogs.IMessageProvider;
>@@ -22,6 +26,7 @@
> import org.eclipse.pde.internal.core.util.PDEJavaHelper;
> import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
>+import org.eclipse.pde.internal.ui.launcher.VMHelper;
> import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.ModifyEvent;
>@@ -31,11 +36,15 @@
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Event;
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
>+import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.dialogs.PreferencesUtil;
> 
> public class PluginContentPage extends ContentPage {
> 	protected final static int P_CLASS_GROUP = 2;
>@@ -44,6 +53,9 @@
> 	private Button fGenerateClass;
> 	private Button fUIPlugin;
> 	private Label fClassLabel;
>+	private Label fEELabel;
>+	private Button fExeEnvButton;
>+	private Combo fEEChoice;
> 
> 	private Label fLabel;
>     private Button fYesButton;
>@@ -88,29 +100,74 @@
> 
> 	private void createPluginPropertiesGroup(Composite container) {
> 		Group propertiesGroup = new Group(container, SWT.NONE);
>-		propertiesGroup.setLayout(new GridLayout(2, false));
>+		propertiesGroup.setLayout(new GridLayout(3, false));
> 		propertiesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> 		propertiesGroup.setText(PDEUIMessages.ContentPage_pGroup); 
> 
> 		Label label = new Label(propertiesGroup, SWT.NONE);
> 		label.setText(PDEUIMessages.ContentPage_pid); 
>-		fIdText = createText(propertiesGroup, propertiesListener);
>+		fIdText = createText(propertiesGroup, propertiesListener, 2);
> 
> 		label = new Label(propertiesGroup, SWT.NONE);
> 		label.setText(PDEUIMessages.ContentPage_pversion); 
>-		fVersionText = createText(propertiesGroup, propertiesListener);
>+		fVersionText = createText(propertiesGroup, propertiesListener, 2);
> 
> 		label = new Label(propertiesGroup, SWT.NONE);
> 		label.setText(PDEUIMessages.ContentPage_pname); 
>-		fNameText = createText(propertiesGroup, propertiesListener);
>+		fNameText = createText(propertiesGroup, propertiesListener, 2);
> 
> 		label = new Label(propertiesGroup, SWT.NONE);
> 		label.setText(PDEUIMessages.ContentPage_pprovider); 
>-		fProviderText = createText(propertiesGroup, propertiesListener);
>+		fProviderText = createText(propertiesGroup, propertiesListener, 2);
> 
> 		fLibraryLabel = new Label(propertiesGroup, SWT.NONE);
> 		fLibraryLabel.setText(PDEUIMessages.ProjectStructurePage_library); 
>-		fLibraryText = createText(propertiesGroup, propertiesListener);
>+		fLibraryText = createText(propertiesGroup, propertiesListener, 2);
>+		
>+		createExecutionEnvironmentControls(propertiesGroup);
>+	}
>+	
>+	private void createExecutionEnvironmentControls(Composite container) {
>+		// Create label
>+		fEELabel = new Label(container, SWT.NONE);	
>+		fEELabel.setText(PDEUIMessages.NewProjectCreationPage_executionEnvironments_label);
>+
>+		// Create combo
>+		fEEChoice = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
>+		fEEChoice.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+		
>+		// Gather EEs 
>+		IExecutionEnvironment[] exeEnvs = VMHelper.getExecutionEnvironments();
>+		TreeSet availableEEs = new TreeSet();		
>+		for (int i = 0; i < exeEnvs.length; i++) {
>+			availableEEs.add(exeEnvs[i].getId());		
>+		}
>+		
>+		// Set data 
>+		fEEChoice.setItems((String[]) availableEEs.toArray(new String[availableEEs.size()-1]));
>+		
>+		// Set default EE based on strict match to default VM
>+		IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
>+		String[] EEChoices = fEEChoice.getItems();
>+		for (int i = 0; i < EEChoices.length; i++) {			
>+			if(VMHelper.getExecutionEnvironment(EEChoices[i]).isStrictlyCompatible(defaultVM)) {
>+					fEEChoice.select(i);
>+					break;							
>+			}
>+		}		
>+		
>+		// Create button
>+		fExeEnvButton = new Button(container, SWT.PUSH);
>+		fExeEnvButton.setLayoutData(new GridData());
>+		fExeEnvButton.setText(PDEUIMessages.NewProjectCreationPage_environmentsButton);		
>+		fExeEnvButton.addListener(SWT.Selection, new Listener() {
>+			public void handleEvent(Event event) {
>+				PreferencesUtil.createPreferenceDialogOn(
>+						getShell(), 
>+						"org.eclipse.jdt.debug.ui.jreProfiles", //$NON-NLS-1$
>+						new String[] { "org.eclipse.jdt.debug.ui.jreProfiles" }, null).open(); //$NON-NLS-1$ 
>+			}
>+		});
> 	}
> 
> 	private void createPluginClassGroup(Composite container) {
>@@ -166,6 +223,8 @@
> 		data.setUIPlugin(fUIPlugin.getSelection());
> 		data.setDoGenerateClass(fGenerateClass.isEnabled() && fGenerateClass.getSelection());
> 		data.setRCPApplicationPlugin(!fData.isSimple() && !isPureOSGi() && fYesButton.getSelection());
>+		if(fEEChoice.isEnabled())
>+			fData.setExecutionEnvironment(fEEChoice.getText().trim());
> 	}
> 	
> 	private void createRCPGroup(Composite container){
>@@ -239,7 +298,13 @@
> 				int oldfChanged = fChangedGroups;
> 				fClassText.setText(computeId().toLowerCase(Locale.ENGLISH) + ".Activator"); //$NON-NLS-1$
> 				fChangedGroups = oldfChanged;
>-			}		
>+			}	
>+			
>+			boolean allowEESelection = !fData.isSimple() && fData.hasBundleStructure();
>+			fEELabel.setEnabled(allowEESelection);
>+			fEEChoice.setEnabled(allowEESelection);
>+			fExeEnvButton.setEnabled(allowEESelection);
>+			
> 			fRCPGroup.setVisible(!fData.isSimple() && !isPureOSGi());
>     	}
>         super.setVisible(visible);
>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.947
>diff -u -r1.947 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	12 Dec 2007 17:56:09 -0000	1.947
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	18 Dec 2007 17:22:36 -0000
>@@ -770,7 +770,6 @@
> NewProjectCreationPage_pDependsOnRuntime=&Eclipse version:
> NewProjectCreationPage_environmentsButton=En&vironments...
> NewProjectCreationPage_executionEnvironments_label=E&xecution Environment:
>-NewProjectCreationPage_targetEnvironment=Target Environment
> NewProjectCreationPage_invalidProjectName=Project name cannot contain %
> NewProjectCreationPage_invalidLocationPath=Location path cannot contain %
> NewProjectCreationOperation_buildPropertiesFile = the build.properties file
>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.342
>diff -u -r1.342 PDEUIMessages.java
>--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	9 Dec 2007 21:20:16 -0000	1.342
>+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	18 Dec 2007 17:22:35 -0000
>@@ -2422,9 +2422,6 @@
> 	
> 	public static String NewProjectCreationPage_environmentsButton;
> 	
>-	public static String NewProjectCreationPage_targetEnvironment;
>-	
>-
> 	public static String RequiredExecutionEnvironmentSection_title;
> 
> 	public static String PluginGeneralInfoSection_lazyStart;

Actions: View | Diff

Attachments on bug 213269: 85475 | 86000 | 86020