[eclipse] Use the SARL icons for elements in the default package.

close #628 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Mar 31, 2017 · c773897 · c773897
1 parent 99788c4
commit c773897
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/...sarl.eclipse/src/io/sarl/eclipse/wizards/elements/SarlSpecificTypeSelectionExtension.java b/...sarl.eclipse/src/io/sarl/eclipse/wizards/elements/SarlSpecificTypeSelectionExtension.java
@@ -70,12 +70,23 @@ public ITypeInfoImageProvider getImageProvider() {
 	@Override
 	public ImageDescriptor getImageDescriptor(ITypeInfoRequestor typeInfoRequestor) {
 		QualifiedName qualifiedName;
-		if (Strings.isEmpty(typeInfoRequestor.getEnclosingName())) {
-			qualifiedName = this.converter.toQualifiedName(typeInfoRequestor.getPackageName());
+		final String enclosing = typeInfoRequestor.getEnclosingName();
+		if (Strings.isEmpty(enclosing)) {
+			final String packageName = typeInfoRequestor.getPackageName();
+			if (Strings.isEmpty(packageName)) {
+				qualifiedName = null;
+			} else {
+				qualifiedName = this.converter.toQualifiedName(packageName);
+			}
 		} else {
-			qualifiedName = this.converter.toQualifiedName(typeInfoRequestor.getEnclosingName());
+			qualifiedName = this.converter.toQualifiedName(enclosing);
+		}
+		final QualifiedName qn = this.converter.toQualifiedName(typeInfoRequestor.getTypeName());
+		if (qualifiedName == null) {
+			qualifiedName = qn;
+		} else {
+			qualifiedName = qualifiedName.append(qn);
 		}
-		qualifiedName = qualifiedName.append(typeInfoRequestor.getTypeName());
 		return this.imageProvider.getImageDescriptorForQualifiedName(qualifiedName, this.typeProvider.getResourceSet(),
 				this.typeProvider);
 	}