-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Observable Preferences U #9619
Merged
Merged
Observable Preferences U #9619
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 20 additions & 16 deletions
36
src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,41 @@ | ||
package org.jabref.logic.journals; | ||
|
||
import java.nio.charset.Charset; | ||
import java.util.List; | ||
|
||
import javafx.beans.property.BooleanProperty; | ||
import javafx.beans.property.SimpleBooleanProperty; | ||
import javafx.collections.FXCollections; | ||
import javafx.collections.ObservableList; | ||
|
||
public class JournalAbbreviationPreferences { | ||
|
||
private final Charset defaultEncoding; | ||
private List<String> externalJournalLists; | ||
private boolean useFJournalField; | ||
private final ObservableList<String> externalJournalLists; | ||
private final BooleanProperty useFJournalField; | ||
|
||
public JournalAbbreviationPreferences(List<String> externalJournalLists, Charset defaultEncoding, boolean useFJournalField) { | ||
this.externalJournalLists = externalJournalLists; | ||
this.defaultEncoding = defaultEncoding; | ||
this.useFJournalField = useFJournalField; | ||
public JournalAbbreviationPreferences(List<String> externalJournalLists, | ||
boolean useFJournalField) { | ||
this.externalJournalLists = FXCollections.observableArrayList(externalJournalLists); | ||
this.useFJournalField = new SimpleBooleanProperty(useFJournalField); | ||
} | ||
|
||
public List<String> getExternalJournalLists() { | ||
public ObservableList<String> getExternalJournalLists() { | ||
return externalJournalLists; | ||
} | ||
|
||
public void setExternalJournalLists(List<String> externalJournalLists) { | ||
this.externalJournalLists = externalJournalLists; | ||
public void setExternalJournalLists(List<String> list) { | ||
externalJournalLists.clear(); | ||
externalJournalLists.addAll(list); | ||
} | ||
|
||
public Charset getDefaultEncoding() { | ||
return defaultEncoding; | ||
public boolean shouldUseFJournalField() { | ||
return useFJournalField.get(); | ||
} | ||
|
||
public boolean useAMSFJournalFieldForAbbrevAndUnabbrev() { | ||
public BooleanProperty useFJournalFieldProperty() { | ||
return useFJournalField; | ||
} | ||
|
||
public void setUseAMSFJournalFieldForAbbrevAndUnabbrev(boolean useFJournalField) { | ||
this.useFJournalField = useFJournalField; | ||
public void setUseFJournalField(boolean useFJournalField) { | ||
this.useFJournalField.set(useFJournalField); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From reading the deleted code only, I don't get why it is not replaced by some other testing code -
Shouldn't the preferences then stored be in the
abbreviationPreferences
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thing is, it does not make sense to test here if the private putBoolean method is called. This should be a test in JabRefPreferencesTests or JournalAbbreviationPreferencesTest, but this is somewhat trivial and I assume the behavior of observers is testet within javafx already.
If you really want to test the view model we should certainly not test with any() as an argument.
With other words: the test, as it is, is useless imho.