summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (JBoss)2013-04-04 15:57:52 (EDT)
committerPascal Rapicault2013-04-09 08:03:44 (EDT)
commit45a946a0ff067a9ee369f8c83ab3a60a78251959 (patch)
tree7828131bd2c597d15745ce8e7ec8f883b1eb1269
parent56134fa584ab0cca4ab16dd948fffe484b9e4588 (diff)
downloadrt.equinox.p2-45a946a0ff067a9ee369f8c83ab3a60a78251959.zip
rt.equinox.p2-45a946a0ff067a9ee369f8c83ab3a60a78251959.tar.gz
rt.equinox.p2-45a946a0ff067a9ee369f8c83ab3a60a78251959.tar.bz2
cleanup
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/Messages.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gifbin332 -> 0 bytes
3 files changed, 4 insertions, 4 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 792778b..d71e84e 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
@@ -63,8 +63,8 @@ public class Messages extends NLS {
public static String UninstallOperation_ResolveJobName;
public static String UpdateOperation_ProfileChangeRequestProgress;
- public static String UpdateOperation_ResolveJobName;
public static String UpdateOperation_UpdateJobName;
+ public static String UpdateOperation_ResolveJobName;
public static String RemediationOperation_ProfileChangeRequestProgress;
public static String RemediationOperation_ResolveJobName;
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 56ef6f3..089e9bf 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
@@ -80,7 +80,6 @@ public class RemediationOperation extends ProfileChangeOperation {
request = currentRemedy.getRequest();
return;
}
-
try {
if (isCheckForUpdates)
status.add(computeCheckForUpdates(monitor));
@@ -108,12 +107,13 @@ public class RemediationOperation extends ProfileChangeOperation {
private IStatus computeAllRemediations(IProgressMonitor monitor) {
RemedyConfig[] remedyConfigs = RemedyConfig.getAllRemdyConfigs();
+ //SubMonitor sub = SubMonitor.convert(monitor, Messages.RemediationOperation_ProfileChangeRequestProgress, remedyConfigs.length);
SubMonitor sub = SubMonitor.convert(monitor, remedyConfigs.length);
- sub.setTaskName("Looking for alternate solutions");
+ sub.setTaskName(Messages.RemediationOperation_ProfileChangeRequestProgress);
List<Remedy> tmpRemedies = new ArrayList<Remedy>(remedyConfigs.length);
try {
for (int i = 0; i < remedyConfigs.length; i++) {
- sub.subTask(i + " out of " + remedyConfigs.length); //$NON-NLS-1$
+ sub.subTask((i + 1) + " out of " + remedyConfigs.length); //$NON-NLS-1$
if (sub.isCanceled())
return Status.CANCEL_STATUS;
Remedy remedy = computeRemedy(remedyConfigs[i], sub.newChild(1, SubMonitor.SUPPRESS_ALL_LABELS));
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gif
deleted file mode 100644
index 16f4f7c..0000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gif
+++ /dev/null
Binary files differ