Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (JBoss)2013-05-03 16:38:41 +0000
committerPascal Rapicault2013-05-03 17:50:12 +0000
commite813506a5b81b0d4ba9dcc6371d2ddb3ec940ed9 (patch)
treef70cce9edaad81707fa3dbfd1efd2c3bd08dfdce /bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox
parent83c85716ebfe71e8fa1d2cc12adcfddfd78e1d71 (diff)
downloadrt.equinox.p2-e813506a5b81b0d4ba9dcc6371d2ddb3ec940ed9.tar.gz
rt.equinox.p2-e813506a5b81b0d4ba9dcc6371d2ddb3ec940ed9.tar.xz
rt.equinox.p2-e813506a5b81b0d4ba9dcc6371d2ddb3ec940ed9.zip
Bug 407115 - externalize stringsI20130504-1500I20130503-2000
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox')
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/Messages.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/messages.properties1
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java2
4 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/Messages.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/Messages.java
index d71e84e99..d340c68ad 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/Messages.java
@@ -69,6 +69,7 @@ public class Messages extends NLS {
public static String RemediationOperation_ProfileChangeRequestProgress;
public static String RemediationOperation_ResolveJobName;
public static String RemediationOperation_RemediationJobName;
+ public static String RemediationOperation_NoRemedyFound;
public static String OperationFactory_noAgent;
public static String OperationFactory_noIUFound;
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
index c5c2308aa..3823164ce 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
@@ -223,7 +223,7 @@ public class RequestFlexer {
private IProvisioningPlan resolve(IProfileChangeRequest temporaryRequest) {
String explainPropertyBackup = null;
try {
- temporaryRequest.setProfileProperty("_internal_user_defined_", "true");
+ temporaryRequest.setProfileProperty("_internal_user_defined_", "true"); //$NON-NLS-1$//$NON-NLS-2$
if (provisioningContext != null) {
explainPropertyBackup = provisioningContext.getProperty(EXPLANATION_ENABLEMENT);
provisioningContext.setProperty(EXPLANATION_ENABLEMENT, Boolean.FALSE.toString());
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/messages.properties b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/messages.properties
index 7a015572c..4789391db 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/messages.properties
@@ -48,6 +48,7 @@ UpdateOperation_UpdateJobName=Updating Software
RemediationOperation_ProfileChangeRequestProgress=Computing alternate solutions
RemediationOperation_ResolveJobName=Cannot complete the operation, searching alternate solutions
RemediationOperation_RemediationJobName=Installing Software
+RemediationOperation_NoRemedyFound=No remedy found
OperationFactory_noAgent=This installation has not been configured properly. No provisioning agent can be found.
OperationFactory_noIUFound=No IU could be found for {0}. \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java
index 143afc409..ae024008b 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java
@@ -228,6 +228,6 @@ public class RemediationOperation extends ProfileChangeOperation {
public IStatus getResolutionResult() {
if (currentRemedy != null)
return super.getResolutionResult();
- return remedies.size() > 0 ? Status.OK_STATUS : new Status(IStatus.ERROR, Activator.ID, "No remedy found");
+ return remedies.size() > 0 ? Status.OK_STATUS : new Status(IStatus.ERROR, Activator.ID, Messages.RemediationOperation_NoRemedyFound);
}
}

Back to the top