Remove redundant variable in SaveOrderConfig

JabRef · Feb 19, 2016 · 54f7d56 · 54f7d56
1 parent 7e51c23
commit 54f7d56
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/main/java/net/sf/jabref/gui/databaseProperties/DatabasePropertiesDialog.java b/src/main/java/net/sf/jabref/gui/databaseProperties/DatabasePropertiesDialog.java
@@ -214,7 +214,6 @@ private void setValues() {
                 saveInOriginalOrder.setSelected(true);
                 selected = false;
             } else {
-                assert (saveOrderConfig.saveInSpecifiedOrder);
                 saveInSpecifiedOrder.setSelected(true);
                 selected = true;
             }

diff --git a/src/main/java/net/sf/jabref/logic/config/SaveOrderConfig.java b/src/main/java/net/sf/jabref/logic/config/SaveOrderConfig.java
@@ -15,7 +15,6 @@
 public class SaveOrderConfig {
 
     public boolean saveInOriginalOrder;
-    public boolean saveInSpecifiedOrder;
 
     // quick hack for outside modifications
     public final SortCriterion[] sortCriteria = new SortCriterion[3];
@@ -61,13 +60,12 @@ public boolean equals(Object o) {
                 sortCriteria[2].equals(that.sortCriteria[2]);
 
         return Objects.equals(saveInOriginalOrder, that.saveInOriginalOrder) &&
-                Objects.equals(saveInSpecifiedOrder, that.saveInSpecifiedOrder) &&
                 sortCriteriaEquals;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(saveInOriginalOrder, saveInSpecifiedOrder, Arrays.hashCode(sortCriteria));
+        return Objects.hash(saveInOriginalOrder, Arrays.hashCode(sortCriteria));
     }
 
     public SaveOrderConfig() {
@@ -112,16 +110,10 @@ public SaveOrderConfig(List<String> data) {
 
     public void setSaveInOriginalOrder() {
         this.saveInOriginalOrder = true;
-        this.saveInSpecifiedOrder = false;
     }
 
     public void setSaveInSpecifiedOrder() {
         this.saveInOriginalOrder = false;
-        this.saveInSpecifiedOrder = true;
-    }
-
-    public SortCriterion[] getSortCriteria() {
-        return sortCriteria;
     }
 
     public static SaveOrderConfig loadExportSaveOrderFromPreferences(JabRefPreferences preferences) {
@@ -166,7 +158,6 @@ public Vector<String> getVector() {
         if (saveInOriginalOrder) {
             res.insertElementAt("original", 0);
         } else {
-            assert saveInSpecifiedOrder;
             res.insertElementAt("specified", 0);
         }