Merge pull request #6121 from JabRef/allow-icons-for-groups

calixtus · web-flow · commit b5d5ed00e075 · 2020-03-14T23:10:22.000+01:00
Icons from Material design icons not recognized
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -39,6 +39,7 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.google.common.base.Enums;
+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
 import org.fxmisc.easybind.EasyBind;
 
 public class GroupNodeViewModel {
@@ -204,7 +205,7 @@ private JabRefIcon createDefaultIcon() {
     }
 
     private Optional<JabRefIcon> parseIcon(String iconCode) {
-        return Enums.getIfPresent(IconTheme.JabRefIcons.class, iconCode.toUpperCase(Locale.ENGLISH))
+        return Enums.getIfPresent(MaterialDesignIcon.class, iconCode.toUpperCase(Locale.ENGLISH))
                     .toJavaUtil()
                     .map(icon -> new InternalMaterialDesignIcon(getColor(), icon));
     }

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`import org.jabref.model.strings.StringUtil;`
`40`	`40`
`41`	`41`	`import com.google.common.base.Enums;`
	`42`	`+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;`
`42`	`43`	`import org.fxmisc.easybind.EasyBind;`
`43`	`44`
`44`	`45`	`public class GroupNodeViewModel {`
`@@ -204,7 +205,7 @@ private JabRefIcon createDefaultIcon() {`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`private Optional<JabRefIcon> parseIcon(String iconCode) {`
`207`		`- return Enums.getIfPresent(IconTheme.JabRefIcons.class, iconCode.toUpperCase(Locale.ENGLISH))`
	`208`	`+ return Enums.getIfPresent(MaterialDesignIcon.class, iconCode.toUpperCase(Locale.ENGLISH))`
`208`	`209`	`.toJavaUtil()`
`209`	`210`	`.map(icon -> new InternalMaterialDesignIcon(getColor(), icon));`
`210`	`211`	`}`