From 95f78fb43f73c2b866e0973923d9dbb5eac496a0 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Fri, 2 Nov 2018 22:26:51 +0100 Subject: [PATCH] fix some binding issues add stubs --- .../CreateModifyExporterDialogViewModel.java | 13 ++++---- .../ExportCustomizationDialogView.java | 30 +++++++++++-------- .../ExportCustomizationDialogViewModel.java | 3 +- .../jabref/preferences/JabRefPreferences.java | 18 +++++++++++ .../preferences/PreferencesService.java | 2 ++ 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java index 1d6a05499..680f96554 100644 --- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java +++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java @@ -5,6 +5,7 @@ import java.nio.file.Paths; import java.util.Optional; import javafx.beans.property.SimpleStringProperty; +import javafx.beans.property.StringProperty; import org.jabref.gui.AbstractViewModel; import org.jabref.gui.DialogService; @@ -37,9 +38,9 @@ public class CreateModifyExporterDialogViewModel extends AbstractViewModel { private final DialogService dialogService; private final PreferencesService preferences; - private final SimpleStringProperty name; - private final SimpleStringProperty layoutFile; - private final SimpleStringProperty extension; + private final StringProperty name = new SimpleStringProperty(""); + private final StringProperty layoutFile = new SimpleStringProperty(""); + private final StringProperty extension = new SimpleStringProperty(""); public CreateModifyExporterDialogViewModel(TemplateExporter exporter, DialogService dialogService, PreferencesService preferences, @@ -49,9 +50,9 @@ public class CreateModifyExporterDialogViewModel extends AbstractViewModel { this.preferences = preferences; //Set text of each of the boxes - this.name = name; - this.layoutFile = layoutFile; - this.extension = extension; + this.name.setValue( name); + this.layoutFile.setValue(layoutFile); + this.extension.setValue(extension); } public TemplateExporter saveExporter() {//void? diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java index 97653fbff..967b1f668 100644 --- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java +++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java @@ -4,11 +4,9 @@ import javax.inject.Inject; import javafx.fxml.FXML; import javafx.scene.control.ButtonType; -import javafx.scene.control.MultipleSelectionModel; -import javafx.scene.control.SelectionModel; +import javafx.scene.control.SelectionMode; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; -import javafx.scene.control.TableView.TableViewSelectionModel; import org.jabref.gui.DialogService; import org.jabref.gui.util.BaseDialog; @@ -18,7 +16,6 @@ import org.jabref.logic.l10n.Localization; import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; -import org.fxmisc.easybind.EasyBind; public class ExportCustomizationDialogView extends BaseDialog { @@ -48,19 +45,26 @@ public class ExportCustomizationDialogView extends BaseDialog { ControlHelper.setAction(removeButton, getDialogPane(), event -> removeExporter()); } + private void removeExporter() { + // TODO Auto-generated method stub + } + + private void modifyExporter() { + // TODO Auto-generated method stub + } + + private void addExporter() { + // TODO Auto-generated method stub + + } + @FXML private void initialize() { viewModel = new ExportCustomizationDialogViewModel(dialogService, loader); //enable multiple selection somewhere around here - EasyBind.listBind(viewModel.selectedExportersProperty(), //the order may be mixed up here - EasyBind.monadic(exporterTable.selectionModelProperty()) - .selectProperty(MultipleSelectionModel::getSelectedItems)); - //trying something new above - viewModel.selectedExportersProperty().bind( - EasyBind.monadic(exporterTable.selectionModelProperty()). - flatMap(SelectionModel::selectedItemProperty). //This will have to be done differently from key bindings because it's multiple selection - selectProperty(Item::valueProperty) - ); + + exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); + exporterTable.setItems(viewModel.selectedExportersProperty()); } diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java index 472ba1966..c1836ab35 100644 --- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java +++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java @@ -40,7 +40,8 @@ public class ExportCustomizationDialogViewModel extends AbstractViewModel { //Also write tests for all of this if necessary - public ExportCustomizationDialogViewModel(DialogService dialogService, JournalAbbreviationLoader loader) { + public ExportCustomizationDialogViewModel(PreferencesService prefernces, DialogService dialogService, JournalAbbreviationLoader loader) { + this.preferences = prefernces; this.dialogService = dialogService; this.loader = loader; init(); diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index cbb097e68..afff2d1b8 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -2091,4 +2091,22 @@ public class JabRefPreferences implements PreferencesService { put(EXPORT_WORKING_DIRECTORY, layoutFileDirString); } + @Override + public LayoutFormatterPreferences getLayoutFormatterPreferences() { + // TODO Auto-generated method stub + return null; + } + + @Override + public SavePreferences LoadForExportFromPreferences() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getExportWorkingDirectory() { + // TODO Auto-generated method stub + return null; + } + } diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java index 2258dbbd7..f306ded91 100644 --- a/src/main/java/org/jabref/preferences/PreferencesService.java +++ b/src/main/java/org/jabref/preferences/PreferencesService.java @@ -48,4 +48,6 @@ public interface PreferencesService { SavePreferences LoadForExportFromPreferences(); void setExportWorkingDirectory(String layoutFileDirString); + + String getExportWorkingDirectory(); } -- 2.19.1.windows.1