single line text fields #4138

Naitoreivun · 2018-06-18T01:35:32Z

Solution for #4126. I've used text formatter to force single line behavior. Hope it's enough :) Particular fields, that should contain only one line, are stored in immutable set.

// 7 tests have failed, but they also had failed before on master:

MrDLibImporterTest. testImportDatabaseIsHtmlSetCorrectly()
MrDLibImporterTest. testImportDatabaseIsTitleSetCorrectly()
MrDLibImporterTest. testImportDatabaseIsYearSetCorrectly()
XmpUtilReaderTest. testReadArticleDublinCoreReadRawXmp
XmpUtilReaderTest. testReadArticleDublinCoreReadXmp
XmpUtilWriterTest. testWriteMultipleBibEntries
XmpUtilWriterTest. testWriteXmp

…using text formatter

stefan-kolb · 2018-06-18T08:20:08Z

Can't we just change the underlying GUI component from TextArea to TextField?
Also please use plain Java for making fields immutable or final, not com.google.common.collect.ImmutableSet if possible.

…year and title

Naitoreivun · 2018-06-21T20:40:23Z

@stefan-kolb how about now?

I've added EditorTextField class, similar to EditorTextArea, and extracted addToContextMenu to interface (ContextMenuAddable). Also i had to change parameter type TextArea to TextInputControl in few places in order to use classes in generic way.

Siedlerchr · 2018-06-21T20:51:32Z

That looks good so far for me! Haven't tested it yet, but codewise it looks good, (Although the final in front of method parameter is suerpfllous

Naitoreivun · 2018-06-21T21:07:50Z

I use finals to avoid stupid bugs, like reassigning variable. With them my IDE automatically underlines such stuff. Another thing is that I've decided to make code more readable, so I've put new lines between SimpleEditor constructor parameters (because there was one long line), and now Codacy yells about that. Should I extract those parameters to another class, like SimpleEditorParameters or sth?

Siedlerchr · 2018-06-21T21:19:37Z

src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java

