Removes non-compact rank symbols in favor of compact rank

CHANGELOG

@@ -1,4 +1,5 @@
 [master]
+    - Removes non-compact rank symbols in favor of compact rank
     - All duplicate whitespaces / tabs / newlines are now removed from non-multiline fields
     - Fixed a bug in the IEEEXploreFetcher
     - Replaced some deprecated DefaultFormBuilder with FormBuilder

src/main/java/net/sf/jabref/JabRefPreferences.java

@@ -656,7 +656,6 @@ private JabRefPreferences() {
         defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_PRIORITY, SpecialFieldsUtils.PREF_SHOWCOLUMN_PRIORITY_DEFAULT);
         defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY, SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY_DEFAULT);
         defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING, SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING_DEFAULT);
-        defaults.put(SpecialFieldsUtils.PREF_RANKING_COMPACT, SpecialFieldsUtils.PREF_RANKING_COMPACT_DEFAULT);
         defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_RELEVANCE, SpecialFieldsUtils.PREF_SHOWCOLUMN_RELEVANCE_DEFAULT);
         defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_PRINTED, SpecialFieldsUtils.PREF_SHOWCOLUMN_PRINTED_DEFAULT);
         defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_READ, SpecialFieldsUtils.PREF_SHOWCOLUMN_READ_DEFAULT);

src/main/java/net/sf/jabref/gui/GUIGlobals.java

