[560565] Provide support for a branding-based notification button
Fix the NPE caused by SelfUpdate.getProductVersion() returning null
because it assumes the product ID is the same as the ID of the product
IU, which is not the case with the various product variants that are
built currently.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=560565
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SelfUpdate.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SelfUpdate.java
index b698a80..b557f09 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SelfUpdate.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SelfUpdate.java
@@ -24,7 +24,6 @@
import org.eclipse.oomph.util.ExceptionHandler;
import org.eclipse.oomph.util.IRunnable;
import org.eclipse.oomph.util.OomphPlugin;
-import org.eclipse.oomph.util.PropertiesUtil;
import org.eclipse.oomph.util.StringUtil;
import org.eclipse.core.runtime.CoreException;
@@ -93,7 +92,7 @@
String buildID = highestBuildID != 0 ? Integer.toString(highestBuildID) : firstBuildID;
- for (IInstallableUnit iu : P2Util.asIterable(profile.query(QueryUtil.createIUQuery(PropertiesUtil.getProductID()), null)))
+ for (IInstallableUnit iu : P2Util.asIterable(profile.query(QueryUtil.createIUProductQuery(), null)))
{
String label;
