Skip to content
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

[22.3] Stop deleting (Buddhist|JapaneseImperial)Calendar #616

Merged
merged 1 commit into from
Nov 13, 2023
Merged

[22.3] Stop deleting (Buddhist|JapaneseImperial)Calendar #616

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
16 changes: 4 additions & 12 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/CalendarSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -29,7 +29,6 @@
import java.util.Locale;
import java.util.TimeZone;

import com.oracle.svm.core.annotate.Delete;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;
import com.oracle.svm.core.util.VMError;
Expand Down Expand Up @@ -59,6 +58,8 @@ final class Target_sun_util_calendar_CalendarSystem {
private static CalendarSystem forName(String calendarName) {
if ("gregorian".equals(calendarName)) {
return Util_sun_util_calendar_CalendarSystem.GREGORIAN;
} else if ("japanese".equals(calendarName)) {
return Util_sun_util_calendar_CalendarSystem.JAPANESE;
} else if ("julian".equals(calendarName)) {
return Util_sun_util_calendar_CalendarSystem.JULIAN;
} else {
Expand All @@ -71,19 +72,10 @@ final class Util_sun_util_calendar_CalendarSystem {

// The static fields are initialized during native image generation.
static final CalendarSystem GREGORIAN = CalendarSystem.forName("gregorian");
static final CalendarSystem JAPANESE = CalendarSystem.forName("japanese");
static final CalendarSystem JULIAN = CalendarSystem.forName("julian");
}

@TargetClass(sun.util.BuddhistCalendar.class)
@Delete
final class Target_sun_util_BuddhistCalendar {
}

@TargetClass(className = "java.util.JapaneseImperialCalendar")
@Delete
final class Target_java_util_JapaneseImperialCalendar {
}

/** Dummy class to have a class with the file's name. */
public final class CalendarSubstitutions {
}
Loading