summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (JBoss)2013-04-08 22:29:59 (EDT)
committerPascal Rapicault2013-04-09 08:06:25 (EDT)
commitdec353f059d744ee8331728420d0cbc07b815ade (patch)
tree81689e3cefbf55f34db213fd4e1dd95d92af3f2f
parentd10c6b436f109c97317cbd21d49c9e510557211f (diff)
downloadrt.equinox.p2-dec353f059d744ee8331728420d0cbc07b815ade.zip
rt.equinox.p2-dec353f059d744ee8331728420d0cbc07b815ade.tar.gz
rt.equinox.p2-dec353f059d744ee8331728420d0cbc07b815ade.tar.bz2
Icon overlay. No more overlay for upgrade and downgrade until we have the icons
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/icons/obj/downgraded_overlay.jpgbin11540 -> 0 bytes
-rwxr-xr-xbundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.gifbin0 -> 353 bytes
-rwxr-xr-xbundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.gifbin0 -> 352 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/icons/obj/upgraded_overlay.jpgbin11535 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java8
7 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/downgraded_overlay.jpg b/bundles/org.eclipse.equinox.p2.ui/icons/obj/downgraded_overlay.jpg
deleted file mode 100644
index fd8c470..0000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/downgraded_overlay.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.gif
new file mode 100755
index 0000000..cd84203
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.gif
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.gif
new file mode 100755
index 0000000..a53606b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.gif
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/upgraded_overlay.jpg b/bundles/org.eclipse.equinox.p2.ui/icons/obj/upgraded_overlay.jpg
deleted file mode 100644
index 3b15be0..0000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/upgraded_overlay.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java
index 27e7196..9853b58 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java
@@ -111,8 +111,8 @@ public class ProvUIActivator extends AbstractUIPlugin {
createImageDescriptor(ProvUIImages.IMG_UPDATED_IU, reg);
createImageDescriptor(ProvUIImages.IMG_ADDED_OVERLAY, reg);
createImageDescriptor(ProvUIImages.IMG_REMOVED_OVERLAY, reg);
- createImageDescriptor(ProvUIImages.IMG_DOWNGRADE_OVERLAY, reg);
- createImageDescriptor(ProvUIImages.IMG_UPGRADE_OVERLAY, reg);
+ createImageDescriptor(ProvUIImages.IMG_UPGRADED_IU, reg);
+ createImageDescriptor(ProvUIImages.IMG_DOWNGRADED_IU, reg);
createImageDescriptor(ProvUIImages.IMG_PATCH_IU, reg);
createImageDescriptor(ProvUIImages.IMG_DISABLED_PATCH_IU, reg);
createImageDescriptor(ProvUIImages.IMG_CATEGORY, reg);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
index 8927610..53a05fd 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
@@ -40,8 +40,8 @@ public class ProvUIImages {
public final static String IMG_IU = "obj/iu_obj.gif"; //$NON-NLS-1$
public final static String IMG_DISABLED_IU = "obj/iu_disabled_obj.gif"; //$NON-NLS-1$
public final static String IMG_UPDATED_IU = "obj/iu_update_obj.gif"; //$NON-NLS-1$
- public final static String IMG_UPGRADE_OVERLAY = "obj/upgraded_overlay.jpg"; //$NON-NLS-1$
- public final static String IMG_DOWNGRADE_OVERLAY = "obj/downgraded_overlay.jpg"; //$NON-NLS-1$
+ public final static String IMG_UPGRADED_IU = "obj/iu_upgraded.gif"; //$NON-NLS-1$
+ public final static String IMG_DOWNGRADED_IU = "obj/iu_downgraded.gif"; //$NON-NLS-1$
public final static String IMG_ADDED_OVERLAY = "obj/added_overlay.gif"; //$NON-NLS-1$
public final static String IMG_REMOVED_OVERLAY = "obj/removed_overlay.gif"; //$NON-NLS-1$
public final static String IMG_PATCH_IU = "obj/iu_patch_obj.gif"; //$NON-NLS-1$
@@ -71,7 +71,7 @@ public class ProvUIImages {
* Returns the image for the given image ID. Returns <code>null</code> if
* there is no such image.
*
- * @param id
+ * @param upgraded_overlayid
* the identifier for the image to retrieve
* @return the image associated with the given ID. This image is managed in
* an image registry and should not be freed by the client.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java
index 3404e4f..3d9b83b 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java
@@ -73,14 +73,14 @@ public class AvailableIUElement extends QueriedElement implements IIUElement {
return isInstalled ? ProvUIImages.IMG_DISABLED_PATCH_IU : ProvUIImages.IMG_PATCH_IU;
else if (isInstalled)
return ProvUIImages.IMG_DISABLED_IU;
+ if (beingDowngraded)
+ return ProvUIImages.IMG_DOWNGRADED_IU;
+ if (beingUpgraded)
+ return ProvUIImages.IMG_UPGRADED_IU;
return ProvUIImages.IMG_IU;
}
protected String getImageOverlayId(Object obj) {
- if (beingDowngraded)
- return ProvUIImages.IMG_DOWNGRADE_OVERLAY;
- if (beingUpgraded)
- return ProvUIImages.IMG_UPGRADE_OVERLAY;
if (beingRemoved)
return ProvUIImages.IMG_REMOVED_OVERLAY;
if (beingAdded)