Skip to content

Commit

Permalink
Revert "Switch to LGoodDatePicker (JabRef#2340)"
Browse files Browse the repository at this point in the history
This reverts commit 8556e65.
  • Loading branch information
koppor committed Dec 25, 2016
1 parent a964cfe commit b0837ad
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 8 deletions.
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ dependencies {
compile 'org.xmlunit:xmlunit-core:2.3.0'
compile 'org.xmlunit:xmlunit-matchers:2.3.0'


compile 'com.github.lgooddatepicker:LGoodDatePicker:8.3.0'

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.3.0'
testCompile 'com.github.tomakehurst:wiremock:2.4.1'
Expand Down
9 changes: 5 additions & 4 deletions external-libraries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,11 @@ Project: SwingX
URL: https://swingx.java.net/
License: LGPL-3.0

Id: com.github.lgooddatepicker:LGoodDatePicker
Project: LGoodDatePicker
URL: https://github.com/LGoodDatePicker/LGoodDatePicker
License: MIT
Id: microba
Path: lib/microba.jar
Project: Microba
URL: https://github.com/tdbear/microba
License: BSD

Id: spin
Path: lib/spin.jar
Expand Down
Binary file added lib/microba.jar
Binary file not shown.
1 change: 0 additions & 1 deletion src/main/java/net/sf/jabref/gui/IconTheme.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ public enum JabRefIcon {
FACEBOOK("\uf20c"), /* css: facebook */
BLOG("\uf46b"), /* css: rss */
GLOBAL_SEARCH("\uF1E7"), /* css: earth */
DATE_PICKER("\uF0ED;"), /* css: calendar */
// STILL MISSING:
GROUP_REGULAR("\uF4E6", Color.RED);

Expand Down
63 changes: 63 additions & 0 deletions src/main/java/net/sf/jabref/logic/util/date/EasyDateFormat.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package net.sf.jabref.logic.util.date;

import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;

public class EasyDateFormat {

/**
* The formatter objects
*/
private final DateTimeFormatter dateFormatter;


public EasyDateFormat(String dateFormat) {
this(DateTimeFormatter.ofPattern(dateFormat));
}

public EasyDateFormat(DateTimeFormatter dateFormatter) {
this.dateFormatter = dateFormatter;
}

/**
* Creates a String containing the current date (and possibly time),
* formatted according to the format set in preferences under the key
* "timeStampFormat".
*
* @return The date string.
*/
public String getCurrentDate() {
return getDateAt(ZonedDateTime.now());
}

/**
* Creates a readable Date string from the parameter date. The format is set
* in preferences under the key "timeStampFormat".
*
* @return The formatted date string.
*/
public String getDateAt(Date date) {
return getDateAt(date.toInstant().atZone(ZoneId.systemDefault()));
}

/**
* Creates a readable Date string from the parameter date. The format is set
* in preferences under the key "timeStampFormat".
*
* @return The formatted date string.
*/
public String getDateAt(ZonedDateTime dateTime) {
// first use, create an instance
return dateTime.format(dateFormatter);
}

public static EasyDateFormat fromTimeStampFormat(String timeStampFormat) {
return new EasyDateFormat(timeStampFormat);
}

public static EasyDateFormat isoDateFormat() {
return new EasyDateFormat(DateTimeFormatter.ISO_LOCAL_DATE);
}
}

0 comments on commit b0837ad

Please sign in to comment.