-
-
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
Some enhancements and cleanups related to dates #1575
Conversation
@@ -184,7 +184,8 @@ private InternalBibtexFields() { | |||
add(new BibtexSingleField("eid", true, BibtexSingleField.SMALL_W)); | |||
|
|||
dummy = new BibtexSingleField("date", true); | |||
dummy.setPrivate(); | |||
dummy.setExtras(EnumSet.of(FieldProperties.DATE)); | |||
dummy.setPrivate(); // TODO: Why private? |
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.
I currently have no clear picture about private fields. This is the context of #574 😄
Where is the configurable date format usable? |
Right now it is used in the |
if (isoFormat) { | ||
dateFormatter = DateTimeFormatter.ISO_LOCAL_DATE; | ||
} else { | ||
String format = Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT); |
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.
Since we want to get away from using Globals.prefs in logic classes, I would propose to add constructors which takes the format as input. E.g.
EasyDateFormat(String dateFormat)
this(DateTimeFormatter.ofPattern(dateFormat))
EasyDateFormat(DateTimeFormatter dateFormat)
this.dateFormat = dateFormat;
static EasyDateFormat fromPreferences(JabRefPreferences preferences)
return new EasyDateFormat(preferences.get(JabRefPreferences.TIME_STAMP_FORMAT));
static EasyDateFormat IsoDateFormat = new EasyDateFormat(DateTimeFormatter.ISO_LOCAL_DATE)
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.
Good idea! I changed it.
15d6001
to
1ce26fa
Compare
In general, JabRef should only focus on the bibtex/biblatex specification for the standard fields. |
So what about `timestamp`? Historically there's been support to generate
your own format (and call it anything). Most likely people are not using
ISO format since that has only recently been the default.
I think the conclusion really is that we cannot drop the support for
arbitrary date format since we once introduced it. I think the major issue
really is that we need to propagate the format, although not that far and
one can extract some class `TimeStampPreferences` to encapsulate it.
|
@oscargus The time discussion refs JabRef#130. Maybe, we should migrate away from |
I like the idea of having those two fields instead of the timestamp. We 2016-07-20 19:18 GMT+02:00 Oliver Kopp [email protected]:
|
Fine with me. I guess we should provide a migration functionality before dropping the configurable format and field name support. |
I've rebased. Anything else at the moment? |
Could you sum up what has been done here, and the associated pros and cons? Especially regarding a CHANGELOG entry, this is required anyway. |
At the moment it is primarily replacing `SimpleDateFormat` (for good
reasons) in a number of places and making sure that the BibLatex fields
related to dates get their result from the DatePicker in the correct format
(yyyy-MM-dd as specified by BibLatex). A ChangeLog entry might describe the
latter as a bug fix, if anything.
The discussion is really about if we should keep the field usually called
`timestamp` and if we should allow the user to specify the format of this
field.
|
And: JabRef preferences are injected in a few places plus replacing an array with a List in ZipFileChooser. |
f5aaba6
to
1ff3337
Compare
What I think would be cool:
|
I agree that those two fields are better. Won't happen in this PR though as it is a quite big job. See JabRef#130 as well. Anything else in this PR? See it as primarily making the format of the |
Then this is good to be merged. |
Anyone has a good idea why the tests are failing? Locally they pass and |
The problem is our custom Cookie handler which seems to be implicitly called by the Edit// Maybe you can change the date usage of the CookieHandler, too? Still uses SDF
|
…anged while developing this PR
OK, turns out the problem was that the server started to use a two-digit year in the last few days... Now that format is also supported, although, as I understand it, it is not a valid format for a cookie. |
* master: define xjc input/ouput dir (subsequent builds will be faster) (JabRef#1628) Consistent file name casing (and other localization improvements) (JabRef#1629) Builds are now stored via build-upload.jabref.org Some enhancements and cleanups related to dates (JabRef#1575) changes should be tested manually Cleanup FindFile and asssociated tests (JabRef#1596) More field names and a method (JabRef#1627) Moved, removed, and used String constants (JabRef#1618) Updated preview entries (JabRef#1606) Improved LaTeX to Unicode/HTML formatters to output more sensible values for unknown commands (JabRef#1622) Fixed JabRef#636 by using DOICheck and DOIStrip in export filters (JabRef#1624) Converted a few getField to getFieldOptional (JabRef#1625)
Move event (JabRef#1601) * Move event package to model Update dependencies: postgres 9.4.1208 -> 9.4.1209 and wiremock from 2.1.6 to 2.1.7 Added ISBN integrity checker (JabRef#1586) Added ISBN integrity checker * Extracted ISBN class Reenable errorprone (see http://errorprone.info/) Extend the OpenConsoleFeature (JabRef#1582) * Extend the OpenConsoleFeature by selection of custom terminal emulator. - Add radio selection to the AdvancedTab - Add new JabRefPreferences - Add file check and execution commands - Add localization keys * Fix localization key. * Move console selection to ExternalTab.java * Change localization entry. * Add command executor. * Fix placeholder replacement. * Fix codacy. * Update localization key. * Remove "Specify terminal emulator" option. Add GUI outputs. * Set default command for Windows. Fix localization entries. * Remove empty lines in language files. * Use lambda expressions insead of ActionListeners * Refactoring. * Update CHANGELOG.md. * Small refactorings. Move preferences (JabRef#1604) * Move preferences-related classes into separate package * Rename JabRefPreferencesFilterDialog -> PreferencesFilterDialog and move it to gui * Fix checkstyle warning Set user agent to fix 403 status error Replace getField with getFieldOptional in all of the tests and in som… (JabRef#1591) * Replace getField with getFieldOptional in all of the tests and in some more code * Some more conversions Added filter to not show selected integrity checks (JabRef#1588) * Added filter to not show selected integrity checks * Removed unused variable Some Globals.prefs injection in logic and model (JabRef#1593) * Some Globals.prefs injection in logic and model * Some more conversions and some fixes * More injections * Even more injections * Yes, even more injections * Indeed, even more injections * Probably the last injections for now * Removed unrequired dependency and fixed issue * Dropped support for selecting sub/super to equations * Added preference classes for LatexFieldFormatter and FieldContentParser * Removed some left over code * Added JournalAbbreviationPreferences * Encapsulated LatexFieldFormatterPreferences in SavePreferences * Changed getShortDescription to accept boolean argument * Removed Globals.prefs from tests and removed unused imports * Unused import * Unused import Rewrite MedlineImporter with JAXB and add nbib fields (JabRef#1479) Add test in BibEntryWriterTest for type change When clicking on a tab, the first field now has the focus (JabRef#988) * the first Field does now have focus when clicking on a tab in the entry editor * Make first field focused when selecting a tab in entry editor The field list gets the focus as soon as it is focused (JabRef#1541) Test CustomImporter (JabRef#1501) * Test CustomImporter Fixes imports Added model.entry.FieldName that contains field name constants (JabRef#1602) * Added model.entry.FieldName that contains field name constants * More constants * Renamed and added more constants * Some more fields and cleanups * Removed MedlineHandler left from merge conflicts More fields added to FieldName (JabRef#1614) * More fields added to FieldName * Some Medline fixes [WIP] Create new fetcher infrastructure (JabRef#1594) * Introduce new Fetcher interfaces * Refactor arXiv fulltext fetcher * Add query based arXiv fetcher * Reformat code * Add a few tests for the arxiv parser * Make new arXiv fetcher available * Fix small problems related to files * Fix tests * Rename interface methods * Add changelog entry * Mark old EntryFetcher interface as deprecated * Move fetcher to importer \ fetcher * Move HelpFile from gui.help to logic.help * Rename fetchers * Rename FulltextFinder * Optimize imports * Fix failing test * Ignore failing test Added LayoutFormatterPreferences (and related files) (JabRef#1608) * Added LayoutFormatterPreferences (and related files) * Rebased * Included JournalAbbreviationLoader in LayoutPreferences Added more fields and fixed some issues (JabRef#1617) Resolves JabRef#1613 Use Jabref default icon for uninstaller for now (JabRef#1616) Always use https for help files (JabRef#1615) Implemented JabRef#1345 - cleanup ISSN (JabRef#1590) * Implemented JabRef#1345 - cleanup ISSN * Fixed comments * Extracted ISSN class * Added tests for ISSN and ISBN Added DateFormatter to LayoutEntry so that it actually works... (JabRef#1619) Converted a few getField to getFieldOptional (JabRef#1625) * Converted a few getField to getFieldOptional Fixed JabRef#636 by using DOICheck and DOIStrip in export filters (JabRef#1624) Improved LaTeX to Unicode/HTML formatters to output more sensible values for unknown commands (JabRef#1622) Updated preview entries (JabRef#1606) * Updated preview entries, which return new entry Moved, removed, and used String constants (JabRef#1618) * Moved, removed, and used String constants * Some more fixes * Moved NEWLINE, made FILE_SEPARATOR public and used it * Moved NEWLINE and FILE_SEPARATOR to OS * Moved ENCODING_PREFIX and SIGNATURE * Corrected Globals in a few comments... * Apparently the localization tests find commented out text... More field names and a method (JabRef#1627) * Introduced FieldName in ArXiV * Some more field names * More field names Cleanup FindFile and asssociated tests (JabRef#1596) * Cleanup FindFile and rework it using Streams and nio methods- * Unignore test for trying on CI * Use explicit List and Set in findFiles and caller methods * Use Lazy Stream to find files changes should be tested manually Some enhancements and cleanups related to dates (JabRef#1575) * Some enhancements and cleanups related to dates * Fixed some time zone issues * Replaced SimpleDateFormat in ZipFileChooser and replaced arrays with Lists * Changed EasyDateFormat constructors * Fixed stupid mistake * Added CHANGELOG entry * Maybe tests are passing now? * Some server side print debugging... * As it should be * Tryng LocalDateTime * No time zone * Added test for Cookie * Fixed imports... * Added a third possible date format as it turns out that the server changed while developing this PR Builds are now stored via build-upload.jabref.org Consistent file name casing (and other localization improvements) (JabRef#1629) * AUX files * ZIP files * BIB files * JAR files * didn't * Couldn't what's * Consistent casing * AUX apparently is commonly used in French words... * Fixed the flawed quick-and-dirty find-and-replace failures define xjc input/ouput dir (subsequent builds will be faster) (JabRef#1628) Execute task only when input/output dir changed. Fixed a minor issue and refactored MergeEntries (JabRef#1634) * Fixed a minor issue and refactored MergeEntries * Fixed import * Added CHANGELOG entry Added LabelPatternPreferences (JabRef#1607) * Added LabelPatternPreferences * Removed static initializer More tests (JabRef#1635) * Added more tests for Cookie * Enabled some layout tests and added test for StringUtil.intValueOfWithNull * Updated a test * Split tests Updated Errorprone to 2.0.11 (JabRef#1636) * Updated Errorprone to 2.0.11 * Corrected test Keep @comment text in a bib file (JabRef#1638) * Kep @comment text in a bib file * Add test for @comment that contains regular entries Replaced some getField and fixed some bugs (JabRef#1631) * Replaced some getField and fixed some bugs * Fixed a few things * Added CHANGELOG entries * Improved equals implementation * Text book equals and hashCode Fixed JabRef#1639 (JabRef#1641) * Fixed JabRef#1639 * Removed old code Export OO/LO citations to new database (JabRef#1630) * Export OO/LO citations to new database * Fixed problem with duplicates * Added some comments * Fixed spelling in comment * Removed general Exception Unified some equals (JabRef#1640) * Unified some equals * Imported correct Objects... Fixed one more NPE which should have been fixed in JabRef#1631 (JabRef#1649) Finished method to hide visible fields and show hidden fields - Hide method done - Show method done - ToDo repaint hidden field - ToDo test class finished field repaint remove sysouts
Based on the discussion in another PR (primarily @Siedlerchr as I recall) the date selector now returns the date in ISO format when applicable. Basically, it returns in ISO format for all BibLatex fields related to dates, while e.g. timestamp is still based on the preferences (there is a property
FieldProperties.ISO_DATE
which can be set to enable ISO format).I also replaced some of the SimpelDateFormat usage with the new thread safe API.
Question: should we still support a user defined date format?