11package org .jabref .gui .maintable ;
22
3+ import java .util .EnumSet ;
34import java .util .Objects ;
45
56import javafx .beans .property .DoubleProperty ;
910import javafx .beans .property .SimpleObjectProperty ;
1011import javafx .beans .property .SimpleStringProperty ;
1112import javafx .beans .property .StringProperty ;
13+ import javafx .scene .control .TableColumn ;
1214
1315import org .jabref .gui .util .FieldsUtil ;
1416import org .jabref .logic .l10n .Localization ;
@@ -35,6 +37,8 @@ public enum Type {
3537 NORMALFIELD ("field" ),
3638 SPECIALFIELD ("special" , Localization .lang ("Special" ));
3739
40+ public static final EnumSet <Type > ICON_COLUMNS = EnumSet .of (EXTRAFILE ,FILES ,GROUPS ,LINKED_IDENTIFIER );
41+
3842 private String name ;
3943 private String displayName ;
4044
@@ -67,35 +71,54 @@ public static Type fromString(String text) {
6771 }
6872 }
6973
70- private final ObjectProperty <Type > typeProperty ;
71- private final StringProperty qualifierProperty ;
72- private final DoubleProperty widthProperty ;
74+ private final ObjectProperty <Type > typeProperty = new SimpleObjectProperty <>();
75+ private final StringProperty qualifierProperty = new SimpleStringProperty ();
76+ private final DoubleProperty widthProperty = new SimpleDoubleProperty ();
77+ private final ObjectProperty <TableColumn .SortType > sortTypeProperty = new SimpleObjectProperty <>();
7378
7479 /**
7580 * This is used by the preferences dialog, to initialize available columns the user can add to the table.
7681 *
77- * @param type the {@code MainTableColumnModel.Type} of the column, e.g. "NORMALFIELD" or "GROUPS "
82+ * @param type the {@code MainTableColumnModel.Type} of the column, e.g. "NORMALFIELD" or "EXTRAFILE "
7883 * @param qualifier the stored qualifier of the column, e.g. "author/editor"
7984 */
80- public MainTableColumnModel (Type type , String qualifier , double width ) {
85+ public MainTableColumnModel (Type type , String qualifier ) {
8186 Objects .requireNonNull (type );
82- typeProperty = new SimpleObjectProperty <>(type );
83- qualifierProperty = new SimpleStringProperty (qualifier );
84- widthProperty = new SimpleDoubleProperty (width );
85- }
87+ Objects .requireNonNull (qualifier );
8688
87- public MainTableColumnModel ( Type type , String qualifier ) {
88- this ( type , qualifier , ColumnPreferences . DEFAULT_WIDTH );
89- }
89+ this . typeProperty . setValue ( type );
90+ this . qualifierProperty . setValue ( qualifier );
91+ this . sortTypeProperty . setValue ( TableColumn . SortType . ASCENDING );
9092
91- public MainTableColumnModel (Type type , double width ) {
92- this (type , "" , width );
93+ if (Type .ICON_COLUMNS .contains (type )) {
94+ this .widthProperty .setValue (ColumnPreferences .ICON_COLUMN_WIDTH );
95+ } else {
96+ this .widthProperty .setValue (ColumnPreferences .DEFAULT_COLUMN_WIDTH );
97+ }
9398 }
9499
100+ /**
101+ * This is used by the preferences dialog, to initialize available basic icon columns, the user can add to the table.
102+ *
103+ * @param type the {@code MainTableColumnModel.Type} of the column, e.g. "GROUPS" or "LINKED_IDENTIFIER"
104+ */
95105 public MainTableColumnModel (Type type ) {
96106 this (type , "" );
97107 }
98108
109+ /**
110+ * This is used by the preference migrations.
111+ *
112+ * @param type the {@code MainTableColumnModel.Type} of the column, e.g. "NORMALFIELD" or "GROUPS"
113+ * @param qualifier the stored qualifier of the column, e.g. "author/editor"
114+ * @param width the stored width of the column
115+ */
116+ public MainTableColumnModel (Type type , String qualifier , double width ) {
117+ this (type , qualifier );
118+
119+ this .widthProperty .setValue (width );
120+ }
121+
99122 public Type getType () { return typeProperty .getValue (); }
100123
101124 public String getQualifier () { return qualifierProperty .getValue (); }
@@ -109,10 +132,7 @@ public String getName() {
109132 }
110133
111134 public String getDisplayName () {
112- if ((typeProperty .getValue () == Type .GROUPS
113- || typeProperty .getValue () == Type .FILES
114- || typeProperty .getValue () == Type .LINKED_IDENTIFIER )
115- && qualifierProperty .getValue ().isBlank ()) {
135+ if (Type .ICON_COLUMNS .contains (typeProperty .getValue ()) && qualifierProperty .getValue ().isBlank ()) {
116136 return typeProperty .getValue ().getDisplayName ();
117137 } else {
118138 return FieldsUtil .getNameWithType (FieldFactory .parseField (qualifierProperty .getValue ()));
@@ -121,12 +141,14 @@ public String getDisplayName() {
121141
122142 public StringProperty nameProperty () { return new ReadOnlyStringWrapper (getDisplayName ()); }
123143
124- public double getWidth () {
125- return widthProperty .get ();
126- }
144+ public double getWidth () { return widthProperty .getValue (); }
127145
128146 public DoubleProperty widthProperty () { return widthProperty ; }
129147
148+ public TableColumn .SortType getSortType () { return sortTypeProperty .getValue (); }
149+
150+ public ObjectProperty <TableColumn .SortType > sortTypeProperty () { return sortTypeProperty ; }
151+
130152 public boolean equals (Object o ) {
131153 if (this == o ) {
132154 return true ;
@@ -149,23 +171,11 @@ public int hashCode() {
149171 }
150172
151173 /**
152- * This is used by JabRefPreferences, to create a new ColumnModel out ouf the stored preferences.
174+ * This creates a new {@code MainTableColumnModel} out of a given string
153175 *
154- * @param rawColumnName the stored name of the column, e.g. "field:author"
155- * @param width the stored width of the column
156- */
157- public static MainTableColumnModel parse (String rawColumnName , Double width ) {
158- MainTableColumnModel columnModel = parse (rawColumnName );
159-
160- Objects .requireNonNull (width );
161- columnModel .widthProperty ().setValue (width );
162- return columnModel ;
163- }
164-
165- /**
166- * This is used by the preferences dialog, to allow the user to type in a field he wants to add to the table.
176+ * @param rawColumnName the name of the column, e.g. "field:author", or "author"
167177 *
168- * @param rawColumnName the stored name of the column, e.g. "field:author", or "author"
178+ * @return A new {@code MainTableColumnModel}
169179 */
170180 public static MainTableColumnModel parse (String rawColumnName ) {
171181 Objects .requireNonNull (rawColumnName );
@@ -174,7 +184,9 @@ public static MainTableColumnModel parse(String rawColumnName) {
174184 Type type = Type .fromString (splittedName [0 ]);
175185 String qualifier = "" ;
176186
177- if (type == Type .NORMALFIELD || type == Type .SPECIALFIELD || type == Type .EXTRAFILE ) {
187+ if (type == Type .NORMALFIELD
188+ || type == Type .SPECIALFIELD
189+ || type == Type .EXTRAFILE ) {
178190 if (splittedName .length == 1 ) {
179191 qualifier = splittedName [0 ]; // By default the rawColumnName is parsed as NORMALFIELD
180192 } else {
0 commit comments