Fix JabRef#171: Dragging an entry to a group preserves scrolling

tobiasdiez · May 11, 2016 · 49ab9ac · 49ab9ac
1 parent 916bbea
commit 49ab9ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,7 +45,8 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed [#1364](https://github.com/JabRef/jabref/issues/1364): Windows: install to LOCALAPPDATA directory for non-admin users
 - Fixed [#1365](https://github.com/JabRef/jabref/issues/1365): Default label pattern back to "[auth][year]"
 - Fixed [#796](https://github.com/JabRef/jabref/issues/796): Undoing more than one entry at the same time is now working
-- Fixed [#1122](https://github.com/JabRef/jabref/issues/1122): Group view is immediately updated after adding an entry to a group 
+- Fixed [#1122](https://github.com/JabRef/jabref/issues/1122): Group view is immediately updated after adding an entry to a group
+- Fixed [#171](https://github.com/JabRef/jabref/issues/171): Dragging an entry to a group preserves scrolling
 
 ### Removed
 - Removed possibility to export entries/databases to an `.sql` file, as the logic cannot easily use the correct escape logic

diff --git a/src/main/java/net/sf/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/net/sf/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -338,7 +338,7 @@ public void changeEntriesTo(List<BibEntry> entries, UndoManager undoManager) {
                 undoRemove.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd.get()));
             }
             undoManager.addEdit(undoRemove);
-        } else if (changesAdd != null) {
+        } else if (changesAdd.isPresent()) {
             undoManager.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd.get()));
         }
     }

diff --git a/src/main/java/net/sf/jabref/gui/groups/GroupsTree.java b/src/main/java/net/sf/jabref/gui/groups/GroupsTree.java
@@ -315,7 +315,6 @@ public void drop(DropTargetDropEvent dtde) {
                 Optional<EntriesGroupChange> undo = target.addEntriesToGroup(selection.getSelection());
                 if (undo.isPresent()) {
                     dtde.getDropTargetContext().dropComplete(true);
-                    groupSelector.revalidateGroups();
                     groupSelector.concludeAssignment(UndoableChangeEntriesOfGroup.getUndoableEdit(target, undo.get()),
                             target.getNode(), assignedEntries);
                 }