fix ignore version (JabRef#2055)

zesaro · Oct 27, 2016 · c5d6b32 · c5d6b32
1 parent 25f657c
commit c5d6b32
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Prohibit more than one connections to the same shared database.
 
 ### Fixed
+- Fixed [#2054](https://github.com/JabRef/jabref/issues/2054): Ignoring a new version now works as expected
 - Fixed selecting an entry out of multiple duplicates
 - Fixed [#617](https://github.com/JabRef/jabref/issues/617): `Enter` in global search opens the selected entry & `Enter` in search dialog window opens the selected entry
 - Entries in the SearchResultPanel will be shown correctly (Latex to Unicode)

diff --git a/src/main/java/net/sf/jabref/JabRefGUI.java b/src/main/java/net/sf/jabref/JabRefGUI.java
@@ -32,7 +32,6 @@
 import net.sf.jabref.logic.util.Version;
 import net.sf.jabref.migrations.PreferencesMigrations;
 import net.sf.jabref.preferences.JabRefPreferences;
-import net.sf.jabref.preferences.VersionPreferences;
 import net.sf.jabref.shared.exception.DatabaseNotSupportedException;
 
 import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
@@ -69,7 +68,7 @@ public JabRefGUI(List<ParserResult> argsDatabases, boolean isBlank) {
     }
 
     public static void checkForNewVersion(boolean manualExecution) {
-        Version toBeIgnored = new VersionPreferences(Globals.prefs).getIgnoredVersion();
+        Version toBeIgnored = Globals.prefs.getVersionPreferences().getIgnoredVersion();
         Version currentVersion = Globals.BUILD_INFO.getVersion();
         new VersionWorker(JabRefGUI.getMainFrame(), manualExecution, currentVersion, toBeIgnored).execute();
     }

diff --git a/src/main/java/net/sf/jabref/gui/help/NewVersionDialog.java b/src/main/java/net/sf/jabref/gui/help/NewVersionDialog.java
@@ -21,7 +21,7 @@
 
 public class NewVersionDialog extends JDialog {
 
-    public NewVersionDialog(JFrame frame, Version currentVersion, Version latestVersion, Version toBeIgnored) {
+    public NewVersionDialog(JFrame frame, Version currentVersion, Version latestVersion) {
         super(frame);
         setTitle(Localization.lang("New version available"));
 
@@ -41,7 +41,7 @@ public void mouseClicked(MouseEvent e) {
 
         JButton btnIgnoreUpdate = new JButton(Localization.lang("Ignore this update"));
         btnIgnoreUpdate.addActionListener(e -> {
-            new VersionPreferences(Globals.prefs).setAsIgnoredVersion(toBeIgnored);
+            Globals.prefs.storeVersionPreferences(new VersionPreferences(latestVersion));
             dispose();
         });
 

diff --git a/src/main/java/net/sf/jabref/gui/worker/VersionWorker.java b/src/main/java/net/sf/jabref/gui/worker/VersionWorker.java
@@ -68,7 +68,7 @@ public void done(){
 
             boolean newer = latestVersion.isNewerThan(installedVersion);
             if (newer){
-                new NewVersionDialog(this.mainFrame, installedVersion, latestVersion, toBeIgnored);
+                new NewVersionDialog(this.mainFrame, installedVersion, latestVersion);
                 return;
             }
 

diff --git a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
@@ -72,6 +72,7 @@
 import net.sf.jabref.logic.remote.RemotePreferences;
 import net.sf.jabref.logic.util.OS;
 import net.sf.jabref.logic.util.UpdateFieldPreferences;
+import net.sf.jabref.logic.util.Version;
 import net.sf.jabref.logic.util.io.FileHistory;
 import net.sf.jabref.logic.xmp.XMPPreferences;
 import net.sf.jabref.model.bibtexkeypattern.AbstractBibtexKeyPattern;
@@ -1452,6 +1453,16 @@ public FileLinkPreferences getFileLinkPreferences() {
                 fileDirForDatabase);
     }
 
+    public JabRefPreferences storeVersionPreferences(VersionPreferences versionPreferences) {
+        put(VERSION_IGNORED_UPDATE, versionPreferences.getIgnoredVersion().toString());
+        return this;
+    }
+
+    public VersionPreferences getVersionPreferences() {
+        Version ignoredVersion = new Version(get(VERSION_IGNORED_UPDATE));
+        return new VersionPreferences(ignoredVersion);
+    }
+
     public JabRefPreferences storePreviewPreferences(PreviewPreferences previewPreferences) {
         putInt(CYCLE_PREVIEW_POS, previewPreferences.getPreviewCyclePosition());
         putStringList(CYCLE_PREVIEW, previewPreferences.getPreviewCycle());

diff --git a/src/main/java/net/sf/jabref/preferences/VersionPreferences.java b/src/main/java/net/sf/jabref/preferences/VersionPreferences.java
@@ -2,22 +2,17 @@
 
 import net.sf.jabref.logic.util.Version;
 
-
 public class VersionPreferences {
 
-    private final JabRefPreferences preferences;
-
+    private final Version ignoredVersion;
 
-    public VersionPreferences(JabRefPreferences preferences) {
-        this.preferences = preferences;
-    }
 
-    public void setAsIgnoredVersion(Version version) {
-        preferences.put(JabRefPreferences.VERSION_IGNORED_UPDATE, version.toString());
+    public VersionPreferences(Version ignoredVersion) {
+        this.ignoredVersion = ignoredVersion;
     }
 
     public Version getIgnoredVersion() {
-        return new Version(preferences.get(JabRefPreferences.VERSION_IGNORED_UPDATE));
+        return ignoredVersion;
     }
 
 }