Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-06-01 12:17:55 -0400
committerEike Stepper2015-06-01 12:17:55 -0400
commitde783294d37eb6603fdb7d0aa411f69e76d855d3 (patch)
tree730e07a89941a16ca90f8f9dda1bbba6a205748e
parent1921e7b317f4c0685468374a609b4e337ed62094 (diff)
downloadorg.eclipse.oomph-de783294d37eb6603fdb7d0aa411f69e76d855d3.tar.gz
org.eclipse.oomph-de783294d37eb6603fdb7d0aa411f69e76d855d3.tar.xz
org.eclipse.oomph-de783294d37eb6603fdb7d0aa411f69e76d855d3.zip
[466344] Some package icons have no transparent background
https://bugs.eclipse.org/bugs/show_bug.cgi?id=466344
-rw-r--r--plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java29
-rw-r--r--plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/ProductPage.java27
2 files changed, 27 insertions, 29 deletions
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
index 5ce3d6477..af2a8a7ee 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
@@ -95,7 +95,7 @@ public class ProductCatalogGenerator implements IApplication
private static final String ICON_URL_PREFIX = "http://www.eclipse.org/downloads/images/";
- private static final String ICON_DEFAULT = ICON_URL_PREFIX + "classic2.jpg";
+ private static final String ICON_DEFAULT = ICON_URL_PREFIX + "committers.png";
private static final Map<String, String> ICONS = new HashMap<String, String>();
@@ -133,7 +133,7 @@ public class ProductCatalogGenerator implements IApplication
ICONS.put("reporting", ICON_URL_PREFIX + "birt-icon_48x48.png");
ICONS.put("cpp", ICON_URL_PREFIX + "cdt.png");
ICONS.put("automotive", ICON_URL_PREFIX + "classic.jpg");
- ICONS.put("committers", ICON_URL_PREFIX + "classic2.jpg");
+ ICONS.put("committers", ICON_URL_PREFIX + "committers.png");
ICONS.put("dsl", ICON_URL_PREFIX + "dsl-package.jpg");
ICONS.put("java", ICON_URL_PREFIX + "java.png");
ICONS.put("jee", ICON_URL_PREFIX + "javaee.png");
@@ -141,7 +141,7 @@ public class ProductCatalogGenerator implements IApplication
ICONS.put("modeling", ICON_URL_PREFIX + "modeling.png");
ICONS.put("parallel", ICON_URL_PREFIX + "parallel.png");
ICONS.put("php", ICON_URL_PREFIX + "php.png");
- ICONS.put("rcp", ICON_URL_PREFIX + "rcp.jpg");
+ ICONS.put("rcp", ICON_URL_PREFIX + "rcp.png");
ICONS.put("scout", ICON_URL_PREFIX + "scout.jpg");
ICONS.put("testing", ICON_URL_PREFIX + "testing.png");
ICONS.put("mobile", ICON_URL_PREFIX + "mobile.jpg");
@@ -236,12 +236,12 @@ public class ProductCatalogGenerator implements IApplication
{
URI latestLocation = latestEPPMetaDataRepository.getLocation();
System.out.print(" -> " + latestLocation);
- org.eclipse.emf.common.util.URI relativeLocation = org.eclipse.emf.common.util.URI.createURI(latestLocation.toString()).deresolve(
- org.eclipse.emf.common.util.URI.createURI(effectiveEPPURI.toString()).appendSegment(""));
+ org.eclipse.emf.common.util.URI relativeLocation = org.eclipse.emf.common.util.URI.createURI(latestLocation.toString())
+ .deresolve(org.eclipse.emf.common.util.URI.createURI(effectiveEPPURI.toString()).appendSegment(""));
if (relativeLocation.isRelative())
{
- URI actualLatestEPPURI = new URI(org.eclipse.emf.common.util.URI.createURI(eppURI.toString()).appendSegments(relativeLocation.segments())
- .toString());
+ URI actualLatestEPPURI = new URI(
+ org.eclipse.emf.common.util.URI.createURI(eppURI.toString()).appendSegments(relativeLocation.segments()).toString());
try
{
manager.loadRepository(actualLatestEPPURI, null);
@@ -318,8 +318,8 @@ public class ProductCatalogGenerator implements IApplication
ius.remove(requirement);
}
- for (IInstallableUnit iu : P2Util.asIterable(releaseMetaDataRepository.query(
- QueryUtil.createLatestQuery(QueryUtil.createIUQuery("org.eclipse.platform.ide")), null)))
+ for (IInstallableUnit iu : P2Util
+ .asIterable(releaseMetaDataRepository.query(QueryUtil.createLatestQuery(QueryUtil.createIUQuery("org.eclipse.platform.ide")), null)))
{
String id = iu.getId();
String label = iu.getProperty("org.eclipse.equinox.p2.name");
@@ -490,8 +490,8 @@ public class ProductCatalogGenerator implements IApplication
checkVersionRanges(productCatalog);
postProcess(productCatalog);
- Resource resource = new BaseResourceFactoryImpl().createResource(outputLocation == null ? org.eclipse.emf.common.util.URI
- .createURI("org.eclipse.products.setup") : outputLocation);
+ Resource resource = new BaseResourceFactoryImpl()
+ .createResource(outputLocation == null ? org.eclipse.emf.common.util.URI.createURI("org.eclipse.products.setup") : outputLocation);
resource.getContents().add(productCatalog);
// resource.save(System.out, null);
@@ -517,8 +517,8 @@ public class ProductCatalogGenerator implements IApplication
return uri;
}
- private IMetadataRepository getLatestRepository(IMetadataRepositoryManager manager, IMetadataRepository repository) throws URISyntaxException,
- ProvisionException
+ private IMetadataRepository getLatestRepository(IMetadataRepositoryManager manager, IMetadataRepository repository)
+ throws URISyntaxException, ProvisionException
{
IMetadataRepository result = repository;
if (repository instanceof ICompositeRepository<?>)
@@ -542,8 +542,7 @@ public class ProductCatalogGenerator implements IApplication
return result;
}
- private IMetadataRepository loadLatestRepository(IMetadataRepositoryManager manager, URI eppURI, URI releaseURI) throws URISyntaxException,
- ProvisionException
+ private IMetadataRepository loadLatestRepository(IMetadataRepositoryManager manager, URI eppURI, URI releaseURI) throws URISyntaxException, ProvisionException
{
IMetadataRepository releaseMetaDataRepository = manager.loadRepository(releaseURI, null);
IMetadataRepository result = releaseMetaDataRepository;
diff --git a/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/ProductPage.java b/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/ProductPage.java
index 0cff8a4fc..c2e8c2e3c 100644
--- a/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/ProductPage.java
+++ b/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/ProductPage.java
@@ -865,8 +865,7 @@ public class ProductPage extends SetupWizardPage
label = product.getName();
}
- return "<html><body style=\"margin:5px;\"><img src=\""
- + imageURI
+ return "<html><body style=\"margin:5px;\"><img src=\"" + imageURI
+ "\" width=\"42\" height=\"42\" align=\"absmiddle\"></img><b>&nbsp;&nbsp;&nbsp;<span style=\"font-family:'Arial',Verdana,sans-serif; font-size:100%\">"
+ safe(label) + "</b><br/><hr/></span><span style=\"font-family:'Arial',Verdana,sans-serif; font-size:75%\">" + safe(description)
+ "</span></body></html>";
@@ -1074,7 +1073,7 @@ public class ProductPage extends SetupWizardPage
if (imageURI == null)
{
- imageURI = getImageURI(SetupUIPlugin.INSTANCE, "classic2.jpg");
+ imageURI = getImageURI(SetupUIPlugin.INSTANCE, "committers.png");
}
else
{
@@ -1506,19 +1505,19 @@ public class ProductPage extends SetupWizardPage
IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(), null, null, true, getContextSelection(),
Collections.<ViewerFilter> singletonList(new ViewerFilter()
+ {
+ @Override
+ public boolean select(Viewer viewer, Object parentElement, Object element)
+ {
+ if (element instanceof IFile)
{
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element)
- {
- if (element instanceof IFile)
- {
- IFile file = (IFile)element;
- return "setup".equals(file.getFileExtension());
- }
+ IFile file = (IFile)element;
+ return "setup".equals(file.getFileExtension());
+ }
- return true;
- }
- }));
+ return true;
+ }
+ }));
for (int i = 0, len = files.length; i < len; i++)
{

Back to the top