Attachment 263506 Details for Bug 259958 – Fix

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

[patch] Fix

259958.patch (text/plain), 8.12 KB, created by Vikas Chandra

on 2016-08-08 05:57:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Vikas Chandra

Created: 2016-08-08 05:57:49 EDT

Size: 8.12 KB

patch

obsolete

>diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PreferenceInitializer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PreferenceInitializer.java
>index d37bede..7ff97e7 100644
>--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PreferenceInitializer.java
>+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PreferenceInitializer.java
>@@ -22,6 +22,7 @@
> 		//set defaults for compiler preferences in org.eclipse.pde pref node, not org.eclipse.pde.core
> 		IEclipsePreferences prefs = DefaultScope.INSTANCE.getNode(PDE.PLUGIN_ID);
> 		prefs.putInt(CompilerFlags.P_UNRESOLVED_IMPORTS, CompilerFlags.ERROR);
>+		prefs.putInt(CompilerFlags.P_EXPORTED_PACKAGE_MISSING, CompilerFlags.ERROR);
> 		prefs.putInt(CompilerFlags.P_UNRESOLVED_EX_POINTS, CompilerFlags.ERROR);
> 		prefs.putInt(CompilerFlags.P_NO_REQUIRED_ATT, CompilerFlags.ERROR);
> 		prefs.putInt(CompilerFlags.P_UNKNOWN_ELEMENT, CompilerFlags.WARNING);
>diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
>index 64668d3..73f40ba 100644
>--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
>+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
>@@ -882,7 +882,9 @@
> 				/* The exported package does not exist in the bundle.  Allow project folders to be packages (see bug 166680 comment 17)*/
> 				if (!getExportedPackages().contains(name) && !(fProject.getFolder(name.replace('.', '/')).exists())) {
> 					message = NLS.bind(PDECoreMessages.BundleErrorReporter_NotExistInProject, name);
>-					IMarker marker = report(message, getPackageLine(header, elements[i]), CompilerFlags.P_UNRESOLVED_IMPORTS, PDEMarkerFactory.M_EXPORT_PKG_NOT_EXIST, PDEMarkerFactory.CAT_OTHER);
>+					IMarker marker = report(message, getPackageLine(header, elements[i]),
>+							CompilerFlags.P_EXPORTED_PACKAGE_MISSING, PDEMarkerFactory.M_EXPORT_PKG_NOT_EXIST,
>+							PDEMarkerFactory.CAT_OTHER);
> 					addMarkerAttribute(marker, "packageName", name); //$NON-NLS-1$
> 				}
> 			}
>diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/CompilerFlags.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/CompilerFlags.java
>index 108a2d9..5b960c0 100644
>--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/CompilerFlags.java
>+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/CompilerFlags.java
>@@ -44,6 +44,7 @@
> 	 * plugin preferences
> 	 */
> 	public static final String P_UNRESOLVED_IMPORTS = "compilers.p.unresolved-import"; //$NON-NLS-1$
>+	public static final String P_EXPORTED_PACKAGE_MISSING = "compilers.p.exported-package-missing"; //$NON-NLS-1$
> 	public static final String P_UNRESOLVED_EX_POINTS = "compilers.p.unresolved-ex-points"; //$NON-NLS-1$
> 	public static final String P_UNKNOWN_ELEMENT = "compilers.p.unknown-element"; //$NON-NLS-1$
> 	public static final String P_UNKNOWN_ATTRIBUTE = "compilers.p.unknown-attribute"; //$NON-NLS-1$
>diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>index f9aec24..fc1689a 100644
>--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>@@ -1685,6 +1685,7 @@
> 	public static String CompilersPropertyPage_useprojectsettings_label;
> 
> 	public static String compilers_p_unresolved_import;
>+	public static String compilers_p_export_package_missing_in_plugin;
> 	public static String compilers_p_unresolved_ex_points;
> 	public static String compilers_p_unknown_element;
> 	public static String compilers_p_unknown_attribute;
>diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
>index ae36790..25fd94d 100644
>--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
>+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
>@@ -1490,6 +1490,7 @@
> CompilersPropertyPage_useprojectsettings_label = E&nable project specific settings
> 
> compilers_p_unresolved_import= U&nresolved dependencies:
>+compilers_p_export_package_missing_in_plugin= Exported packages &missing:
> compilers_p_unresolved_ex_points= Un&resolved extension points:
> compilers_p_unknown_element= Ille&gal elements:
> compilers_p_unknown_attribute=&Illegal attributes:
>@@ -1501,7 +1502,7 @@
> compilers_p_not_externalized_att = Usage of non-externali&zed strings:
> compilers_p_deprecated = Usage of deprecated attributes and &elements:
> compilers_p_internal = Usage o&f internal extension points:
>-compilers_p_exported_pkgs = Missing exported pac&kages:
>+compilers_p_exported_pkgs = Unexported pac&kages:
> compilers_p_missing_exp_pkg = Missing versions on exported packages:
> compilers_p_missing_imp_pkg = Missing versions on imported packages:
> compilers_p_missing_require_bundle = Missing versions on required bundles:
>diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
>index fc74351..44c8ee1 100644
>--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
>+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java
>@@ -184,6 +184,8 @@
> 
> 	//unresolved
> 	private static final Key KEY_P_UNRESOLVED_IMPORTS = getPDEPrefKey(CompilerFlags.P_UNRESOLVED_IMPORTS);
>+	private static final Key KEY_P_EXPORTED_PACKAGE_MISSING = getPDEPrefKey(
>+			CompilerFlags.P_EXPORTED_PACKAGE_MISSING);
> 	private static final Key KEY_P_UNRESOLVED_EX_POINTS = getPDEPrefKey(CompilerFlags.P_UNRESOLVED_EX_POINTS);
> 	private static final Key KEY_F_UNRESOLVED_PLUGINS = getPDEPrefKey(CompilerFlags.F_UNRESOLVED_PLUGINS);
> 	private static final Key KEY_F_UNRESOLVED_FEATURES = getPDEPrefKey(CompilerFlags.F_UNRESOLVED_FEATURES);
>@@ -527,7 +529,15 @@
> 				initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_missing_require_bundle, PDEUIMessages.compilers_p_missing_exp_pkg, PDEUIMessages.compilers_p_missing_imp_pkg}, new Key[] {KEY_P_VERSION_REQ_BUNDLE, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG}, CompilerFlags.PLUGIN_FLAGS);
> 				// Usage
> 				client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_usage);
>-				initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_unresolved_import, PDEUIMessages.compilers_p_unresolved_ex_points, PDEUIMessages.compilers_p_internal, PDEUIMessages.compilers_p_deprecated, PDEUIMessages.compilers_p_not_externalized_att}, new Key[] {KEY_P_UNRESOLVED_IMPORTS, KEY_P_UNRESOLVED_EX_POINTS, KEY_P_INTERNAL, KEY_P_DEPRECATED, KEY_P_NOT_EXTERNALIZED}, CompilerFlags.PLUGIN_FLAGS);
>+			initializeComboControls(client,
>+					new String[] { PDEUIMessages.compilers_p_unresolved_import,
>+							PDEUIMessages.compilers_p_export_package_missing_in_plugin,
>+							PDEUIMessages.compilers_p_unresolved_ex_points, PDEUIMessages.compilers_p_internal,
>+							PDEUIMessages.compilers_p_deprecated, PDEUIMessages.compilers_p_not_externalized_att },
>+					new Key[] { KEY_P_UNRESOLVED_IMPORTS, KEY_P_EXPORTED_PACKAGE_MISSING, KEY_P_UNRESOLVED_EX_POINTS,
>+							KEY_P_INTERNAL, KEY_P_DEPRECATED,
>+							KEY_P_NOT_EXTERNALIZED },
>+					CompilerFlags.PLUGIN_FLAGS);
> 				// References
> 				client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_references);
> 				initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_unknown_element, PDEUIMessages.compilers_p_unknown_attribute, PDEUIMessages.compilers_p_unknown_class, PDEUIMessages.compilers_p_discouraged_class, PDEUIMessages.compilers_p_unknown_resource, PDEUIMessages.compilers_p_unknown_identifier}, new Key[] {KEY_P_UNKNOWN_ELEMENT, KEY_P_UNKNOWN_ATTRIBUTE, KEY_P_UNKNOWN_CLASS, KEY_P_DISCOURAGED_CLASS, KEY_P_UNKNOWN_RESOURCE, KEY_P_UNKNOWN_IDENTIFIER,}, CompilerFlags.PLUGIN_FLAGS);

Actions: View | Diff

Attachments on bug 259958: 260493 | 261592 | 263506 | 263507 | 263508