Attachment 194544 Details for Bug 320428 – Patch

[patch] Patch

20110503.txt (text/plain), 4.45 KB, created by Ankur Sharma

on 2011-05-02 17:45:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ankur Sharma

Created: 2011-05-02 17:45:24 EDT

Size: 4.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v
>retrieving revision 1.492
>diff -u -r1.492 PDEUIMessages.java
>--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	12 Jan 2011 13:25:39 -0000	1.492
>+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	2 May 2011 21:44:18 -0000
>@@ -1244,6 +1244,8 @@
> 	public static String BaseExtensionPoint_sections_copyright;
> 	public static String BaseExportWizard_confirmReplace_title;
> 	public static String BaseExtensionPoint_generating;
>+	public static String GeneralInfoSection_IdWarning;
>+
> 	public static String GeneralInfoSection_version;
> 	public static String GeneralInfoSection_provider;
> 	public static String GeneralInfoSection_pluginId;
>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.1164
>diff -u -r1.1164 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	12 Apr 2011 07:37:50 -0000	1.1164
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	2 May 2011 21:44:27 -0000
>@@ -967,6 +967,7 @@
> BaseExtensionPoint_sections_copyright=
> BaseExportWizard_confirmReplace_title=Confirm Replace
> BaseExtensionPoint_generating = Generating schema file...
>+GeneralInfoSection_IdWarning=The product's ID conflicts with its defining plug-in's ID. Exporting such product configuration may create inconsistent results
> GeneralInfoSection_version=Version:
> GeneralInfoSection_provider=Provider:
> GeneralInfoSection_pluginId=Host Plug-in:
>Index: src/org/eclipse/pde/internal/ui/editor/product/GeneralInfoSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/GeneralInfoSection.java,v
>retrieving revision 1.3
>diff -u -r1.3 GeneralInfoSection.java
>--- src/org/eclipse/pde/internal/ui/editor/product/GeneralInfoSection.java	16 Mar 2009 23:12:05 -0000	1.3
>+++ src/org/eclipse/pde/internal/ui/editor/product/GeneralInfoSection.java	2 May 2011 21:44:27 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 EclipseSource Corporation and others.
>+ * Copyright (c) 2009, 2011 EclipseSource 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
>@@ -11,6 +11,7 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.editor.product;
> 
>+import org.eclipse.jface.dialogs.IMessageProvider;
> import org.eclipse.pde.core.IModelChangedEvent;
> import org.eclipse.pde.internal.core.iproduct.IProduct;
> import org.eclipse.pde.internal.core.iproduct.IProductModel;
>@@ -24,6 +25,7 @@
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.*;
> import org.eclipse.ui.IActionBars;
>+import org.eclipse.ui.forms.IMessageManager;
> import org.eclipse.ui.forms.widgets.*;
> 
> public class GeneralInfoSection extends PDESection {
>@@ -94,13 +96,26 @@
> 		fIdEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
> 			public void textValueChanged(FormEntry entry) {
> 				getProduct().setId(entry.getValue().trim());
>+				validateProductId();
> 			}
>+
> 		});
> 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
> 		gd.grabExcessHorizontalSpace = true;
> 		gd.horizontalSpan = 2;
> 		fIdEntry.getText().setLayoutData(gd);
> 		fIdEntry.setEditable(isEditable());
>+		validateProductId();
>+	}
>+
>+	private void validateProductId() {
>+		String pluginId = getProduct().getDefiningPluginId();
>+		IMessageManager messageManager = getManagedForm().getForm().getMessageManager();
>+		if (pluginId != null && pluginId.equals(getProduct().getId())) {
>+			messageManager.addMessage(PDEUIMessages.GeneralInfoSection_IdWarning, PDEUIMessages.GeneralInfoSection_IdWarning, null, IMessageProvider.WARNING);
>+		} else {
>+			messageManager.removeMessage(PDEUIMessages.GeneralInfoSection_IdWarning);
>+		}
> 	}
> 
> 	private void createVersionEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {

Actions: View | Diff

Attachments on bug 320428: 194544