From 4170c5159482ed19c8f0bfe9fd00e60ababbdf8b Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sat, 27 May 2017 20:00:26 +0200 Subject: [PATCH 1/3] Remove setEntry method from entry editors --- .../org/jabref/gui/entryeditor/EntryEditor.java | 14 -------------- .../org/jabref/gui/entryeditor/EntryEditorTab.java | 14 +------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java index 1248848e91a..fbe311ceab5 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java @@ -80,7 +80,6 @@ import org.jabref.gui.undo.UndoableFieldChange; import org.jabref.gui.undo.UndoableKeyChange; import org.jabref.gui.undo.UndoableRemoveEntry; -import org.jabref.gui.util.DefaultTaskExecutor; import org.jabref.gui.util.component.CheckBoxMessage; import org.jabref.gui.util.component.VerticalLabelUI; import org.jabref.logic.TypedBibEntry; @@ -239,8 +238,6 @@ public EntryEditor(JabRefFrame frame, BasePanel panel, BibEntry entry) { if (Globals.prefs.getBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE)) { tabbed.setSelectedIndex(sourceIndex); } - - DefaultTaskExecutor.runInJavaFXThread(() -> setEntry(entry)); } private static String getSourceString(BibEntry entry, BibDatabaseMode type) throws IOException { @@ -457,17 +454,6 @@ public BibEntry getEntry() { return entry; } - /** - * Sets all the text areas according to the shown entry. - */ - private void setEntry(BibEntry entry) { - for (Object tab : tabs) { - if (tab instanceof EntryEditorTab) { - ((EntryEditorTab) tab).setEntry(entry); - } - } - } - public BibDatabase getDatabase() { return panel.getDatabase(); } diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java index e127930c9a0..9bc9930c29f 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java @@ -55,7 +55,6 @@ class EntryEditorTab { private final BasePanel basePanel; private FieldEditorFX activeField; private BibEntry entry; - private boolean updating; public EntryEditorTab(JabRefFrame frame, BasePanel basePanel, List fields, EntryEditor parent, @@ -155,6 +154,7 @@ private Region setupPanel(JabRefFrame frame, BasePanel bPanel, boolean addKeyFie */ FieldEditorFX fieldEditor = FieldEditors.getForField(fieldName, Globals.taskExecutor, new FXDialogService(), Globals.journalAbbreviationLoader, Globals.prefs.getJournalAbbreviationPreferences(), Globals.prefs, bPanel.getBibDatabaseContext(), entry.getType()); + fieldEditor.bindToEntry(entry); editors.put(fieldName, fieldEditor); /* // TODO: Reenable this @@ -247,18 +247,6 @@ private String getPrompt(String field) { return ""; } - public void setEntry(BibEntry entry) { - try { - updating = true; - for (FieldEditorFX editor : editors.values()) { - editor.bindToEntry(entry); - } - this.entry = entry; - } finally { - updating = false; - } - } - /** * Only sets the activeField variable but does not focus it. *

From cbd04e42c18b36263cb71fe7a54a205a91e9a936 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 29 May 2017 16:46:16 +0200 Subject: [PATCH 2/3] Try to add scrollbar to entry editor --- .../java/org/jabref/gui/entryeditor/EntryEditorTab.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java index 9bc9930c29f..1566b2e8863 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java @@ -19,6 +19,7 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; @@ -221,7 +222,13 @@ private Region setupPanel(JabRefFrame frame, BasePanel bPanel, boolean addKeyFie gridPane.getRowConstraints().add(rowExpand); } - return gridPane; + ScrollPane scrollPane = new ScrollPane(); + scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); + scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED); + scrollPane.setHmax(500); + scrollPane.setPrefHeight(100); + scrollPane.setContent(gridPane); + return scrollPane; } private String getPrompt(String field) { From 038845eaa9d5006995f26544761a2107d5f12183 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Tue, 30 May 2017 22:46:26 +0200 Subject: [PATCH 3/3] Fix #2843 and #2851: entry editor works again --- .../java/org/jabref/gui/entryeditor/EntryEditorTab.java | 9 +-------- .../org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml | 2 +- .../org/jabref/gui/fieldeditors/LinkedFilesEditor.java | 3 ++- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java index 1566b2e8863..9bc9930c29f 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java @@ -19,7 +19,6 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Label; -import javafx.scene.control.ScrollPane; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; @@ -222,13 +221,7 @@ private Region setupPanel(JabRefFrame frame, BasePanel bPanel, boolean addKeyFie gridPane.getRowConstraints().add(rowExpand); } - ScrollPane scrollPane = new ScrollPane(); - scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); - scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED); - scrollPane.setHmax(500); - scrollPane.setPrefHeight(100); - scrollPane.setContent(gridPane); - return scrollPane; + return gridPane; } private String getPrompt(String field) { diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml index b401b307b4c..a7e1d840b2a 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml +++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml @@ -8,7 +8,7 @@ - +