Bug 551901 - Unspecified organization name displays "by unknown"

Change-Id: I3fdb3cc9b6af19c30a96be92ec842f83137ae4cd Signed-off-by: PyvesB <PyvesDev@gmail.com>
eclipse-mpc · Oct 21, 2019 · f8df67f · f8df67f
1 parent 2a321af
commit f8df67f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/org.eclipse.epp.mpc-target/staging.target b/org.eclipse.epp.mpc-target/staging.target
@@ -7,7 +7,7 @@
 <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.ds" version="0.0.0"/>
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.13-I-builds"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.14-I-builds"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.hamcrest" version="0.0.0"/>

diff --git a/....epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy.java b/....epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2018 The Eclipse Foundation and others.
+ * Copyright (c) 2010, 2019 The Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
  * Contributors:
  * 	The Eclipse Foundation - initial API and implementation
  * 	Yatta Solutions - bug 314936, bug 398200, bug 432803: public API, bug 413871: performance
+ *  Pierre-Yves B., pyvesdev@gmail.com - Bug 551901: Unspecified organization name displays "by unknown"
  *******************************************************************************/
 package org.eclipse.epp.internal.mpc.ui.catalog;
 
@@ -348,7 +349,11 @@ protected CatalogItem createCatalogItem(final INode node, String categoryId, boo
 			} else {
 				catalogItem.setDescription(node.getShortdescription());
 			}
-			catalogItem.setProvider(node.getCompanyname());
+			String provider = node.getCompanyname();
+			if (provider == null || provider.isEmpty()) {
+				provider = node.getOwner();
+			}
+			catalogItem.setProvider(provider);
 			String updateurl = node.getUpdateurl();
 			if (updateurl != null) {
 				try {