Skip to content

Add support for LLLL format in newer Java versions #10

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.

Sign up for GitHub

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

Open
j123b567 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for LLLL format in newer Java versions #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/michaelbaranov/microba/calendar/ui/basic/ClassicCalendarPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ class ClassicCalendarPanel extends JPanel implements

private JButton fastNextButton;

private static final int JAVA_MAJOR_VERSION = Integer.parseInt(System.getProperty("java.version").split("\\.|_|-b")[1]);

public ClassicCalendarPanel(Date aDate, Locale aLocale, TimeZone zone) {
this.locale = aLocale;
this.zone = zone;
Expand Down Expand Up @@ -159,7 +161,7 @@ private void createLocaleAndZoneSensitive() {
} else
calendar = Calendar.getInstance(zone, locale);

format = new SimpleDateFormat("MMMMM yyyy", locale);
format = new SimpleDateFormat(JAVA_MAJOR_VERSION >= 8 ? "LLLL yyyy" : "MMMMM yyyy", locale);
format.setTimeZone(zone);

setPreferredLabelSize();
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/michaelbaranov/microba/calendar/ui/basic/MonthComboBoxRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ class MonthComboBoxRenderer extends DefaultListCellRenderer {

private SimpleDateFormat dateFormat;

private static final int JAVA_MAJOR_VERSION = Integer.parseInt(System.getProperty("java.version").split("\\.|_|-b")[1]);

public MonthComboBoxRenderer(Locale locale, TimeZone zone) {
// this.locale = locale;
this.zone = zone;
dateFormat = new SimpleDateFormat("MMMM", locale);
dateFormat = new SimpleDateFormat(JAVA_MAJOR_VERSION >= 8 ? "LLLL" : "MMMM", locale);
dateFormat.setTimeZone(zone);
}

Expand All @@ -37,7 +39,7 @@ public Component getListCellRendererComponent(JList list, Object value,

public void setLocale(Locale locale) {
// this.locale = locale;
dateFormat = new SimpleDateFormat("MMMM", locale);
dateFormat = new SimpleDateFormat(JAVA_MAJOR_VERSION >= 8 ? "LLLL" : "MMMM", locale);
dateFormat.setTimeZone(zone);
}

Expand Down