+    public static FieldEditorFX getForField(final String fieldName,
+                                            final TaskExecutor taskExecutor,
+                                            final DialogService dialogService,
+                                            final JournalAbbreviationLoader journalAbbreviationLoader,


You could extract the loader and the prefs parameter and directly pass the JounralAbbrev Repo stuff which is just passed onto the field checkers later
journalAbbreviationLoader.getRepository(journalAbbreviationPreferences)

done; I'm just wonder if it's ok to access repository at the beginning instead of calling for it every time? I mean, is there a way, that the repo could be updated?

In principle, the user might change the journal abbreviations at any time. However, it should be fine to use the repository since the field editors are recreated when switching to the new entry.

Siedlerchr · 2018-06-21T21:19:55Z

src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java

+        final FieldCheckers fieldCheckers = new FieldCheckers(
+                databaseContext,
+                preferences.getFileDirectoryPreferences(),
+                journalAbbreviationLoader.getRepository(journalAbbreviationPreferences),


Here the abbrev repo stuff is passed

Siedlerchr

LGTM for me! 👍 Thanks for your conribution

tobiasdiez

The code looks very good! I've only two very small remarks.

tobiasdiez · 2018-06-27T18:17:44Z

src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java


-        FieldCheckers fieldCheckers = new FieldCheckers(databaseContext, preferences.getFileDirectoryPreferences(), journalAbbreviationLoader.getRepository(journalAbbreviationPreferences), preferences.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
+        final boolean hasSingleLine = SINGLE_LINE_FIELDS.contains(fieldName.toLowerCase());


I might be mistaken here, but isSingleLine(Field) sounds more natural to me.

tobiasdiez · 2018-06-27T20:38:33Z

src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java

 public class FieldEditors {

    private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);

-    public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecutor, DialogService dialogService, JournalAbbreviationLoader journalAbbreviationLoader, JournalAbbreviationPreferences journalAbbreviationPreferences, JabRefPreferences preferences, BibDatabaseContext databaseContext, String entryType, SuggestionProviders suggestionProviders, UndoManager undoManager) {
+    private static final Set<String> SINGLE_LINE_FIELDS = Collections.unmodifiableSet(new HashSet<>(


Can you please add this list two InternalBibtexFields (this class needs to be refactored at some point, but for now it is good to have anything at one place).

Yep. Sorry for delay, I will do that on Saturday.

stefan-kolb · 2018-07-12T12:15:05Z

Ping 😄

- move SINGLE_LINE_FIELDS list to InternalBibtexFields class - rename hasSingleLine var to isSingleLine

tobiasdiez

Thanks for the follow-up!

* upstream/master: single line text fields (#4138) Make it easier to rename and move files (#4200) Fix that swing dialogs are hidden behind main window (#4205) Fixed: #4166 add move & rename file (#4217)

* upstream/master: Update dependencies (#4231) Update to latest release of richtextfx (#4213) Fix fetcher tests (#4216) single line text fields (#4138) Make it easier to rename and move files (#4200) Fix that swing dialogs are hidden behind main window (#4205) Fixed: #4166 add move & rename file (#4217) # Conflicts: # CHANGELOG.md

* upstream/master: (47 commits) Make attached files relative to the file directory (#4212) execute set visible in swing thread to avoid blocking Fix isbn chimbori test (#4234) Rewrite web search pane in JavaFX (#4203) Update dependencies (#4231) Update to latest release of richtextfx (#4213) Fix fetcher tests (#4216) single line text fields (#4138) Make it easier to rename and move files (#4200) Fix that swing dialogs are hidden behind main window (#4205) Fixed: #4166 add move & rename file (#4217) update gradle plugins and gradlen to 4.9 Update dependencies Remove unnecessary look and feel migration (#4204) Revert threading fix since this sometimes lead to freezes... Update year Fix a few more threading exceptions Refactor Convert CiteSeerX fetcher to new infrastructure (#4185) Make global font size customizable (#4178) ... # Conflicts: # src/main/java/org/jabref/gui/BasePanel.java # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/gui/mergeentries/MergeEntries.java # src/main/resources/l10n/JabRef_en.properties

Naitoreivun added 2 commits June 18, 2018 03:02

force author, title and year text areas to be single line text field …

4c44087

…using text formatter

consider 'institution' as a field, that should contain only one line

24e2183

Naitoreivun added 2 commits June 21, 2018 22:22

create EditorTextField and use that control for author, institution, …

d426291

…year and title

Merge branch 'master' into fix-for-issue-4126

9223dfe

Siedlerchr reviewed Jun 21, 2018

View reviewed changes

stefan-kolb requested a review from tobiasdiez June 22, 2018 07:36

Naitoreivun added 2 commits June 23, 2018 13:22

Merge branch 'fix-for-issue-4126'

1bb4754

pass JournalAbbrevRepo instead of Loader and Prefs

26475f6

Siedlerchr approved these changes Jun 23, 2018

View reviewed changes

tobiasdiez requested changes Jun 27, 2018

View reviewed changes

Naitoreivun added 3 commits July 22, 2018 20:35

Merge remote-tracking branch 'upstream/master'

218ad5c

code review fixes

ac10593

- move SINGLE_LINE_FIELDS list to InternalBibtexFields class - rename hasSingleLine var to isSingleLine

Merge branch 'master' into fix-for-issue-4126

481007b

tobiasdiez approved these changes Jul 22, 2018

View reviewed changes

tobiasdiez merged commit f9799d4 into JabRef:master Jul 22, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

single line text fields #4138

single line text fields #4138

Naitoreivun commented Jun 18, 2018 •

edited

Loading

stefan-kolb commented Jun 18, 2018

Naitoreivun commented Jun 21, 2018 •

edited

Loading

Siedlerchr commented Jun 21, 2018

Naitoreivun commented Jun 21, 2018 •

edited

Loading

Siedlerchr Jun 21, 2018

Naitoreivun Jun 23, 2018 •

edited

Loading

tobiasdiez Jun 27, 2018

Siedlerchr Jun 21, 2018

Siedlerchr left a comment

tobiasdiez left a comment

tobiasdiez Jun 27, 2018

tobiasdiez Jun 27, 2018

Naitoreivun Jul 12, 2018

stefan-kolb commented Jul 12, 2018

tobiasdiez left a comment


		FieldCheckers fieldCheckers = new FieldCheckers(databaseContext, preferences.getFileDirectoryPreferences(), journalAbbreviationLoader.getRepository(journalAbbreviationPreferences), preferences.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
		final boolean hasSingleLine = SINGLE_LINE_FIELDS.contains(fieldName.toLowerCase());

single line text fields #4138

single line text fields #4138

Conversation

Naitoreivun commented Jun 18, 2018 • edited Loading

stefan-kolb commented Jun 18, 2018

Naitoreivun commented Jun 21, 2018 • edited Loading

Siedlerchr commented Jun 21, 2018

Naitoreivun commented Jun 21, 2018 • edited Loading

Siedlerchr Jun 21, 2018

Choose a reason for hiding this comment

Naitoreivun Jun 23, 2018 • edited Loading

Choose a reason for hiding this comment

tobiasdiez Jun 27, 2018

Choose a reason for hiding this comment

Siedlerchr Jun 21, 2018

Choose a reason for hiding this comment

Siedlerchr left a comment

Choose a reason for hiding this comment

tobiasdiez left a comment

Choose a reason for hiding this comment

tobiasdiez Jun 27, 2018

Choose a reason for hiding this comment

tobiasdiez Jun 27, 2018

Choose a reason for hiding this comment

Naitoreivun Jul 12, 2018

Choose a reason for hiding this comment

stefan-kolb commented Jul 12, 2018

tobiasdiez left a comment

Choose a reason for hiding this comment

Naitoreivun commented Jun 18, 2018 •

edited

Loading

Naitoreivun commented Jun 21, 2018 •

edited

Loading

Naitoreivun commented Jun 21, 2018 •

edited

Loading

Naitoreivun Jun 23, 2018 •

edited

Loading