summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (JBoss)2013-04-27 18:13:25 (EDT)
committerPascal Rapicault2013-04-27 18:13:25 (EDT)
commit4e3182294b1da0eeff3a346b565f8371c530b9ed (patch)
treea2364f9d23d5f624658214006b7adf472a6fe4d8
parent74d63a6058f87a4f2dd85dee9b124a772b9f114e (diff)
downloadrt.equinox.p2-4e3182294b1da0eeff3a346b565f8371c530b9ed.zip
rt.equinox.p2-4e3182294b1da0eeff3a346b565f8371c530b9ed.tar.gz
rt.equinox.p2-4e3182294b1da0eeff3a346b565f8371c530b9ed.tar.bz2
Externalize message
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties1
3 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
index 70defec..4b74598 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
@@ -85,6 +85,7 @@ public class ProvUIMessages extends NLS {
// Provisioning operations
public static String ProvisioningOperationRunner_CannotApplyChanges;
+ public static String ProvisioningOperationWizard_Remediation_Operation;
public static String ProvisioningOperationWizard_UnexpectedFailureToResolve;
public static String InstalledSoftwarePage_NoProfile;
public static String InstallIUOperationLabel;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
index 8580e68..6d25fbb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
@@ -16,7 +16,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.HashSet;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest;
import org.eclipse.equinox.internal.p2.ui.*;
import org.eclipse.equinox.internal.p2.ui.model.ElementUtils;
import org.eclipse.equinox.internal.p2.ui.model.IUElementListRoot;
@@ -257,10 +256,10 @@ public abstract class ProvisioningOperationWizard extends Wizard {
recomputePlan(runnableContext, false);
}
- public void computeRemediationOperation(ProfileChangeOperation operation, ProvisioningUI ui, IProgressMonitor monitor) {
- SubMonitor sub = SubMonitor.convert(monitor, "remediationoperation", RemedyConfig.getAllRemdyConfigs().length);
- monitor.setTaskName("compute remediation operation");
- remediationOperation = new RemediationOperation(ui.getSession(), (ProfileChangeRequest) operation.getProfileChangeRequest());
+ public void computeRemediationOperation(ProfileChangeOperation op, ProvisioningUI ui, IProgressMonitor monitor) {
+ SubMonitor sub = SubMonitor.convert(monitor, ProvUIMessages.ProvisioningOperationWizard_Remediation_Operation, RemedyConfig.getAllRemdyConfigs().length);
+ monitor.setTaskName(ProvUIMessages.ProvisioningOperationWizard_Remediation_Operation);
+ remediationOperation = new RemediationOperation(ui.getSession(), op.getProfileChangeRequest());
remediationOperation.getResolveJob(monitor);
sub.done();
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
index e71439a..104e398 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
@@ -14,6 +14,7 @@ ProfileModificationWizardPage_DetailsLabel=Details
ProfileSnapshots_Label=Installation History
ProvisioningOperationRunner_CannotApplyChanges=The changes could not be applied while the application is running. You must restart the application for the changes to take effect.
+ProvisioningOperationWizard_Remediation_Operation=Compute remediation operation
ProvisioningOperationWizard_UnexpectedFailureToResolve=Unexpected error
InstalledSoftwarePage_NoProfile=This installation has not been configured for showing the installed software. See the error log for details.
InstallIUOperationLabel=Install