From caf4ec550740f180859aba2efd3a7c6d1f2afde0 Mon Sep 17 00:00:00 2001 From: Alshama M S Date: Sun, 23 Jul 2023 19:36:19 +0530 Subject: [PATCH] Quick-fix for Import-Package resolution failure: Edits --- .../src/org/eclipse/pde/internal/core/PDECoreMessages.java | 4 ++++ .../org/eclipse/pde/internal/core/pderesources.properties | 3 +++ .../src/org/eclipse/pde/internal/ui/PDEUIMessages.java | 4 ---- .../AddMandatoryAttributeImportPackageResolution.java | 6 +++--- .../src/org/eclipse/pde/internal/ui/pderesources.properties | 3 --- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java index e707bb0311a..89d5936277b 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java @@ -251,6 +251,10 @@ public class PDECoreMessages extends NLS { public static String ManifestConsistencyChecker_buildPropertiesSubtask; + public static String AddMandatoryAttrResolution_label; + + public static String AddMandatoryAttrResolution_description; + public static String BuildErrorReporter_missingEntry; public static String BuildErrorReporter_missingFolder; public static String BuildErrorReporter_emptyEntry; diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties index df610bf331d..f094d13bc05 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties @@ -126,6 +126,9 @@ BuildErrorReporter_CompilercomplianceLevel=Compiler compliance level Builders_Manifest_key_not_found = Key ''{0}'' is not found in localization properties file: {1} Builders_Manifest_useless_file = A plug-in manifest must contain at least one extension or extension point BuildErrorReporter_missingEntry = ''{0}'' build entry is missing +AddMandatoryAttrResolution_label=Adds mandatory attribute value +AddMandatoryAttrResolution_description=Add mandatory attribute value +BundleErrorReporter_MissingMandatoryDirective=Mandatory attribute missing for the imported package Builders_Convert_missingAttribute = ''{0}'' attribute is missing Builders_Convert_illegalValue = Illegal value for ''{0}'' attribute 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 e947e6c5221..40f3c7d6d9d 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 @@ -2609,10 +2609,6 @@ public class PDEUIMessages extends NLS { public static String RemoveImportPkgResolution_label; - public static String AddMandatoryAttrResolution_label; - - public static String AddMandatoryAttrResolution_description; - public static String NoLineTerminationResolutionCreate_description; public static String NoLineTerminationResolutionCreate_label; diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddMandatoryAttributeImportPackageResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddMandatoryAttributeImportPackageResolution.java index 404a013bf7b..93a9dd75de4 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddMandatoryAttributeImportPackageResolution.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddMandatoryAttributeImportPackageResolution.java @@ -17,12 +17,12 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; +import org.eclipse.pde.internal.core.PDECoreMessages; import org.eclipse.pde.internal.core.text.bundle.Bundle; import org.eclipse.pde.internal.core.text.bundle.BundleModel; import org.eclipse.pde.internal.core.text.bundle.ImportPackageHeader; import org.eclipse.pde.internal.core.text.bundle.ImportPackageObject; import org.eclipse.pde.internal.ui.PDEPlugin; -import org.eclipse.pde.internal.ui.PDEUIMessages; import org.osgi.framework.Constants; /** @@ -62,12 +62,12 @@ protected void createChange(BundleModel model) { @Override public String getDescription() { - return PDEUIMessages.AddMandatoryAttrResolution_label; + return PDECoreMessages.AddMandatoryAttrResolution_label; } @Override public String getLabel() { - return PDEUIMessages.AddMandatoryAttrResolution_description; + return PDECoreMessages.AddMandatoryAttrResolution_description; } } \ No newline at end of file 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 64de6c17242..b7fc95737c7 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 @@ -2303,9 +2303,6 @@ ReplaceBuildEntryResolution_replaceToken=Change the value of ''{1}'' build entry RemoveImportPkgResolution_label=Remove the ''{0}'' package from the list OptionalImportPkgResolution_description=Mark ''{0}'' as an optional imported package OptionalImportPkgResolution_label=Mark package ''{0}'' as an optional imported package -AddMandatoryAttrResolution_label=Adds mandatory attribute value -AddMandatoryAttrResolution_description=Add mandatory attribute value -BundleErrorReporter_MissingMandatoryDirective=Mandatory attribute missing for the imported package OptionalRequireBundleResolution_description=Mark bundle ''{0}'' as optional OptionalRequireBundleResolution_label=Mark bundle ''{0}'' as optional AddBundleManifestVersionResolution_description=Adds the 'Bundle-ManifestVersion: 2' header to support OSGi R4 headers