@@ -155,7 +155,6 @@ public class GUIGlobals {
 
     public static final int DEFAULT_FIELD_LENGTH = 100;
     public static final int NUMBER_COL_LENGTH = 32;
-    public static final int WIDTH_ICON_COL_RANKING = 35; // Width of Ranking Icon Column
     public static final int WIDTH_ICON_COL = 19;
 
     // Column widths for export customization dialog table:

src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java

@@ -821,20 +821,10 @@ private void setWidths() {
         cm.getColumn(0).setMinWidth(55);
         cm.getColumn(0).setMaxWidth(55);
         for (int i = 1; i < PAD; i++) {
-            // Check if the Column is a RankingColumn
-            // If this is the case, set a certain Column-width,
-            // because the RankingIconColumn needs some more width
-            if (frame.basePanel().tableFormat.isRankingColumn(i)) {
-                // Lock the width of ranking icon column.
-                cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-                cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-                cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-            } else {
-                // Lock the width of icon columns.
-                cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
-                cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
-                cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
-            }
+            // Lock the width of icon columns.
+            cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
+            cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
+            cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
         }
 
         for (int i = 0; i < fields.length; i++) {

src/main/java/net/sf/jabref/gui/MainTable.java

@@ -323,21 +323,10 @@ private void setWidths() {
         TableColumnModel cm = getColumnModel();
         cm.getColumn(0).setPreferredWidth(ncWidth);
         for (int i = 1; i < tableFormat.padleft; i++) {
-
-            // Check if the Column is an extended RankingColumn (and not a compact-ranking column) 
-            // If this is the case, set a certain Column-width,
-            // because the RankingIconColumn needs some more width
-            if (tableFormat.isRankingColumn(i) && !Globals.prefs.getBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT)) {
-                // Lock the width of ranking icon column.
-                cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-                cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-                cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-            } else {
-                // Lock the width of icon columns.
-                cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
-                cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
-                cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
-            }
+            // Lock the width of icon columns.
+            cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
+            cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
+            cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
 
         }
         for (int i = tableFormat.padleft; i < getModel().getColumnCount(); i++) {

src/main/java/net/sf/jabref/gui/SearchResultsDialog.java

@@ -255,20 +255,9 @@ private void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparat
     private void setWidths() {
         TableColumnModel cm = entryTable.getColumnModel();
         for (int i = 0; i < PAD; i++) {
-            // Check if the Column is a RankingColumn
-            // If this is the case, set a certain Column-width,
-            // because the RankingIconColumn needs some more width
-            if (frame.basePanel().tableFormat.isRankingColumn(i)) {
-                // Lock the width of ranking icon column.
-                cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-                cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-                cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
-            } else {
-                // Lock the width of icon columns.
-                cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
-                cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
-                cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
-            }
+            cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
+            cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
+            cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
         }
 
         for (int i = 0; i < fields.length; i++) {

src/main/java/net/sf/jabref/gui/preftabs/TableColumnsTab.java

@@ -71,7 +71,6 @@ class TableColumnsTab extends JPanel implements PrefsTab {
     /*** begin: special fields ***/
     private final JCheckBox specialFieldsEnabled;
     private JCheckBox rankingColumn;
-    private JCheckBox compactRankingColumn;
     private JCheckBox qualityColumn;
     private JCheckBox priorityColumn;
     private JCheckBox relevanceColumn;
@@ -81,7 +80,6 @@ class TableColumnsTab extends JPanel implements PrefsTab {
     private JRadioButton writeSpecialFields;
     private boolean oldSpecialFieldsEnabled;
     private boolean oldRankingColumn;
-    private boolean oldCompcatRankingColumn;
     private boolean oldQualityColumn;
     private boolean oldPriorityColumn;
     private boolean oldRelevanceColumn;
@@ -295,7 +293,6 @@ public void stateChanged(ChangeEvent arg0) {
             public void stateChanged(ChangeEvent event) {
                 boolean isEnabled = specialFieldsEnabled.isSelected();
                 rankingColumn.setEnabled(isEnabled);
-                compactRankingColumn.setEnabled(isEnabled && rankingColumn.isSelected());
                 qualityColumn.setEnabled(isEnabled);
                 priorityColumn.setEnabled(isEnabled);
                 relevanceColumn.setEnabled(isEnabled);
@@ -306,14 +303,6 @@ public void stateChanged(ChangeEvent event) {
             }
         });
         rankingColumn = new JCheckBox(Localization.lang("Show rank"));
-        rankingColumn.addChangeListener(new ChangeListener() {
-
-            @Override
-            public void stateChanged(ChangeEvent event) {
-                compactRankingColumn.setEnabled(rankingColumn.isSelected());
-            }
-        });
-        compactRankingColumn = new JCheckBox(Localization.lang("Compact rank"));
         qualityColumn = new JCheckBox(Localization.lang("Show quality"));
         priorityColumn = new JCheckBox(Localization.lang("Show priority"));
         relevanceColumn = new JCheckBox(Localization.lang("Show relevance"));
@@ -339,12 +328,11 @@ public void stateChanged(ChangeEvent event) {
 
         specialTableColumnsBuilder.add(specialFieldsEnabled, cc.xyw(1, 1, 3));
         specialTableColumnsBuilder.add(rankingColumn, cc.xyw(2, 2, 2));
-        specialTableColumnsBuilder.add(compactRankingColumn, cc.xy(3, 3));
-        specialTableColumnsBuilder.add(relevanceColumn, cc.xyw(2, 4, 2));
-        specialTableColumnsBuilder.add(qualityColumn, cc.xyw(2, 5, 2));
-        specialTableColumnsBuilder.add(priorityColumn, cc.xyw(2, 6, 2));
-        specialTableColumnsBuilder.add(printedColumn, cc.xyw(2, 7, 2));
-        specialTableColumnsBuilder.add(readStatusColumn, cc.xyw(2, 8, 2));
+        specialTableColumnsBuilder.add(relevanceColumn, cc.xyw(2, 3, 2));
+        specialTableColumnsBuilder.add(qualityColumn, cc.xyw(2, 4, 2));
+        specialTableColumnsBuilder.add(priorityColumn, cc.xyw(2, 5, 2));
+        specialTableColumnsBuilder.add(printedColumn, cc.xyw(2, 6, 2));
+        specialTableColumnsBuilder.add(readStatusColumn, cc.xyw(2, 7, 2));
         specialTableColumnsBuilder.add(syncKeywords, cc.xyw(2, 10, 2));
         specialTableColumnsBuilder.add(writeSpecialFields, cc.xyw(2, 11, 2));
         specialTableColumnsBuilder.add(showOneLetterHeadingForIconColumns, cc.xyw(1, 12, 4));
@@ -420,9 +408,6 @@ public void setValues() {
         oldRankingColumn = prefs.getBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING);
         rankingColumn.setSelected(oldRankingColumn);
 
-        oldCompcatRankingColumn = prefs.getBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT);
-        compactRankingColumn.setSelected(oldCompcatRankingColumn);
-
         oldQualityColumn = prefs.getBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY);
         qualityColumn.setSelected(oldQualityColumn);
 
@@ -731,7 +716,6 @@ public void storeSettings() {
 
         boolean newSpecialFieldsEnabled = specialFieldsEnabled.isSelected();
         boolean newRankingColumn = rankingColumn.isSelected();
-        boolean newCompactRankingColumn = compactRankingColumn.isSelected();
         boolean newQualityColumn = qualityColumn.isSelected();
         boolean newPriorityColumn = priorityColumn.isSelected();
         boolean newRelevanceColumn = relevanceColumn.isSelected();
@@ -743,7 +727,6 @@ public void storeSettings() {
         boolean restartRequired;
         restartRequired = oldSpecialFieldsEnabled != newSpecialFieldsEnabled ||
                 oldRankingColumn != newRankingColumn ||
-                oldCompcatRankingColumn != newCompactRankingColumn ||
                 oldQualityColumn != newQualityColumn ||
                 oldPriorityColumn != newPriorityColumn ||
                 oldRelevanceColumn != newRelevanceColumn ||
@@ -765,7 +748,6 @@ public void storeSettings() {
         if (restartRequired) {
             prefs.putBoolean(SpecialFieldsUtils.PREF_SPECIALFIELDSENABLED, newSpecialFieldsEnabled);
             prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING, newRankingColumn);
-            prefs.putBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT, newCompactRankingColumn);
             prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_PRIORITY, newPriorityColumn);
             prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY, newQualityColumn);
             prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_RELEVANCE, newRelevanceColumn);

src/main/java/net/sf/jabref/specialfields/Rank.java

@@ -16,20 +16,41 @@
 package net.sf.jabref.specialfields;
 
 import net.sf.jabref.Globals;
+import net.sf.jabref.gui.IconTheme;
 import net.sf.jabref.logic.l10n.Localization;
 
-public abstract class Rank extends SpecialField {
+import javax.swing.*;
+import java.util.ArrayList;
 
-    Rank() {
+public class Rank extends SpecialField {
+
+    private static Rank INSTANCE;
+
+    private Rank() {
         TEXT_DONE_PATTERN = "Set rank to '%0' for %1 entries";
+
+        ArrayList<SpecialFieldValue> values = new ArrayList<SpecialFieldValue>();
+        //lab.setName("i");
+        values.add(new SpecialFieldValue(this, null, "clearRank", Localization.lang("Clear rank"), null, Localization.lang("No rank information")));
+        // DO NOT TRANSLATE "rank1" etc. as this makes the .bib files non portable
+        values.add(new SpecialFieldValue(this, "rank1", "setRank1", Localization.lang("Set rank to one star"), IconTheme.getImage("rank1"), Localization.lang("One star")));
+        values.add(new SpecialFieldValue(this, "rank2", "setRank2", Localization.lang("Set rank to two stars"), IconTheme.getImage("rank2"), Localization.lang("Two stars")));
+        values.add(new SpecialFieldValue(this, "rank3", "setRank3", Localization.lang("Set rank to three stars"), IconTheme.getImage("rank3"), Localization.lang("Three stars")));
+        values.add(new SpecialFieldValue(this, "rank4", "setRank4", Localization.lang("Set rank to four stars"), IconTheme.getImage("rank4"), Localization.lang("Four stars")));
+        values.add(new SpecialFieldValue(this, "rank5", "setRank5", Localization.lang("Set rank to five stars"), IconTheme.getImage("rank5"), Localization.lang("Five stars")));
+        this.setValues(values);
     }
 
     public static Rank getInstance() {
-        if (Globals.prefs.getBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT)) {
-            return RankCompact.getInstance();
-        } else {
-            return RankExtended.getInstance();
+        if (Rank.INSTANCE == null) {
+            Rank.INSTANCE = new Rank();
         }
+        return Rank.INSTANCE;
+    }
+
+    @Override
+    public Icon getRepresentingIcon() {
+        return IconTheme.getImage("ranking");
     }
 
     @Override

src/main/java/net/sf/jabref/specialfields/SpecialFieldsUtils.java

@@ -39,9 +39,6 @@ public class SpecialFieldsUtils {
     public static final String PREF_SHOWCOLUMN_RANKING = "showRankingColumn";
     public static final Boolean PREF_SHOWCOLUMN_RANKING_DEFAULT = Boolean.TRUE;
 
-    public static final String PREF_RANKING_COMPACT = "compactRankingColumn";
-    public static final Boolean PREF_RANKING_COMPACT_DEFAULT = Boolean.TRUE;
-
     public static final String PREF_SHOWCOLUMN_PRIORITY = "showPriorityColumn";
     public static final Boolean PREF_SHOWCOLUMN_PRIORITY_DEFAULT = Boolean.FALSE;
 

src/main/resources/images/crystal_16/Icons.properties

@@ -72,11 +72,6 @@ rank2=rank2.png
 rank3=rank3.png
 rank4=rank4.png
 rank5=rank5.png
-rankc1=rankc1.png
-rankc2=rankc2.png
-rankc3=rankc3.png
-rankc4=rankc4.png
-rankc5=rankc5.png
 ranking=ranking.png
 readStatusRead=read.png
 readStatusSkimmed=readskimmed.png

src/main/resources/l10n/JabRef_da.properties

@@ -1503,7 +1503,6 @@ Bibtex_key_patterns=
 Changed_special_field_settings=
 Clear_priority=
 Clear_rank=
-Compact_rank=
 Convert_1st,_2nd,_..._to_real_superscripts=
 Dropped_comment_from_database=
 Enable_PDF_preview=

src/main/resources/l10n/JabRef_de.properties

@@ -2259,7 +2259,6 @@ Bibtex_key_patterns=BibTeX-Key-Muster
 Changed_special_field_settings=Einstellungen_f\u00fcr_spezielle_Felder_ge\u00e4ndert
 Clear_priority=Priorit\u00e4t_aufheben
 Clear_rank=Rang_aufheben
-Compact_rank=Kompakter_Rang
 Convert_1st,_2nd,_..._to_real_superscripts=1st,_2nd,_..._in_hochgestellte_Buchstaben_konvertieren
 Dropped_comment_from_database=Kommentar_aus_Datei_gel\u00f6scht
 Enable_PDF_preview=PDF-Vorschau_aktivieren

src/main/resources/l10n/JabRef_en.properties

@@ -2246,7 +2246,6 @@ Bibtex_key_patterns=Bibtex_key_patterns
 Changed_special_field_settings=Changed_special_field_settings
 Clear_priority=Clear_priority
 Clear_rank=Clear_rank
-Compact_rank=Compact_rank
 Convert_1st,_2nd,_..._to_real_superscripts=Convert_1st,_2nd,_..._to_real_superscripts
 Dropped_comment_from_database=Dropped_comment_from_database
 Enable_PDF_preview=Enable_PDF_preview

src/main/resources/l10n/JabRef_es.properties

@@ -1403,7 +1403,6 @@ Bibtex_key_patterns=Patrones_de_clave_BibTeX
 Changed_special_field_settings=Ajustes_de_campos_especiales_cambiados
 Clear_priority=Limpiar_prioridad
 Clear_rank=Limpiar_rango
-Compact_rank=Compactar_rango
 Convert_1st,_2nd,_..._to_real_superscripts=Convertir_1st,_2nd,_..._a_super\u00edndices
 Dropped_comment_from_database=Eliminado_comentario_de_la_base_de_datos
 Enable_PDF_preview=Habilitar_vista_previa_de_PDF

src/main/resources/l10n/JabRef_fa.properties

@@ -2244,7 +2244,6 @@ Bibtex_key_patterns=
 Changed_special_field_settings=
 Clear_priority=
 Clear_rank=
-Compact_rank=
 Convert_1st,_2nd,_..._to_real_superscripts=
 Dropped_comment_from_database=
 Enable_PDF_preview=

src/main/resources/l10n/JabRef_fr.properties

@@ -1442,7 +1442,6 @@ Bibtex_key_patterns=Mod\u00e8les_de_clef_BibTeX
 Changed_special_field_settings=Param\u00e8tres_de_champs_sp\u00e9ciaux_modifi\u00e9s
 Clear_priority=Effacer_la_priorit\u00e9
 Clear_rank=Effacer_le_rang
-Compact_rank=Compacter_le_rang
 Convert_1st,_2nd,_..._to_real_superscripts=Convertir_1er,__2nd,_..._en_vrais_exposants
 Dropped_comment_from_database=Commentaires_supprim\u00e9s_de_la_base
 Enable_PDF_preview=Autoriser_la_pr\u00e9visualisation_des_PDF