Attachment 74705 Details for Bug 169373 – minor modification to Brock's patch

[patch] minor modification to Brock's patch

bug169373.txt (text/plain), 9.86 KB, created by Brian Bauman

on 2007-07-26 12:31:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Bauman

Created: 2007-07-26 12:31:54 EDT

Size: 9.86 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/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
>retrieving revision 1.897
>diff -u -r1.897 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	26 Jul 2007 03:16:31 -0000	1.897
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	26 Jul 2007 16:29:11 -0000
>@@ -1502,6 +1502,8 @@
> RenameProjectChange_name=Rename ''{0}'' to ''{1}''
> RenameAutostartResolution_desc=Rename the deprecated Eclipse-AutoStart to Eclipse-LazyStart.  The semantics of the header remain the same.
> RenameProjectChange_taskTitle=rename project
>+RenameProvidePackageResolution_desc=Rename the deprecated Provide-Package to Export-Package.
>+RenameProvidePackageResolution_label=rename to Provide-Package
> RenameAutostartResolution_label=rename to Eclipse-LazyStart
> RenamePluginWizardPage_idNotSet=ID is not set
> RenamePluginWizardPage_invalidId=Invalid ID
>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.303
>diff -u -r1.303 PDEUIMessages.java
>--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	26 Jul 2007 03:16:31 -0000	1.303
>+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	26 Jul 2007 16:29:10 -0000
>@@ -329,6 +329,10 @@
> 
> 	public static String RenameProjectChange_taskTitle;
> 
>+	public static String RenameProvidePackageResolution_desc;
>+
>+	public static String RenameProvidePackageResolution_label;
>+
> 	public static String RequiresSection_sortAlpha;
> 
> 	public static String SchemaDtdDetailsSection_title;
>Index: src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java,v
>retrieving revision 1.28
>diff -u -r1.28 ResolutionGenerator.java
>--- src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java	27 Dec 2006 22:04:55 -0000	1.28
>+++ src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java	26 Jul 2007 16:29:11 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2007 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
>@@ -89,6 +89,8 @@
> 				return new IMarkerResolution[] {
> 						new CreateClassXMLResolution(AbstractPDEMarkerResolution.CREATE_TYPE, marker),
> 						new ChooseClassXMLResolution(AbstractPDEMarkerResolution.RENAME_TYPE, marker)};
>+			case PDEMarkerFactory.M_DEPRECATED_PROVIDE_PACKAGE:
>+				return new IMarkerResolution[] {new RenameProvidePackageResolution(AbstractPDEMarkerResolution.RENAME_TYPE)};
> 		}
> 		return NO_RESOLUTIONS;
> 	}
>Index: src/org/eclipse/pde/internal/ui/correction/RenameProvidePackageResolution.java
>===================================================================
>RCS file: src/org/eclipse/pde/internal/ui/correction/RenameProvidePackageResolution.java
>diff -N src/org/eclipse/pde/internal/ui/correction/RenameProvidePackageResolution.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/pde/internal/ui/correction/RenameProvidePackageResolution.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,37 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *     Brock Janiczak <brockj@tpg.com.au> - bug 169373
>+ *******************************************************************************/
>+package org.eclipse.pde.internal.ui.correction;
>+
>+import org.eclipse.pde.internal.core.ICoreConstants;
>+import org.eclipse.pde.internal.core.text.bundle.BundleModel;
>+import org.eclipse.pde.internal.ui.PDEUIMessages;
>+import org.osgi.framework.Constants;
>+
>+public class RenameProvidePackageResolution extends AbstractManifestMarkerResolution {
>+
>+	public RenameProvidePackageResolution(int type) {
>+		super(type);
>+	}
>+
>+	public String getDescription() {
>+		return PDEUIMessages.RenameProvidePackageResolution_desc;
>+	}
>+
>+	public String getLabel() {
>+		return PDEUIMessages.RenameProvidePackageResolution_label;
>+	}
>+
>+	protected void createChange(BundleModel model) {
>+		model.getBundle().renameHeader(ICoreConstants.PROVIDE_PACKAGE, Constants.EXPORT_PACKAGE);
>+	}
>+	
>+}
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java,v
>retrieving revision 1.43
>diff -u -r1.43 BundleErrorReporter.java
>--- src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java	7 May 2007 21:28:55 -0000	1.43
>+++ src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java	26 Jul 2007 16:29:12 -0000
>@@ -108,6 +108,7 @@
> 		validateTranslatableHeaders();
> 		validateImportExportServices();
> 		validateBundleLocalization();
>+		validateProvidePackage();
> 	}
> 
> 	private void validateExportPackages() {
>@@ -1117,4 +1118,17 @@
> 			}
> 		}
> 	}
>+	
>+	private void validateProvidePackage() {
>+		IHeader header = getHeader(ICoreConstants.PROVIDE_PACKAGE);
>+		if(header == null)
>+			return;
>+		
>+		if (fOsgiR4 && isCheckDeprecated()) {
>+			report(PDECoreMessages.BundleErrorReporter_providePackageHeaderDeprecated,
>+					header.getLineNumber() + 1, CompilerFlags.P_DEPRECATED,
>+					PDEMarkerFactory.M_DEPRECATED_PROVIDE_PACKAGE,
>+					PDEMarkerFactory.CAT_OTHER);
>+		}
>+	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/pde/internal/core/builders/PDEMarkerFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/PDEMarkerFactory.java,v
>retrieving revision 1.16
>diff -u -r1.16 PDEMarkerFactory.java
>--- src/org/eclipse/pde/internal/core/builders/PDEMarkerFactory.java	2 Dec 2006 14:39:53 -0000	1.16
>+++ src/org/eclipse/pde/internal/core/builders/PDEMarkerFactory.java	26 Jul 2007 16:29:12 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2007 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
>@@ -39,6 +39,7 @@
> 	public static final int M_DEPRECATED_EXPORT_SERVICE = 0x1016; // deprecation
> 	public static final int M_UNECESSARY_DEP = 0x1017; // other problem
> 	public static final int M_MISSING_EXPORT_PKGS = 0x1018; // other problem
>+	public static final int M_DEPRECATED_PROVIDE_PACKAGE = 0x1019; // deprecation
> 	
> 	// build properties fixes
> 	public static final int B_APPEND_SLASH_FOLDER_ENTRY = 0x2001;
>Index: src/org/eclipse/pde/internal/core/pderesources.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties,v
>retrieving revision 1.71
>diff -u -r1.71 pderesources.properties
>--- src/org/eclipse/pde/internal/core/pderesources.properties	22 Apr 2007 17:44:56 -0000	1.71
>+++ src/org/eclipse/pde/internal/core/pderesources.properties	26 Jul 2007 16:29:12 -0000
>@@ -119,6 +119,7 @@
> BundleErrorReporter_localization_folder_not_exist=Folder specified for localization does not exist
> BundleErrorReporter_deprecated_attribute_reprovide = Attribute ''{0}'' is deprecated.  Use ''visibility:=private'' or ''visibility:=reexport'' directive instead
> BundleErrorReporter_deprecated_attribute_singleton = Attribute 'singleton' is deprecated.  Use the 'singleton' directive instead
>+BundleErrorReporter_providePackageHeaderDeprecated=Provide-Package header is deprecated, use Export-Package
> BundleErrorReporter_deprecated_attribute_specification_version = Attribute ''{0}'' is deprecated.  Use ''version'' attribute instead
> BundleErrorReporter_directive_hasNoEffectWith_ = the ''{0}'' directive has no effect in the presence of the ''{1}'' directive
> BundleErrorReporter_singletonAttrRequired = Plug-ins declaring extensions or extension points must set 'singleton' attribute to 'true'
>Index: src/org/eclipse/pde/internal/core/PDECoreMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java,v
>retrieving revision 1.35
>diff -u -r1.35 PDECoreMessages.java
>--- src/org/eclipse/pde/internal/core/PDECoreMessages.java	8 Jun 2007 16:06:51 -0000	1.35
>+++ src/org/eclipse/pde/internal/core/PDECoreMessages.java	26 Jul 2007 16:29:12 -0000
>@@ -27,6 +27,8 @@
> 
> 	public static String BundleErrorReporter_localization_properties_file_not_exist;
> 
>+	public static String BundleErrorReporter_providePackageHeaderDeprecated;
>+
> 	public static String BundleErrorReporter_reqExecEnv_conflict;
> 
> 	public static String BundleErrorReporter_reqExecEnv_unknown;

Actions: View | Diff

Attachments on bug 169373: 74290 | 74705 | 74720