make/tools/src/build/tools/cldrconverter/CLDRConverter.java

*** 66,94 ****
      private static SupplementDataParseHandler handlerSuppl;
      static NumberingSystemsParseHandler handlerNumbering;
      static MetaZonesParseHandler handlerMetaZones;
      private static BundleGenerator bundleGenerator;
  
!     static int draftType;
!     private static final String DRAFT_UNCONFIRMED = "unconfirmed";
!     private static final String DRAFT_PROVISIONAL = "provisional";
!     private static final String DRAFT_CONTRIBUTED = "contributed";
!     private static final String DRAFT_APPROVED = "approved";
!     private static final String DRAFT_TRUE = "true";
!     private static final String DRAFT_FALSE = "false";
!     private static final String DRAFT_DEFAULT = DRAFT_APPROVED;
!     static final Map<String, Integer> DRAFT_MAP = new HashMap<>();
  
      static {
!         DRAFT_MAP.put(DRAFT_UNCONFIRMED, 0);
!         DRAFT_MAP.put(DRAFT_PROVISIONAL, 1);
!         DRAFT_MAP.put(DRAFT_CONTRIBUTED, 2);
!         DRAFT_MAP.put(DRAFT_APPROVED, 3);
!         DRAFT_MAP.put(DRAFT_TRUE, 0);
!         DRAFT_MAP.put(DRAFT_FALSE, 2);
!         draftType = DRAFT_MAP.get(DRAFT_DEFAULT);
!     };
  
      static boolean USE_UTF8 = false;
      private static boolean verbose;
  
      private CLDRConverter() {
--- 66,112 ----
      private static SupplementDataParseHandler handlerSuppl;
      static NumberingSystemsParseHandler handlerNumbering;
      static MetaZonesParseHandler handlerMetaZones;
      private static BundleGenerator bundleGenerator;
  
!     static enum DraftType {
!         UNCONFIRMED,
!         PROVISIONAL,
!         CONTRIBUTED,
!         APPROVED;
  
+         private static final Map<String, DraftType> map = new HashMap<>();
          static {
!             for (DraftType dt : values()) {
!                 map.put(dt.getKeyword(), dt);
!             }
!         }
!         static private DraftType defaultType = CONTRIBUTED;
! 
!         private final String keyword;
! 
!         private DraftType() {
!             keyword = this.name().toLowerCase(Locale.ROOT);
! 
!         }
! 
!         static DraftType forKeyword(String keyword) {
!             return map.get(keyword);
!         }
! 
!         static DraftType getDefault() {
!             return defaultType;
!         }
! 
!         static void setDefault(String keyword) {
!             defaultType = Objects.requireNonNull(forKeyword(keyword));
!         }
! 
!         String getKeyword() {
!             return keyword;
!         }
!     }
  
      static boolean USE_UTF8 = false;
      private static boolean verbose;
  
      private CLDRConverter() {
*** 104,114 ****
                      currentArg = args[i];
                      switch (currentArg) {
                      case "-draft":
                          String draftDataType = args[++i];
                          try {
!                             draftType = DRAFT_MAP.get(draftDataType);
                          } catch (NullPointerException e) {
                              severe("Error: incorrect draft value: %s%n", draftDataType);
                              System.exit(1);
                          }
                          info("Using the specified data type: %s%n", draftDataType);
--- 122,132 ----
                      currentArg = args[i];
                      switch (currentArg) {
                      case "-draft":
                          String draftDataType = args[++i];
                          try {
!                             DraftType.setDefault(draftDataType);
                          } catch (NullPointerException e) {
                              severe("Error: incorrect draft value: %s%n", draftDataType);
                              System.exit(1);
                          }
                          info("Using the specified data type: %s%n", draftDataType);
*** 523,540 ****
      static final String[] FORMAT_DATA_ELEMENTS = {
          "MonthNames",
          "standalone.MonthNames",
          "MonthAbbreviations",
          "standalone.MonthAbbreviations",
!         "MonthNarrow",
          "standalone.MonthNarrows",
          "DayNames",
          "standalone.DayNames",
          "DayAbbreviations",
          "standalone.DayAbbreviations",
          "DayNarrows",
          "standalone.DayNarrows",
          "AmPmMarkers",
          "narrow.AmPmMarkers",
          "long.Eras",
          "Eras",
          "narrow.Eras",
--- 541,564 ----
      static final String[] FORMAT_DATA_ELEMENTS = {
          "MonthNames",
          "standalone.MonthNames",
          "MonthAbbreviations",
          "standalone.MonthAbbreviations",
!         "MonthNarrows",
          "standalone.MonthNarrows",
          "DayNames",
          "standalone.DayNames",
          "DayAbbreviations",
          "standalone.DayAbbreviations",
          "DayNarrows",
          "standalone.DayNarrows",
+         "QuarterNames",
+         "standalone.QuarterNames",
+         "QuarterAbbreviations",
+         "standalone.QuarterAbbreviations",
+         "QuarterNarrows",
+         "standalone.QuarterNarrows",
          "AmPmMarkers",
          "narrow.AmPmMarkers",
          "long.Eras",
          "Eras",
          "narrow.Eras",
*** 558,568 ****
          Map<String, Object> formatData = new LinkedHashMap<>();
          for (CalendarType calendarType : CalendarType.values()) {
              String prefix = calendarType.keyElementName();
              for (String element : FORMAT_DATA_ELEMENTS) {
                  String key = prefix + element;
!                 copyIfPresent(map, "cldr." + key, formatData);
                  copyIfPresent(map, key, formatData);
              }
          }
  
          // Copy available calendar names
--- 582,592 ----
          Map<String, Object> formatData = new LinkedHashMap<>();
          for (CalendarType calendarType : CalendarType.values()) {
              String prefix = calendarType.keyElementName();
              for (String element : FORMAT_DATA_ELEMENTS) {
                  String key = prefix + element;
!                 copyIfPresent(map, "java.time." + key, formatData);
                  copyIfPresent(map, key, formatData);
              }
          }
  
          // Copy available calendar names