Merge remote-tracking branch 'origin/master' into cryptedpdfs

JabRef · Mar 11, 2016 · 5c68c36 · 5c68c36
2 parents 91c8af0 + 2a80e9c
commit 5c68c36
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed [#649](https://github.com/JabRef/jabref/issues/649): Key bindings are now working in the preview panel
 - Fixed [#410](https://github.com/JabRef/jabref/issues/410): Find unlinked files no longer freezes when extracting entry from PDF content
 - Fixed [#935](https://github.com/JabRef/jabref/issues/935): PDFs, which are readable, but carry a protection for editing, are treated by the XMP parser and the importer generating a BibTeX entry based on the content.
+- Fixed [#936](https://github.com/JabRef/jabref/issues/936): Preview panel is now updated when an entry is cut/deleted
 
 ### Removed
 - Fixed [#627](https://github.com/JabRef/jabref/issues/627): The pdf field is removed from the export formats, use the file field

diff --git a/src/main/java/net/sf/jabref/gui/BasePanel.java b/src/main/java/net/sf/jabref/gui/BasePanel.java
@@ -346,6 +346,9 @@ private void setupActions() {
                 ce.end();
                 undoManager.addEdit(ce);
                 markBaseChanged();
+
+                //no entry is selected anymore, thus hide the preview panel
+                hideBottomComponent();
             }
         });
 
@@ -371,6 +374,9 @@ private void setupActions() {
                     ce.end();
                     undoManager.addEdit(ce);
                 }
+
+                //no entry is selected anymore, thus hide the preview panel
+                hideBottomComponent();
             }
         });
 

diff --git a/src/main/resources/help/About.html b/src/main/resources/help/About.html
diff --git a/src/test/java/net/sf/jabref/bibtex/BibtexEntryAssert.java b/src/test/java/net/sf/jabref/bibtex/BibtexEntryAssert.java
@@ -77,7 +77,7 @@ public static void assertEquals(List<BibEntry> shouldBeIs, List<BibEntry> actual
     /**
      * Compares to BibTeX entries using their canonical representation
      */
-    private static void assertEquals(BibEntry shouldBeEntry, BibEntry entry) {
+    public static void assertEquals(BibEntry shouldBeEntry, BibEntry entry) {
         // use the canonical string representation to compare the entries
         String shouldBeEntryRepresentation = CanonicalBibtexEntry.getCanonicalRepresentation(shouldBeEntry);
         String entryRepresentation = CanonicalBibtexEntry.getCanonicalRepresentation(entry);