Fixed checkstyle errors

JabRef · Sep 1, 2020 · 4c2f493 · 4c2f493
1 parent 673b9f5
commit 4c2f493
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -128,6 +128,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue regarding pasting on Linux. [#6293](https://github.com/JabRef/jabref/issues/6293)
 
 - We fixed linked identifier icon inconsistency[#6705](https://github.com/JabRef/jabref/issues/6705)
+- We fixed the linked identifier icon inconsistency [#6705](https://github.com/JabRef/jabref/issues/6705)
+
 ### Removed
 
 - We removed the option of the "enforce legal key". [#6295](https://github.com/JabRef/jabref/issues/6295)

diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -302,7 +302,9 @@ public enum JabRefIcons implements JabRefIcon {
         REMOTE_DATABASE(MaterialDesignIcon.DATABASE),
         HOME(MaterialDesignIcon.HOME),
         DATABASE(MaterialDesignIcon.DATABASE),
-        DATABASE_PLUS(MaterialDesignIcon.DATABASE_PLUS);
+        DATABASE_PLUS(MaterialDesignIcon.DATABASE_PLUS),
+        LINK(MaterialDesignIcon.LINK_VARIANT_OFF),
+        LINK_VARIANT(MaterialDesignIcon.LINK_VARIANT);
 
         private final JabRefIcon icon;
 

diff --git a/src/main/java/org/jabref/gui/maintable/CellFactory.java b/src/main/java/org/jabref/gui/maintable/CellFactory.java
@@ -27,14 +27,10 @@ public CellFactory(ExternalFileTypes externalFileTypes, UndoManager undoManager)
         // icon.setToo(Localization.lang("Open") + " PDF");
         TABLE_ICONS.put(StandardField.PDF, icon);
 
-        icon = IconTheme.JabRefIcons.DATABASE;
+        icon = IconTheme.JabRefIcons.WWW;
         // icon.setToolTipText(Localization.lang("Open") + " URL");
         TABLE_ICONS.put(StandardField.URL, icon);
 
-        icon = IconTheme.JabRefIcons.DATABASE_PLUS;
-        // icon.setToolTipText(Localization.lang("Open") + " URL");
-        TABLE_ICONS.put(StandardField.URLS, icon);
-
         icon = IconTheme.JabRefIcons.WWW;
         // icon.setToolTipText(Localization.lang("Open") + " CiteSeer URL");
         TABLE_ICONS.put(new UnknownField("citeseerurl"), icon);
@@ -98,7 +94,6 @@ public CellFactory(ExternalFileTypes externalFileTypes, UndoManager undoManager)
         icon = printedViewModel.getIcon();
         // icon.setToolTipText(printedViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.PRINTED, icon);
-
     }
 
     public Node getTableIcon(Field field) {

diff --git a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
@@ -50,7 +50,7 @@ public LinkedIdentifierColumn(MainTableColumnModel model,
         this.setResizable(false);
         this.setCellValueFactory(cellData -> cellData.getValue().getLinkedIdentifiers());
         new ValueTableCellFactory<BibEntryTableViewModel, Map<Field, String>>()
-                .withGraphic(values -> createIdentifierGraphic(values))
+                .withGraphic(this::createIdentifierGraphic)
                 .withTooltip(this::createIdentifierTooltip)
                 .withMenu(this::createIdentifierMenu)
                 .withOnMouseClickedEvent((entry, linkedFiles) -> event -> {
@@ -70,9 +70,9 @@ public LinkedIdentifierColumn(MainTableColumnModel model,
 
     private Node createIdentifierGraphic(Map<Field, String> values) {
         if (values.size() > 1) {
-            return cellFactory.getTableIcon(StandardField.URLS);
+            return IconTheme.JabRefIcons.LINK_VARIANT.getGraphicNode();
         } else if (values.size() == 1) {
-            return cellFactory.getTableIcon(StandardField.URL);
+            return IconTheme.JabRefIcons.LINK.getGraphicNode();
         } else {
             return null;
         }

diff --git a/src/main/java/org/jabref/model/entry/field/StandardField.java b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -123,7 +123,6 @@ public enum StandardField implements Field {
     TYPE("type", FieldProperty.TYPE),
     URI("uri", "URI"),
     URL("url", "URL", FieldProperty.EXTERNAL, FieldProperty.VERBATIM),
-    URLS("urls", "URLS", FieldProperty.VERBATIM),
     URLDATE("urldate", FieldProperty.DATE),
     VENUE("venue"),
     VERSION("version"),