Attachment 26217 Details for Bug 96893 – proposed 3.2 patch - modified editor layout

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

[patch] proposed 3.2 patch - modified editor layout

org.eclipse.pde.ui_b#96893_patch-HEAD.txt (text/plain), 10.67 KB, created by Janek Lasocki-Biczysko

on 2005-08-17 18:08:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Janek Lasocki-Biczysko

Created: 2005-08-17 18:08:24 EDT

Size: 10.67 KB

patch

obsolete

>Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v
>retrieving revision 1.33
>diff -u -r1.33 PDEUIMessages.java
>--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	17 Aug 2005 17:48:42 -0000	1.33
>+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	17 Aug 2005 22:03:19 -0000
>@@ -1809,6 +1809,7 @@
> 	public static String ProductDefinitonWizardPage_plugin;
> 	public static String ProductDefinitonWizardPage_browse;
> 	public static String ProductDefinitonWizardPage_productId;
>+	public static String ProductDefinitonWizardPage_productName;
> 	public static String ProductDefinitonWizardPage_noPluginId;
> 	public static String ProductDefinitonWizardPage_noPlugin;
> 	public static String ProductDefinitonWizardPage_invalidId;
>@@ -1983,4 +1984,6 @@
> 	public static String BaseExportWizardPage_javacSource;
> 
> 	public static String PluginWorkingSet_message;
>+
>+	public static String ProductDefinitonWizardPage_noProductName;
> }
>\ No newline at end of file
>Index: src/org/eclipse/pde/internal/ui/pderesources.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
>retrieving revision 1.509
>diff -u -r1.509 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	17 Aug 2005 17:48:42 -0000	1.509
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	17 Aug 2005 22:03:19 -0000
>@@ -1149,6 +1149,7 @@
> ProductDefinitonWizardPage_productExists=Specified product already exists
> ProductDefinitonWizardPage_application=&Application:
> ProductDefinitonWizardPage_noProductID=Product ID is not set
>+ProductDefinitonWizardPage_noProductName=Product name is not set
> ProductFileWizadPage_existingProduct=&Use an existing product:
> ProductFileWizadPage_existingLaunchConfig=U&se a launch configuration:
> ProductDefinitonWizardPage_productDefinition=<form><p>A product, the Eclipse unit of branding, is defined declaratively as an <a href="products">org.eclipse.core.runtime.products</a> extension inside a plug-in.</p></form>
>@@ -1952,6 +1953,7 @@
> ProductDefinitonWizardPage_plugin=&Defining Plug-in:
> ProductDefinitonWizardPage_browse=B&rowse...
> ProductDefinitonWizardPage_productId=&Product ID:
>+ProductDefinitonWizardPage_productName=Product &Name:
> ProductDefinitonWizardPage_noPluginId=Plug-in ID is not set
> ProductDefinitonWizardPage_noPlugin=Specified plug-in does not exist
> ProductDefinitonWizardPage_invalidId=Invalid product ID.  Legal characters are: a-z A-Z 0-9 _
>Index: src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java,v
>retrieving revision 1.22
>diff -u -r1.22 ProductInfoSection.java
>--- src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java	3 Aug 2005 19:25:01 -0000	1.22
>+++ src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java	17 Aug 2005 22:03:19 -0000
>@@ -76,9 +76,9 @@
> 
> 		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
> 		
>+		createNameEntry(client, toolkit, actionBars);
> 		createIdEntry(client, toolkit, actionBars);
> 		createApplicationEntry(client, toolkit, actionBars);
>-		createNameEntry(client, toolkit, actionBars);
> 		createConfigurationOption(client, toolkit);
> 		
> 		toolkit.paintBordersFor(client);
>@@ -89,7 +89,6 @@
> 	}
> 	
> 	private void createNameEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
>-		createLabel(client, toolkit, ""); //$NON-NLS-1$
> 		createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_titleLabel); 
> 
> 		fNameEntry = new FormEntry(client, toolkit, "Product Name:", null, false); //$NON-NLS-1$
>@@ -98,12 +97,11 @@
> 				getProduct().setName(entry.getValue().trim());
> 			}
> 		});
>-		TableWrapData td = (TableWrapData)fNameEntry.getText().getLayoutData();
>-		td.grabHorizontal = false;
> 		fNameEntry.setEditable(isEditable());
> 	}
> 	
> 	private void createIdEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
>+		createLabel(client, toolkit, ""); //$NON-NLS-1$
> 		createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_prodIdLabel); 
> 
> 		Label label = toolkit.createLabel(client, PDEUIMessages.ProductInfoSection_id); 
>@@ -147,6 +145,7 @@
> 			String app = wizard.getApplication();
> 			fAppCombo.setText(app);
> 			getProduct().setApplication(app);
>+			fNameEntry.setValue(getProduct().getName());
> 		}
> 	}
> 
>Index: src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java,v
>retrieving revision 1.6
>diff -u -r1.6 ProductDefinitionWizard.java
>--- src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java	3 Aug 2005 19:25:02 -0000	1.6
>+++ src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java	17 Aug 2005 22:03:19 -0000
>@@ -33,7 +33,7 @@
> 	}
> 	
> 	public void addPages() {
>-		fMainPage = new ProductDefinitonWizardPage("product"); //$NON-NLS-1$
>+		fMainPage = new ProductDefinitonWizardPage("product", fProduct); //$NON-NLS-1$
> 		addPage(fMainPage);
> 	}
> 
>@@ -42,6 +42,9 @@
> 			fProductId = fMainPage.getProductId();
> 			fPluginId = fMainPage.getDefiningPlugin();
> 			fApplication = fMainPage.getApplication();
>+			String newProductName = fMainPage.getProductName();
>+			if (newProductName != null)
>+				fProduct.setName(newProductName);
> 			getContainer().run(
> 					false,
> 					true,
>@@ -64,6 +67,5 @@
> 	public String getApplication() {
> 		return fApplication;
> 	}
>-	
> 
> }
>Index: src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java,v
>retrieving revision 1.9
>diff -u -r1.9 ProductDefinitonWizardPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java	3 Aug 2005 19:25:02 -0000	1.9
>+++ src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java	17 Aug 2005 22:03:19 -0000
>@@ -17,6 +17,7 @@
> import org.eclipse.jface.wizard.*;
> import org.eclipse.pde.core.plugin.*;
> import org.eclipse.pde.internal.core.*;
>+import org.eclipse.pde.internal.core.iproduct.IProduct;
> import org.eclipse.pde.internal.ui.*;
> import org.eclipse.pde.internal.ui.search.*;
> import org.eclipse.pde.internal.ui.util.*;
>@@ -31,10 +32,12 @@
> 
> public class ProductDefinitonWizardPage extends WizardPage implements IHyperlinkListener {
> 
>+	private Text fProductName;
> 	private Text fPluginText;
> 	private Text fProductText;
> 	private Set fProductSet;
> 	private Combo fApplicationCombo;
>+	private IProduct fProduct;
> 
> 	private ModifyListener fListener = new ModifyListener() {
> 		public void modifyText(ModifyEvent e) {
>@@ -49,6 +52,11 @@
> 		setDescription(PDEUIMessages.ProductDefinitonWizardPage_desc); 
> 	}
> 
>+	public ProductDefinitonWizardPage(String string, IProduct product) {
>+		super(string);
>+		fProduct = product;
>+	}
>+
> 	public void createControl(Composite parent) {
> 		Composite comp = new Composite(parent, SWT.NONE);
> 		GridLayout layout = new GridLayout();
>@@ -64,7 +72,7 @@
> 		Dialog.applyDialogFont(comp);
> 		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.PRODUCT_DEFINITIONS_WIZARD);
> 	}
>-	
>+
> 	private void createFormText(FormToolkit toolkit, Composite parent, String content, int span) {
> 		FormText text = toolkit.createFormText(parent, false);
> 		text.setText(content, true, false);
>@@ -83,7 +91,21 @@
> 		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> 
> 		createFormText(toolkit, group, PDEUIMessages.ProductDefinitonWizardPage_productDefinition, 3); 
>-		Label label = new Label(group, SWT.NONE);
>+		
>+		Label label;
>+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
>+		gd.horizontalSpan = 2;
>+		
>+		if (fProduct.getName() == null || fProduct.getName().equals("")) { //$NON-NLS-1$
>+			label = new Label(group, SWT.NONE);
>+			label.setText(PDEUIMessages.ProductDefinitonWizardPage_productName); 
>+			
>+			fProductName = new Text(group, SWT.SINGLE|SWT.BORDER);
>+			fProductName.setLayoutData(gd);
>+			fProductName.addModifyListener(fListener);
>+		}
>+		
>+		label = new Label(group, SWT.NONE);
> 		label.setText(PDEUIMessages.ProductDefinitonWizardPage_plugin); 
> 		
> 		fPluginText = new Text(group, SWT.SINGLE|SWT.BORDER);
>@@ -103,8 +125,6 @@
> 		label.setText(PDEUIMessages.ProductDefinitonWizardPage_productId); 
> 		
> 		fProductText = new Text(group, SWT.SINGLE|SWT.BORDER);
>-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
>-		gd.horizontalSpan = 2;
> 		fProductText.setLayoutData(gd);
> 		fProductText.addModifyListener(fListener);
> 		
>@@ -130,22 +150,27 @@
> 	
> 	public void setVisible(boolean visible) {
> 		if (visible) {
>-			fPluginText.setFocus();
>+			if (fProductName != null)
>+				fProductName.setFocus();
>+			else
>+				fPluginText.setFocus();
> 		}
> 		super.setVisible(visible);
> 	}
> 
> 	private void validatePage() {
> 		String error = null;
>-		String pluginId = fPluginText.getText().trim();
>-		if (pluginId.length() == 0) {
>+		String productName = getProductName();
>+		String pluginId = getDefiningPlugin();
>+		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
>+		if (productName != null && productName.length() == 0) {
>+			error = PDEUIMessages.ProductDefinitonWizardPage_noProductName;
>+		} else if (model == null){ 
>+			error = PDEUIMessages.ProductDefinitonWizardPage_noPlugin; 
>+		} else if (model.getUnderlyingResource() == null) {
>+			error = PDEUIMessages.ProductDefinitonWizardPage_notInWorkspace; 
>+		} else if (pluginId.length() == 0) {
> 			error = PDEUIMessages.ProductDefinitonWizardPage_noPluginId; 
>-		} else {
>-			IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
>-			if (model == null)
>-				error = PDEUIMessages.ProductDefinitonWizardPage_noPlugin; 
>-			else if (model.getUnderlyingResource() == null)
>-				error = PDEUIMessages.ProductDefinitonWizardPage_notInWorkspace; 
> 		}
> 		if (error == null)
> 			error = validateId();
>@@ -207,4 +232,7 @@
> 		return fApplicationCombo.getText();
> 	}
> 	
>+	public String getProductName() {
>+		return (fProductName == null) ? null : fProductName.getText().trim();
>+	}
> }

Actions: View | Diff

Attachments on bug 96893: 26211 | 26217