src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 23,63 ****
   * questions.
   */
  
  package com.sun.tools.internal.ws.resources;
  
  import com.sun.istack.internal.localization.Localizable;
  import com.sun.istack.internal.localization.LocalizableMessageFactory;
  import com.sun.istack.internal.localization.Localizer;
  
- import java.util.Locale;
- import java.util.ResourceBundle;
- 
  
  /**
   * Defines string formatting method for each constant in the resource file
   *
   */
  public final class ConfigurationMessages {
-     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.configuration";
-     private final static LocalizableMessageFactory messageFactory =
-         new LocalizableMessageFactory(BUNDLE_NAME, ConfigurationMessages::getResourceBundle);
-     private final static Localizer localizer = new Localizer();
  
!     private static ResourceBundle getResourceBundle(Locale locale) {
!         return ResourceBundle.getBundle(BUNDLE_NAME, locale);
!     }
  
      public static Localizable localizableCONFIGURATION_NOT_BINDING_FILE(Object arg0) {
!         return messageFactory.getMessage("configuration.notBindingFile", arg0);
      }
  
- 
      /**
       * Ignoring: binding file "{0}". It is not a jaxws or a jaxb binding file.
       *
       */
      public static String CONFIGURATION_NOT_BINDING_FILE(Object arg0) {
!         return localizer.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
      }
  
  }
--- 23,69 ----
   * questions.
   */
  
  package com.sun.tools.internal.ws.resources;
  
+ import java.util.Locale;
+ import java.util.ResourceBundle;
  import com.sun.istack.internal.localization.Localizable;
  import com.sun.istack.internal.localization.LocalizableMessageFactory;
+ import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
  import com.sun.istack.internal.localization.Localizer;
  
  
  /**
   * Defines string formatting method for each constant in the resource file
   *
   */
  public final class ConfigurationMessages {
  
!     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.configuration";
!     private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ConfigurationMessages.BundleSupplier());
!     private final static Localizer LOCALIZER = new Localizer();
  
      public static Localizable localizableCONFIGURATION_NOT_BINDING_FILE(Object arg0) {
!         return MESSAGE_FACTORY.getMessage("configuration.notBindingFile", arg0);
      }
  
      /**
       * Ignoring: binding file "{0}". It is not a jaxws or a jaxb binding file.
       *
       */
      public static String CONFIGURATION_NOT_BINDING_FILE(Object arg0) {
!         return LOCALIZER.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
!     }
! 
!     private static class BundleSupplier
!         implements ResourceBundleSupplier
!     {
! 
! 
!         public ResourceBundle getResourceBundle(Locale locale) {
!             return ResourceBundle.getBundle(BUNDLE_NAME, locale);
!         }
! 
      }
  
  }