Show more than one group color bar

tobiasdiez · tobiasdiez · commit 124958ee818b · 2019-09-26T20:35:53.000+02:00
Shows multiple colored bars if the entry belongs to more than one group (with color). Implements #4574.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ### Changed
 
 - We added a short DOI field formatter which shortens DOI to more human readable form. [koppor#343](https://github.com/koppor/jabref/issues/343)
+- We improved the display of group memberships by adding multiple colored bars if the entry belongs to more than one group. [#4574](https://github.com/JabRef/jabref/issues/4574)
 
 ### Fixed
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -17,8 +17,8 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 
@@ -129,27 +129,26 @@ public MainTableColumnFactory(BibDatabaseContext database, ColumnPreferences pre
     }
 
     private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractGroup> matchedGroups) {
-        Color groupColor = matchedGroups.stream()
-                .flatMap(group -> OptionalUtil.toStream(group.getColor()))
-                .findFirst()
-                .orElse(Color.TRANSPARENT);
-
-        if (groupColor != Color.TRANSPARENT) {
-            Rectangle border = new Rectangle();
-            border.setWidth(5);
-            border.setHeight(20);
-            border.setFill(Color.DARKGRAY);
-
-            Rectangle groupRectangle = new Rectangle();
-            groupRectangle.setWidth(3);
-            groupRectangle.setHeight(18);
-            groupRectangle.setFill(groupColor);
-
-            StackPane container = new StackPane();
+        List<Color> groupColors = matchedGroups.stream()
+                                               .flatMap(group -> OptionalUtil.toStream(group.getColor()))
+                                               .collect(Collectors.toList());
+
+        if (!groupColors.isEmpty()) {
+            HBox container = new HBox();
+            container.setSpacing(2);
             container.setMinWidth(10);
             container.setAlignment(Pos.CENTER);
 
-            container.getChildren().addAll(border,groupRectangle);
+            for (Color groupColor : groupColors) {
+                Rectangle groupRectangle = new Rectangle();
+                groupRectangle.setWidth(3);
+                groupRectangle.setHeight(18);
+                groupRectangle.setFill(groupColor);
+                groupRectangle.setStroke(Color.DARKGRAY);
+                groupRectangle.setStrokeWidth(1);
+
+                container.getChildren().add(groupRectangle);
+            }
 
             String matchedGroupsString = matchedGroups.stream()
                     .map(AbstractGroup::getName)
diff --git a/src/test/resources/testbib/complex.bib b/src/test/resources/testbib/complex.bib
@@ -21,78 +21,81 @@ @PhdThesis{deBraga2001
 @Article{1102917,
   author     = {E. Bardram},
   title      = {The trouble with login: on usability and computer security in ubiquitous computing},
-  journal    = {Personal Ubiquitous Comput.},
-  year       = {2005},
-  volume     = {9},
+  doi        = {http://dx.doi.org/10.1007/s00779-005-0347-6},
+  issn       = {1617-4909},
   number     = {6},
   pages      = {357--367},
-  issn       = {1617-4909},
-  doi        = {http://dx.doi.org/10.1007/s00779-005-0347-6},
+  volume     = {9},
   address    = {London, UK},
   bdsk-url-1 = {http://dx.doi.org/10.1007/s00779-005-0347-6},
+  groups     = {TestOne, TestTwo},
+  journal    = {Personal Ubiquitous Comput.},
   priority   = {prio1},
   publisher  = {Springer-Verlag},
+  year       = {2005},
 }
 
 @InProceedings{1137631,
-  author     = {Gustav Bostr\"{o}m and Jaana W\"{a}yrynen and Marine Bod\'{e}n and Konstantin Beznosov and Philippe Kruchten},
-  title      = {Extending XP practices to support security requirements engineering},
+  author     = {Gustav Bostr\"{o}m and Jaana W\"{a}yrynen and Marine Bod\'{e}n and Konstantin Beznosov and Philippe Kruchten, Churchill},
   booktitle  = {SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems},
-  year       = {2006},
-  publisher  = {ACM},
-  location   = {Shanghai, China},
+  title      = {Extending XP practices to support security requirements engineering},
+  doi        = {http://doi.acm.org/10.1145/1137627.1137631},
   isbn       = {1-59593-411-1},
+  location   = {Shanghai, China},
   pages      = {11--18},
-  doi        = {http://doi.acm.org/10.1145/1137627.1137631},
+  publisher  = {ACM},
   address    = {New York, NY, USA},
   bdsk-url-1 = {http://doi.acm.org/10.1145/1137627.1137631},
   file       = {:/Volumes/iDisk/Freie Universität Berlin/Semester 9/Softwareprozesse/p11-bostrom.pdf:PDF},
-  groups     = {StaticGroup},
+  groups     = {StaticGroup, TestOneSubOne, TestOneSubTwo, TestOne, TestTwo},
+  year       = {2006},
 }
 
-@INPROCEEDINGS{1132768,
-  author = {Christina Braz and Jean-Marc Robert},
-  title = {Security and usability: the case of the user authentication methods},
-  booktitle = {IHM '06: Proceedings of the 18th International Conferenceof the Association
-	Francophone d'Interaction Homme-Machine},
-  year = {2006},
-  pages = {199--203},
-  address = {New York, NY, USA},
-  publisher = {ACM},
+@InProceedings{1132768,
+  author     = {Christina Braz and Jean-Marc Robert},
+  booktitle  = {IHM '06: Proceedings of the 18th International Conferenceof the Association Francophone d'Interaction Homme-Machine},
+  title      = {Security and usability: the case of the user authentication methods},
+  doi        = {http://doi.acm.org/10.1145/1132736.1132768},
+  isbn       = {1-59593-350-6},
+  location   = {Montreal, Canada},
+  pages      = {199--203},
+  publisher  = {ACM},
+  address    = {New York, NY, USA},
   bdsk-url-1 = {http://doi.acm.org/10.1145/1132736.1132768},
-  doi = {http://doi.acm.org/10.1145/1132736.1132768},
-  isbn = {1-59593-350-6},
-  location = {Montreal, Canada}
+  groups     = {TestOneSubTwo, TestOneSubOne},
+  year       = {2006},
 }
 
 @InProceedings{1137628,
   author     = {Danilo Bruschi and Bart De Win and Mattia Monga},
-  title      = {Introduction to software engineering for secure systems: SESS06 -- secure by design},
   booktitle  = {SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems},
-  year       = {2006},
-  publisher  = {ACM},
-  location   = {Shanghai, China},
+  title      = {Introduction to software engineering for secure systems: SESS06 -- secure by design},
+  doi        = {http://doi.acm.org/10.1145/1137627.1137628},
   isbn       = {1-59593-411-1},
+  location   = {Shanghai, China},
   pages      = {1--2},
-  doi        = {http://doi.acm.org/10.1145/1137627.1137628},
+  publisher  = {ACM},
   address    = {New York, NY, USA},
   bdsk-url-1 = {http://doi.acm.org/10.1145/1137627.1137628},
+  groups     = {TestTwo},
   readstatus = {read},
+  year       = {2006},
 }
 
-@ARTICLE{1373163,
-  author = {Elizabeth Churchill and Les Nelson and Diana K. Smetters},
-  title = {Useful Computer Security},
-  journal = {IEEE Internet Computing},
-  year = {2008},
-  volume = {12},
-  pages = {10--12},
-  number = {3},
-  address = {Piscataway, NJ, USA},
+@Article{1373163,
+  author     = {Elizabeth Churchill and Les Nelson and Diana K. Smetters},
+  title      = {Useful Computer Security},
+  doi        = {http://dx.doi.org/10.1109/MIC.2008.67},
+  issn       = {1089-7801},
+  number     = {3},
+  pages      = {10--12},
+  volume     = {12},
+  address    = {Piscataway, NJ, USA},
   bdsk-url-1 = {http://dx.doi.org/10.1109/MIC.2008.67},
-  doi = {http://dx.doi.org/10.1109/MIC.2008.67},
-  issn = {1089-7801},
-  publisher = {IEEE Educational Activities Department}
+  groups     = {TestOne},
+  journal    = {IEEE Internet Computing},
+  publisher  = {IEEE Educational Activities Department},
+  year       = {2008},
 }
 
 @Article{820136,
@@ -136,17 +139,17 @@ @INPROCEEDINGS{1143122
 
 @InProceedings{1233448,
   author     = {Cheryl Hinds and Chinedu Ekwueme},
-  title      = {Increasing security and usability of computer systems with graphical passwords},
   booktitle  = {ACM-SE 45: Proceedings of the 45th annual southeast regional conference},
-  publisher  = {ACM},
-  location   = {Winston-Salem, North Carolina},
+  title      = {Increasing security and usability of computer systems with graphical passwords},
+  doi        = {http://doi.acm.org/10.1145/1233341.1233448},
   isbn       = {978-1-59593-629-5},
+  location   = {Winston-Salem, North Carolina},
   pages      = {529--530},
-  doi        = {http://doi.acm.org/10.1145/1233341.1233448},
-  abstract   = {Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec id bibendum magna, ac tristique nulla. Aliquam ut vulputate velit, ac vulputate leo. Sed malesuada nisi eget lacus rhoncus, et feugiat libero suscipit. Sed vitae ultricies diam. Phasellus arcu tellus, scelerisque a lorem quis, molestie fermentum mi. Morbi nibh ante, sodales at nisl nec, tincidunt dapibus leo. Praesent auctor egestas commodo. Cras elit erat, accumsan a felis at, malesuada iaculis risus. Nunc in tincidunt metus. },
+  publisher  = {ACM},
+  abstract   = {Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec id bibendum magna, ac tristique nulla. Aliquam ut vulputate velit, ac vulputate leo. Sed malesuada nisi eget lacus rhoncus, et feugiat libero suscipit. Sed vitae ultricies diam. Phasellus arcu tellus, scelerisque a lorem quis, molestie fermentum mi. Morbi nibh ante, sodales at nisl nec, tincidunt dapibus leo. Praesent auctor egestas commodo. Cras elit erat, accumsan a felis at, malesuada iaculis risus. Nunc in tincidunt metus.},
   address    = {New York, NY, USA},
   bdsk-url-1 = {http://doi.acm.org/10.1145/1233341.1233448},
-  groups     = {StaticGroup},
+  groups     = {StaticGroup, TestOneSubOne},
   year       = {2007},
 }
 
@@ -303,8 +306,12 @@ @Comment{jabref-meta:
 @Comment{jabref-meta: grouping:
 0 AllEntriesGroup:;
 1 StaticGroup:StaticGroup\;0\;1\;0x6d74baff\;\;A test static group\;;
-1 KeywordGroup:DynamicGroup\;0\;author\;Churchill\;0\;0\;1\;0x5eba7dff\;\;\;;
-1 AutomaticPersonsGroup:Automatic group (Authors)\;0\;author\;1\;\;\;Automatic group for all authors\;;
+1 KeywordGroup:DynamicGroup\;0\;author\;Churchill\;0\;0\;0\;0x5eba7dff\;\;\;;
+1 AutomaticPersonsGroup:Automatic group (Authors)\;0\;author\;0\;\;\;Automatic group for all authors\;;
+1 StaticGroup:TestOne\;0\;1\;0x311b92ff\;\;\;;
+2 StaticGroup:TestOneSubOne\;0\;1\;0xff7043ff\;\;\;;
+2 StaticGroup:TestOneSubTwo\;0\;1\;0x00bcd4ff\;\;\;;
+1 StaticGroup:TestTwo\;0\;0\;0x5d4037ff\;\;\;;
 }
 
 @Comment{jabref-meta: keypattern_article:articleTest;}
