Attachment 121877 Details for Bug 260284 – org.eclipse.pde.ui.patch

[patch] org.eclipse.pde.ui.patch

clipboard.txt (text/plain), 7.58 KB, created by Chris Aniszczyk

on 2009-01-07 16:22:59 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Aniszczyk

Created: 2009-01-07 16:22:59 EST

Size: 7.58 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/pderesources.properties
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
>retrieving revision 1.1025
>diff -u -r1.1025 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	7 Jan 2009 19:54:56 -0000	1.1025
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	7 Jan 2009 21:21:32 -0000
>@@ -1967,12 +1967,9 @@
> ArgumentsSection_variableButtonTitle=Variables...
> ArgumentsSection_vm=VM Arguments:
> 
>-ProductJRESection_title=Java Runtime Environment
>-ProductJRESection_desc=Specify the JRE to be bundled with the product. Platform-specific JREs should be entered on their respective tabs.
>-ProductJRESection_none=None
>-ProductJRESection_jreName=JRE Name:
>+ProductJRESection_title=Execution Environment
>+ProductJRESection_desc=Specify the execution environment of the product. The respective default JRE will be bundled with the product.
> ProductJRESection_eeName=Execution Environment:
>-ProductJRESection_browseJREs=Installed JREs...
> ProductJRESection_browseEEs=Environments...
> 
> Product_FeatureSection_remove = Remove
>@@ -2348,7 +2345,7 @@
> 
> LicensingPage_title=Licensing
> LicenseSection_title=License
>-LicenseSection_description=Specify the license text and URL for your product.
>+LicenseSection_description=Specify the license text and URL for the product.
> LicenseSection_url=URL:
> LicenseSection_text=Text:
> 
>Index: src/org/eclipse/pde/internal/ui/editor/product/JRESection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java,v
>retrieving revision 1.20
>diff -u -r1.20 JRESection.java
>--- src/org/eclipse/pde/internal/ui/editor/product/JRESection.java	8 Jul 2008 16:53:27 -0000	1.20
>+++ src/org/eclipse/pde/internal/ui/editor/product/JRESection.java	7 Jan 2009 21:21:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 IBM Corporation and others.
>+ * Copyright (c) 2007, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -59,21 +59,8 @@
> 		}
> 	}
> 
>-	private final class JRELabelProvider extends LabelProvider {
>-		public String getText(Object element) {
>-			if (!(element instanceof IVMInstall))
>-				return ""; //$NON-NLS-1$
>-			IVMInstall vm = (IVMInstall) element;
>-			return vm.getName();
>-		}
>-	}
>-
>-	private Button fNoneRadioButton;
>-	private Button fJRERadioButton;
>-	private Button fEERadioButton;
>-	private Button fInstalledJREsButton;
>+	private Button fEEButton;
> 	private Button fExecutionEnvironmentsButton;
>-	private ComboViewerPart fJREsCombo;
> 	private ComboViewerPart fEEsCombo;
> 	private boolean fBlockChanges;
> 
>@@ -120,56 +107,11 @@
> 		});
> 		fTabFolder.setUnselectedImageVisible(false);
> 
>-		fNoneRadioButton = toolkit.createButton(client, PDEUIMessages.ProductJRESection_none, SWT.RADIO);
>-		fNoneRadioButton.addSelectionListener(new SelectionAdapter() {
>-			public void widgetSelected(SelectionEvent e) {
>-				if (fNoneRadioButton.getSelection()) {
>-					updateWidgets();
>-					setJRE(null);
>-				}
>-			}
>-		});
>-		GridDataFactory.fillDefaults().span(3, 1).applyTo(fNoneRadioButton);
>-
>-		fJRERadioButton = toolkit.createButton(client, PDEUIMessages.ProductJRESection_jreName, SWT.RADIO);
>-		fJRERadioButton.addSelectionListener(new SelectionAdapter() {
>-			public void widgetSelected(SelectionEvent e) {
>-				if (fJRERadioButton.getSelection()) {
>-					updateWidgets();
>-					if (fJREsCombo.getSelection() == null)
>-						fJREsCombo.select(0);
>-					else
>-						setJRE((IVMInstall) fJREsCombo.getSelection());
>-				}
>-			}
>-		});
>-
>-		fJREsCombo = new ComboViewerPart();
>-		fJREsCombo.createControl(client, toolkit, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
>-		fJREsCombo.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-		fJREsCombo.setItems(VMUtil.getAllVMInstances());
>-		fJREsCombo.setLabelProvider(new JRELabelProvider());
>-		fJREsCombo.addSelectionChangedListener(new ISelectionChangedListener() {
>-			public void selectionChanged(SelectionChangedEvent event) {
>-				if (!fBlockChanges) {
>-					setJRE(fJREsCombo.getSelection() == ComboViewerPart.NULL_OBJECT ? null : (IVMInstall) fJREsCombo.getSelection());
>-				}
>-			}
>-		});
>-
>-		fInstalledJREsButton = toolkit.createButton(client, PDEUIMessages.ProductJRESection_browseJREs, SWT.PUSH);
>-		GridDataFactory.fillDefaults().applyTo(fInstalledJREsButton);
>-		fInstalledJREsButton.addListener(SWT.Selection, new Listener() {
>-			public void handleEvent(Event event) {
>-				PreferencesUtil.createPreferenceDialogOn(getSection().getShell(), "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage", //$NON-NLS-1$
>-						new String[] {"org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"}, null).open(); //$NON-NLS-1$ 
>-			}
>-		});
>-
>-		fEERadioButton = toolkit.createButton(client, PDEUIMessages.ProductJRESection_eeName, SWT.RADIO);
>-		fEERadioButton.addSelectionListener(new SelectionAdapter() {
>+		fEEButton = toolkit.createButton(client, PDEUIMessages.ProductJRESection_eeName, SWT.CHECK);
>+		fEEButton.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent e) {
>-				if (fEERadioButton.getSelection()) {
>+				fEEsCombo.setEnabled(fEEButton.getSelection());
>+				if (fEEButton.getSelection()) {
> 					updateWidgets();
> 					if (fEEsCombo.getSelection() == null)
> 						fEEsCombo.select(0);
>@@ -217,13 +159,6 @@
> 
> 	}
> 
>-	private void setJRE(IVMInstall install) {
>-		IPath jrePath = null;
>-		if (install != null)
>-			jrePath = JavaRuntime.newJREContainerPath(install);
>-		getJVMLocations().setJREContainerPath(getOS(fLastTab), jrePath);
>-	}
>-
> 	private IProductModel getProductModel() {
> 		return (IProductModel) getPage().getPDEEditor().getAggregateModel();
> 	}
>@@ -270,27 +205,16 @@
> 				if (!fEEsCombo.getItems().contains(env))
> 					fEEsCombo.addItem(env);
> 				fEEsCombo.select(env);
>-				fNoneRadioButton.setSelection(false);
>-				fEERadioButton.setSelection(true);
>-				fJRERadioButton.setSelection(false);
>-				fJREsCombo.select(null);
>+				fEEButton.setSelection(true);
> 			} else {
> 				IVMInstall install = JavaRuntime.getVMInstall(jrePath);
> 				if (install != null) {
>-					if (!fJREsCombo.getItems().contains(install))
>-						fJREsCombo.addItem(install);
>-					fJREsCombo.select(install);
>-					fNoneRadioButton.setSelection(false);
>-					fJRERadioButton.setSelection(true);
>-					fEERadioButton.setSelection(false);
>+					fEEButton.setSelection(false);
> 					fEEsCombo.select(null);
> 				}
> 			}
> 		} else {
>-			fNoneRadioButton.setSelection(true);
>-			fJRERadioButton.setSelection(false);
>-			fJREsCombo.select(null);
>-			fEERadioButton.setSelection(false);
>+			fEEButton.setSelection(false);
> 			fEEsCombo.select(null);
> 		}
> 		updateWidgets();
>@@ -328,8 +252,7 @@
> 	}
> 
> 	protected void updateWidgets() {
>-		fJREsCombo.setEnabled(fJRERadioButton.getSelection());
>-		fEEsCombo.setEnabled(fEERadioButton.getSelection());
>+		fEEsCombo.setEnabled(fEEButton.getSelection());
> 	}
> 
> 	/* (non-Javadoc)
>@@ -352,6 +275,6 @@
> 		// the page, an event will be fired when entering the page again.
> 		// An event is not fired if the radio button does not have focus.
> 		// The solution is to redirect focus to a stable widget.
>-		getPage().setLastFocusControl(fJREsCombo.getControl());
>+		getPage().setLastFocusControl(fEEsCombo.getControl());
> 	}
> }

Actions: View | Diff

Attachments on bug 260284: 121877 | 121878